Home / Browse / Panorama Tools / Mail / Archive

Panorama Tools

Email Archive: panotools-cvs (read-only)

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

From: <tksharpless@us...> - 2010-01-16 14:03

Revision: 1226
          http://panotools.svn.sourceforge.net/panotools/?rev=1226&view=rev
Author:   tksharpless
Date:     2010-01-16 14:03:14 +0000 (Sat, 16 Jan 2010)

Log Message:
-----------
Add the reference implementation of General Pannini: PaniniGeneral.c, PaniniGeneral.h
Add function to query dynamic FOV limits
Make sys_win.h not assume a DLL build
define htons macro in ColourBrightness.c if undefined

Modified Paths:
--------------
    trunk/libpano/ColourBrightness.c
    trunk/libpano/filter.h
    trunk/libpano/math.c
    trunk/libpano/panorama.h
    trunk/libpano/queryfeature.c
    trunk/libpano/sys_win.h

Added Paths:
-----------
    trunk/libpano/PaniniGeneral.c
    trunk/libpano/PaniniGeneral.h

Modified: trunk/libpano/ColourBrightness.c
===================================================================
--- trunk/libpano/ColourBrightness.c	2010-01-16 12:30:31 UTC (rev 1225)
+++ trunk/libpano/ColourBrightness.c	2010-01-16 14:03:14 UTC (rev 1226)
@@ -44,6 +44,29 @@
 #define round(x) (int)(x)
 #endif
 
+#ifndef htons
+// byte reordering macros -- avoids loading sockets lib on Windows
+#define LITTLE_ENDIAN	// change if your Windows box is from Mars
+#if defined(BIG_ENDIAN) && !defined(LITTLE_ENDIAN)
+#define htons(A) (A)
+#define htonl(A) (A)
+#define ntohs(A) (A)
+#define ntohl(A) (A)
+#elif defined(LITTLE_ENDIAN) && !defined(BIG_ENDIAN)
+#define htons(A) (((uint16)(A) & 0xff00) >> 8 | ((uint16)(A) & 0x00ff) << 8 )
+#define htonl(A) ((((uint32)(A) & 0xff000000) >> 24) | \
+((uint32)(A) & 0x00ff0000) >> 8 | \
+((uint32)(A) & 0x0000ff00) << 8 | \
+((uint32)(A) & 0x000000ff) << 24)
+#define ntohs htons
+#define ntohl htohl
+#else
+#error "Either BIG_ENDIAN or LITTLE_ENDIAN must be #defined, but not both."
+#endif
+#endif	/ndef htons
+
+
+
 FILE *debugFile = 0;
 
 

Added: trunk/libpano/PaniniGeneral.c
===================================================================
--- trunk/libpano/PaniniGeneral.c	                        (rev 0)
+++ trunk/libpano/PaniniGeneral.c	2010-01-16 14:03:14 UTC (rev 1226)
@@ -0,0 +1,128 @@
+/* PaniniGeneral.c		15Jan2010 TKS
+
+This is the reference implementation of the General Pannini
+Projection, an elaboration of the basic Pannini projection 
+discovered by Bruno Postle and Thomas Sharpless in December 
+2008 in paintings by Gian Paolo Pannini (1691-1765).
+
+    (C) copyright 2010 Thomas K Sharpless
+Free license is hereby granted for noncommercial use
+under the terms of the GNU Lesser General Public License 
+version 2.1 as published by the Free Software Foundation 
+and appearing in the file LICENSE.LGPL included in the
+packaging of this file.  Please review the following 
+information to ensure the requirementsGeneral of the GNU Lesser 
+General Public License version 2.1 will be met: 
+http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+
+
+*/
+#include "PaniniGeneral.h"
+
+#include <math.h>
+
+#define PI 3.1415926535897932384626433832795
+#define D2R( x ) ((x) * PI / 180 )
+#define R2D( x ) ((x) * 180 / PI )
+
+int panini_general_toSphere	( double* lon, double* lat, 
+							  double h,  double v, 
+							  double d, double top, double bot
+							 )
+{ 
+	double S, cl, q, t;
+
+	if( d < 0 ) return 0;
+	if( h == 0 ){
+        *lon = 0;
+		S = 1;
+		cl = 1;
+	} else {
+	/* solve quadratic for cosine of azimuth angle */
+        double k, kk, dd, del;
+        k = fabs(h) / (d + 1);
+        kk = k * k;
+        dd = d * d;
+        del = kk * kk * dd - (kk + 1) * (kk * dd - 1);
+        if( del < 0 ) 
+            return 0;
+        cl = (-kk * d + sqrt( del )) / (kk + 1);
+	/* use that to compute S, and angle */
+        S = (d + cl)/(d + 1);
+		*lon = atan2( S * h, cl );
+    }
+	*lat = atan(S * v);
+
+  /* squeeze */
+	q = v < 0 ? top : bot;
+	if( q < 0 ){
+		q = -q;
+	/* soft squeeze */
+		t = q * 2 * (cl - 0.707) / PI;
+		*lat *= t + 1;
+	} else if( q > 0 ){
+	/* hard squeeze */
+		t = atan( v * cl );
+		t = q * (t - *lat);
+		*lat += t;
+	}
+
+	return 1;
+}
+int panini_general_toPlane	( double lon, double lat, 
+							  double*  h,  double*  v, 
+							  double d, double top, double bot
+							 )
+{
+	double S, q, t;
+
+	if( d < 0 ) return 0;
+
+	S = (d + 1) / (d + cos(lon));
+	*h = sin(lon) * S;
+	*v = tan(lat) * S;
+    
+  /* squeeze */
+	q = v < 0 ? top : bot;
+	if( q < 0 ){
+		q = -q;
+	/* soft squeeze */
+		t = q * 2 * (cos(lon) - 0.707) / PI;
+		*v = S * tan(lat /(t + 1));
+	} else if( q > 0 ){
+	/* hard squeeze */
+		t = tan(lat) * cos(lon);
+		*v += q * (t - *v);
+	}
+
+
+	return 1;
+}
+
+int panini_general_maxVAs	( double d, 
+							  double maxProj,
+							  double * maxView
+							 )
+{	double a, s;
+
+	if( d < 0 ) return 0;
+
+/* hFOV... */
+  // theoretical max angle (infeasible for d < 1.1 or so)
+	if( d > 1. )
+		s =  -1/d;
+	else 
+		s = -d;  
+	a = acos( s );
+  // actual limit may be max projection angle...
+	s = asin(d * sin(maxProj)) + maxProj ; 
+	if( a > s ){	// clip to projection angle limit
+		a = s;	
+	} 
+    maxView[0] = a;
+
+/* vFOV... */
+	maxView[1] = maxProj;
+
+	return 1;
+}

Added: trunk/libpano/PaniniGeneral.h
===================================================================
--- trunk/libpano/PaniniGeneral.h	                        (rev 0)
+++ trunk/libpano/PaniniGeneral.h	2010-01-16 14:03:14 UTC (rev 1226)
@@ -0,0 +1,57 @@
+/* PaniniGeneral.h		15Jan2010 TKS
+
+This is the reference implementation of the General Pannini
+Projection, an elaboration of the basic Pannini projection 
+discovered by Bruno Postle and Thomas Sharpless in December 
+2008 in paintings by Gian Paolo Pannini (1691-1765).
+
+    (C) copyright 2010 Thomas K Sharpless
+Free license is hereby granted for noncommercial use
+under the terms of the GNU Lesser General Public License 
+version 2.1 as published by the Free Software Foundation 
+and appearing in the file LICENSE.LGPL included in the
+packaging of this file.  Please review the following 
+information to ensure the requirementsGeneral of the GNU Lesser 
+General Public License version 2.1 will be met: 
+http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+
+It is a parameterized mapping between sphere and plane, 
+that gives synthetic perspective views on the plane when
+the sphere holds a linear projection of the scene.  Sphere 
+coordinates (phi, theta) are equirectangular: longitude and 
+latitude angles, in radians, relative to a point on the equator.
+Plane coordinates (h, v) are relative to the image of the same
+point, typically but not necessarily the center point of
+the view.  The plane y coordinate is negative upward, as is
+typical in image processing software.
+
+There are 3 parameters:
+  d [0:infinity) controls horizontal compression
+  t [-1:1] controls vertical compression at top
+  b [-1:1] controls vertical compression at bottom
+
+There are functions to map cooridnates in either direction
+and one to compute the maximum feasible field of view of the
+plane image, given a d value and the projection angle limit
+of your display system.  
+
+Angles passed to and returned by panini_general_maxVAs() 
+are max view angles (half-FOVs) in radians.
+
+All 3 functions return an integer: 0: failure, 1: OK.
+Computed coordinates and FOVs are returned in arguments
+passed by address.
+
+*/
+int panini_general_toPlane	( double phi, double theta, 
+							  double* h,  double* v, 
+							  double d, double t, double b
+							 );
+int panini_general_toSphere	( double* phi, double* theta, 
+							  double  h,  double  v, 
+							  double d, double t, double b
+							 );
+int panini_general_maxVAs	( double d, 
+							  double maxProj,
+							  double * maxView
+							 );

Modified: trunk/libpano/filter.h
===================================================================
--- trunk/libpano/filter.h	2010-01-16 12:30:31 UTC (rev 1225)
+++ trunk/libpano/filter.h	2010-01-16 14:03:14 UTC (rev 1226)
@@ -891,6 +891,7 @@
 int panini_general_erect		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );
 int erect_panini_general		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );
 Image * setup_panini_general	( struct MakeParams * pmp );
+int maxFOVs_panini_general	( double *params, double *fovs );
 
 int arch_erect		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );
 int erect_arch		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );

Modified: trunk/libpano/math.c
===================================================================
--- trunk/libpano/math.c	2010-01-16 12:30:31 UTC (rev 1225)
+++ trunk/libpano/math.c	2010-01-16 14:03:14 UTC (rev 1226)
@@ -22,6 +22,8 @@
 #include <float.h>
 #include "f2c.h"
 
+#include "PaniniGeneral.h"
+
 #define R_EPS  1.0e-6   
 #define MAXITER 100
 
@@ -981,37 +983,87 @@
     return 1;
 }
 
-/** set up working parameters for panini_general
+/** General Pannini Projection
 
   setup_panini_general(&MakeParams) selects the Image struct
   corresponding to the pannini_general image and returns its
   address, or a NULL pointer for failure.
 
   If the selected Image has an invalid precomputedCount, it
-  posts the proper distanceparam and puts working parameter 
-  values in precomputeValue[].
+  posts the distanceparam corresponding to min( max feasible
+  hFOV, requested hFOV) and puts working parameter values in 
+  precomputeValue[] in the selected Image.
 
   SetMakeParams (adjust.c) calls this function in lieu of setting
   distanceparam.
 
-  The 'UI' projection params, described in queryfeature.c, have 
-  extended ranges to accomodate the integer-valued control sliders 
-  in hugin.  They are mapped to the working values as follows
+  The user-visible projection params, described in queryfeature.c, 
+  are scaled to accomodate integer-valued control sliders in a GUI.  
+  unscaleParams_panini_general() sets working values as follows:
     cmpr -100:0:50 <-> d = 0:1:->infinity NOTE very nonlinear
     tops, bots -100:100 <-> sqz -1:1 linear
 				< 0 gives soft squeeze
 				> 0 give transverse straightening squeeze
   CAUTION these ranges are assumed, not read from queryfeature.c
 
-  The maximum feasible hFOV depends on the compression parameter
-  and on a projection angle limit that is hard coded here.  We
-  set distanceparam to limit the actual hFOV accordingly if the 
-  requested hFOV is larger.
+  maxFOVs_panini_general() calculates the maximum feasible FOVs
+  for a given scaled parameter set.   Those also depends on a 
+  projection angle limit, that is hard coded here.  FOVs in degrees.
 
 **/
+#define MAX_PROJ_ANGLE 80	
+
+int unscaleParams_panini_general( 
+				double * gui_params,	// cmpr, tops, bots
+				double * wrk_params		// d, t, b
+							    )
+{
+	double t;
+
+   /* check for legal values */
+    if(    gui_params[0] < -100
+		|| gui_params[0] > 50
+	  ) return 0;
+    if(    gui_params[1] < -100
+		|| gui_params[1] > 100
+	  ) return 0;
+    if(    gui_params[2] < -100
+		|| gui_params[2] > 100
+	  ) return 0;
+
+    /* post working param values */
+    t = (50 - gui_params[0]) / 50;	/* -100:50 => 3:0 */
+    wrk_params[0] = 1.5 / (t + 0.0001) - 1.5/3.0001;
+    wrk_params[1] = gui_params[1] / 100;
+    wrk_params[2] = gui_params[2] / 100;
+
+	return 1;
+}
+
+int maxFOVs_panini_general	( double *params, double *fovs ){
+	double wparams[3], mfovs[2];
+  /* translate user params to working values */
+	if( !unscaleParams_panini_general( params, wparams )
+	  )
+	  return 0;
+  /* compute max half-fovs in radians */
+	if( !panini_general_maxVAs( wparams[0], 
+							  DEG_TO_RAD(MAX_PROJ_ANGLE),
+							  mfovs
+							 )
+	  )
+	  return 0;
+
+ /* return full fovs in degrees */
+	fovs[0] = 2 * RAD_TO_DEG(mfovs[0]);
+	fovs[1] = 2 * RAD_TO_DEG(mfovs[1]);
+
+	return 1;
+}
+
 Image * setup_panini_general(struct MakeParams* pmp)
 {	int  i; 
-    double s,t,d,a,v;
+    double s,t,d,a,v, vl[2];
     Image * ppg = NULL;
 
     // Only act if it is panini_general 
@@ -1032,40 +1084,22 @@
 	*/
     for( i = ppg->formatParamCount; i < 3; i++ ) 
         ppg->formatParam[i] = 0;
-   /* clip values legal */
-    if(ppg->formatParam[0] < -100) 
-        ppg->formatParam[0] = -100;
-    else if(ppg->formatParam[0] > 100) 
-        ppg->formatParam[0] = 100;
-    if(ppg->formatParam[1] < -100) 
-        ppg->formatParam[1] = -100;
-    else if(ppg->formatParam[1] > 100) 
-        ppg->formatParam[1] = 100;
-    if(ppg->formatParam[2] < -100) 
-        ppg->formatParam[2] = -100;
-    else if(ppg->formatParam[2] > 100) 
-        ppg->formatParam[2] = 100;
 
-    /* post working param values */
-    t = (50 - ppg->formatParam[0]) / 50;	/* -100:50 => 3:0 */
-    d = 1.5 / (t + 0.0001) - 1.5/3.0001;
-    ppg->precomputedValue[0] = d;
-    ppg->precomputedValue[1] = ppg->formatParam[1] / 100;
-    ppg->precomputedValue[2] = ppg->formatParam[2] / 100;
+  /* translate user params to working values */
+	if( !unscaleParams_panini_general( ppg->formatParam, ppg->precomputedValue )
+	  )
+	  return NULL;
+	d = ppg->precomputedValue[0];
 
   /* post max feasible half-FOV as angle and x value */
-  // theoretical max angle (infeasible for d < 1.1 or so)
-	if( d > 1. )
-		s =  -1/d;
-	else 
-		s = -d;  
-	a = acos( s );
-  // actual limit may be max projection angle...
-	t = DEG_TO_RAD( 80 );	// max allowed projection angle
-	s = asin(d * sin(t)) + t ; // corresp. max azimuth
-	if( a > s ){	// clip to projection angle limit
-		a = s;	
-	} 
+	if( !panini_general_maxVAs( d,
+								DEG_TO_RAD( 80 ),		// max projection angle
+								vl					// max view angles h, v
+							  )
+	  )
+	  return 0;
+	a = vl[0];
+
   // clip hFOV to feasible limit
 	v = 0.5 * DEG_TO_RAD( ppg->hfov );
 	if( v > a )
@@ -1089,7 +1123,6 @@
 int erect_panini_general( double x_dest,double  y_dest, double* lambda_src, double* phi_src, void* params)
 {  /* params -> MakeParams */
     double x, y, lambda, phi, d, distance;
-    double S, cl, q, t;
     
     Image * ppg = setup_panini_general(mp);
     if( !ppg ) 
@@ -1104,40 +1137,13 @@
   // fail if outside feasible FOV
 	if( fabs(x) > ppg->precomputedValue[4] )
 		return 0;	
-
-
-	if( x == 0 ){
-        lambda = 0;
-		S = 1;
-		cl = 1;
-	} else {
-	/* solve quadratic for cosine of azimuth angle */
-        double k, kk, dd, del;
-        k = fabs(x) / (d + 1);
-        kk = k * k;
-        dd = d * d;
-        del = kk * kk * dd - (kk + 1) * (kk * dd - 1);
-        if( del < 0 ) 
-            return 0;
-        cl = (-kk * d + sqrt( del )) / (kk + 1);
-	/* use that to compute S, and angle */
-        S = (d + cl)/(d + 1);
-        lambda = atan2( S * x, cl );
-    }
-	phi = atan(S * y);
-
-  /* squeeze */
-	q = ppg->precomputedValue[y < 0 ? 1 : 2];
-	if( q < 0 ){
-		q = -q;
-	/* soft squeeze */
-		t = q * 2 * (cl - 0.707) / PI;
-		phi *= t + 1;
-	} else if( q > 0 ){
-	/* hard squeeze */
-		t = atan( y * cl );
-		phi += q * (t - phi);
-	}
+  // call mapping fn
+	if( !panini_general_toSphere( &lambda, &phi, x, y,
+								 ppg->precomputedValue[0],
+								 ppg->precomputedValue[1],
+								 ppg->precomputedValue[2])
+	  )
+	  return 0;
 	    
 	*lambda_src = lambda * distance;
 	*phi_src = phi * distance;
@@ -1151,7 +1157,7 @@
 {
 	/* params -> MakeParams */
 
-	double phi, lambda, q,t,s,y,x;
+	double phi, lambda, y,x;
 	double d;  // >= 0
 	double distance;
 
@@ -1169,24 +1175,14 @@
 	if( fabs(lambda) > ppg->precomputedValue[3] )
 		return 0;	
 
-	s = (d + 1) / (d + cos(lambda));
-	x = sin(lambda) * s;
-	y = tan(phi)  * s;
-    
-  /* unsqueeze */
-	q = ppg->precomputedValue[y < 0 ? 1 : 2];
-	if( q < 0 ){
-		q = -q;
-	/* soft squeeze */
-		t = q * 2 * (cos(lambda) - 0.707) / PI;
-		y = s * tan(phi /(t + 1));
+  // call mapping fn
+	if( !panini_general_toPlane( lambda, phi, &x, &y,
+								 ppg->precomputedValue[0],
+								 ppg->precomputedValue[1],
+								 ppg->precomputedValue[2])
+	  )
+	  return 0;
 
-	} else if( q > 0 ){
-	/* hard squeeze */
-		t = tan(phi) * cos(lambda);
-		y += q * (t - y);
-	}
-
 	*y_src = distance * y;
     *x_src = distance * x;
     return 1;

Modified: trunk/libpano/panorama.h
===================================================================
--- trunk/libpano/panorama.h	2010-01-16 12:30:31 UTC (rev 1225)
+++ trunk/libpano/panorama.h	2010-01-16 14:03:14 UTC (rev 1226)
@@ -509,10 +509,15 @@
     pano_projection_parameter parm[PANO_PROJECTION_MAX_PARMS]; 
 } pano_projection_features;
 
-
-
 int panoProjectionFeaturesQuery(int projection, pano_projection_features *features);
 int panoProjectionFormatCount(void);
+/** APIs to read dynamic features that depend on projection parameters
+    projection argument is an index, same as for queryFeatures()
+**/
+int queryFOVLimits( int projection,	
+				    double * params, /* length depends on projection */
+					double * lims	/* [0] = maxhfov, [1] = maxvfov */
+				  );
 
 
 

Modified: trunk/libpano/queryfeature.c
===================================================================
--- trunk/libpano/queryfeature.c	2010-01-16 12:30:31 UTC (rev 1225)
+++ trunk/libpano/queryfeature.c	2010-01-16 14:03:14 UTC (rev 1226)
@@ -493,5 +493,31 @@
     return 1;
 }
 
+int queryFOVLimits( int projection,		/* projection index */
+				    double * params, /* length depends on projection */
+					double * lims	/* [0] = maxhfov, [1] = maxvfov */
+				  )
+{
+	pano_projection_features pf;
+	int ok = panoProjectionFeaturesQuery(projection, &pf);
+	lims[0] = lims[1] = 0;
+	if( !ok ) return 0;
+  // default fixed values
+	lims[0] = pf.maxHFOV;
+	lims[1] = pf.maxVFOV;
+  // compute dynamic values
+    switch (projection) {
+    default:
+	break;
+    case PANO_FORMAT_PANINI_GENERAL:
+		maxFOVs_panini_general	(params, lims );
+    break;
+    case PANO_FORMAT_ALBERS_EQUAL_AREA_CONIC:
+	break;
+    }
 
+	return 1;
+}
 
+
+

Modified: trunk/libpano/sys_win.h
===================================================================
--- trunk/libpano/sys_win.h	2010-01-16 12:30:31 UTC (rev 1225)
+++ trunk/libpano/sys_win.h	2010-01-16 14:03:14 UTC (rev 1226)
@@ -117,8 +117,13 @@
 
 typedef LPSTR *Handle;
 
+#ifdef _DLL
 extern HINSTANCE hDllInstance;
 extern HWND wndOwner;
+#else
+#define hDllInstance 0
+#define wndOwner 0
+#endif
 
 void SetWindowOwner(HWND Owner);
 void CenterDialog(HWND hDlg);


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

Thread View

Thread	Author	Date
[panotools-cvs] SF.net SVN: panotools:[866] trunk/libpano	<dmg@us...>

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

From: <dmg@us...> - 2008-12-29 12:07

Revision: 912
          http://panotools.svn.sourceforge.net/panotools/?rev=912&view=rev
Author:   dmg
Date:     2008-12-29 12:07:28 +0000 (Mon, 29 Dec 2008)

Log Message:
-----------
2008-12-29  dmg  <dmg@...>

* panorama.h, math.c, adjust.c, queryfeature.c, filter.h,
parser.c: Added panini projection. the credit goes to Thomas
Sharpless who rediscovered it, and to Bruno Postle, who did the
original math.

Modified Paths:
--------------
    trunk/libpano/ChangeLog
    trunk/libpano/adjust.c
    trunk/libpano/filter.h
    trunk/libpano/math.c
    trunk/libpano/panorama.h
    trunk/libpano/parser.c
    trunk/libpano/queryfeature.c

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2008-11-18 23:46:59 UTC (rev 911)
+++ trunk/libpano/ChangeLog	2008-12-29 12:07:28 UTC (rev 912)
@@ -1,3 +1,11 @@
+2008-12-29  dmg  <dmg@...>
+
+	* panorama.h, math.c, adjust.c, queryfeature.c, filter.h,
+	parser.c: Added panini projection. the credit goes to Thomas
+	Sharpless who rediscovered it, and to Bruno Postle, who did the
+	original math.
+
+
 2008-08-11  dmg  <dmg@...>
 
 	* bootstrap (have_libtool): Added support for 2.2.* version of

Modified: trunk/libpano/adjust.c
===================================================================
--- trunk/libpano/adjust.c	2008-11-18 23:46:59 UTC (rev 911)
+++ trunk/libpano/adjust.c	2008-12-29 12:07:28 UTC (rev 912)
@@ -688,6 +688,11 @@
             // horizontal pixels per degree
             mp->distance        = ((double) pn->width) / b;
             break;
+        case _panini: 
+	    tpara = 1;
+	    panini_erect(b/2.0, 0.0, &tx, &ty, & tpara);
+            mp->distance = pn->width/(2.0*tx);
+            break;
         case _lambertazimuthal: 
 	    tpara = 1;
 	    lambertazimuthal_erect(b/2.0, 0.0, &tx, &ty, & tpara);
@@ -796,6 +801,10 @@
 	{
 		SetDesc(stack[i],	erect_millercylindrical,		&(mp->distance)	); i++;	// Convert miller to sphere
     }
+   	else if(pn->format == _panini)
+	{
+		SetDesc(stack[i],	erect_panini,		&(mp->distance)	); i++;	// Convert panini to sphere
+    }
    	else if(pn->format == _lambert)
 	{
 		SetDesc(stack[i],	erect_lambert,		&(mp->distance)	); i++;	// Convert lambert to sphere
@@ -968,6 +977,11 @@
 	    lambertazimuthal_erect(b/2.0, 0.0, &tx, &ty, & tpara);
 	    mp->distance = pn->width/(2.0*tx);
             break;
+	case _panini:
+	    tpara = 1;
+	    panini_erect(b/2.0, 0.0, &tx, &ty, & tpara);
+	    mp->distance = pn->width/(2.0*tx);
+            break;
         case _stereographic:
             tpara = 1;
             stereographic_erect(b/2.0, 0.0, &tx, &ty, & tpara);
@@ -1139,6 +1153,10 @@
 	{
 		SetDesc(stack[i],	millercylindrical_erect,		&(mp->distance)	); i++;	// Convert sphere to sphere
     }
+   	else if(pn->format == _panini)
+	{
+		SetDesc(stack[i],	panini_erect,		&(mp->distance)	); i++;	// Convert panini to sphere
+    }
    	else if(pn->format == _lambert)
 	{
 		SetDesc(stack[i],	lambert_erect,		&(mp->distance)	); i++;	// Convert sphere to lambert

Modified: trunk/libpano/filter.h
===================================================================
--- trunk/libpano/filter.h	2008-11-18 23:46:59 UTC (rev 911)
+++ trunk/libpano/filter.h	2008-12-29 12:07:28 UTC (rev 912)
@@ -849,6 +849,8 @@
 int albersequalareaconic_distance	( double *x_src, void* params );
 int millercylindrical_erect		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );
 int erect_millercylindrical		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );
+int panini_erect		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );
+int erect_panini		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );
 
 
 int mirror_sphere_cp	( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );	

Modified: trunk/libpano/math.c
===================================================================
--- trunk/libpano/math.c	2008-11-18 23:46:59 UTC (rev 911)
+++ trunk/libpano/math.c	2008-12-29 12:07:28 UTC (rev 912)
@@ -710,6 +710,50 @@
 }
 
 
+/** convert from erect to panini */
+int panini_erect( double x_dest,double  y_dest, double* x_src, double* y_src, void* params)
+{
+    // params: distanceparam
+  // this is the inverse
+
+    double phi, lambdaHalf;
+
+    phi = y_dest/distanceparam;
+    lambdaHalf = x_dest/ (distanceparam*2);
+
+    *x_src = distanceparam * 2 * tan (lambdaHalf);
+    double temp  = cos(lambdaHalf);
+    *y_src = distanceparam *  phi / (temp * temp);
+
+    return 1;
+}
+
+
+/** convert from panini to erect */
+int erect_panini( double x_dest,double  y_dest, double* x_src, double* y_src, void* params)
+{
+    double y;
+    double x;
+    double lambdaHalf;
+    double temp;
+
+    double phi;
+    y = y_dest/distanceparam;
+    x = x_dest/distanceparam;
+
+    temp = cos(x/2);
+    phi = y * temp * temp;
+
+    *x_src = 2 * atan2(x,2) * distanceparam;
+    *y_src = phi * distanceparam;
+
+    return 1;
+}
+
+
+
+
+
 /** convert from erect to lambert */
 int lambert_erect( double x_dest,double  y_dest, double* x_src, double* y_src, void* params)
 {

Modified: trunk/libpano/panorama.h
===================================================================
--- trunk/libpano/panorama.h	2008-11-18 23:46:59 UTC (rev 911)
+++ trunk/libpano/panorama.h	2008-12-29 12:07:28 UTC (rev 912)
@@ -257,6 +257,7 @@
     _lambertazimuthal  = 16,
     _albersequalareaconic = 17,
     _millercylindrical = 18,
+    _panini = 19,
 };
 
 enum
@@ -273,9 +274,10 @@
     PANO_FORMAT_LAMBERT_AZIMUTHAL = 9,
     PANO_FORMAT_ALBERS_EQUAL_AREA_CONIC = 10,
     PANO_FORMAT_MILLER_CYLINDRICAL = 11,
+    PANO_FORMAT_PANINI = 12,
 };
 
-#define PANO_FORMAT_COUNT 12
+#define PANO_FORMAT_COUNT 13
 
 // A large rectangle
 

Modified: trunk/libpano/parser.c
===================================================================
--- trunk/libpano/parser.c	2008-11-18 23:46:59 UTC (rev 911)
+++ trunk/libpano/parser.c	2008-12-29 12:07:28 UTC (rev 912)
@@ -492,6 +492,9 @@
                         case PANO_FORMAT_MILLER_CYLINDRICAL:
                             gl->pano.format = _millercylindrical;
                             break;
+                        case PANO_FORMAT_PANINI:
+                            gl->pano.format = _panini;
+                            break;
                         default:
                             PrintError( "Unknown panorama projection: %d", gl->pano.format );
                             return -1;
@@ -987,6 +990,9 @@
 	    case 11:
 		p->pano.format = _millercylindrical;
 		break;
+	    case 12:
+		p->pano.format = _panini;
+		break;
 	    default:
 		PrintError( "Unknown panorama projection: %d", p->pano.format );
 		return -1;

Modified: trunk/libpano/queryfeature.c
===================================================================
--- trunk/libpano/queryfeature.c	2008-11-18 23:46:59 UTC (rev 911)
+++ trunk/libpano/queryfeature.c	2008-12-29 12:07:28 UTC (rev 912)
@@ -69,6 +69,7 @@
   {"PanoType9","Lambert Azimuthal Equal Area"},
   {"PanoType10","Albers Conical Equal Area"},
   {"PanoType11","Miller Cylindrical"},
+  {"PanoType12","Panini"},
   // Filter Types
   //   fix: Fixed Windowsize
   //   aa: Antialiasing filter with adaptive filter size
@@ -363,6 +364,7 @@
 	break;
     case PANO_FORMAT_EQUIRECTANGULAR:
     case PANO_FORMAT_MILLER_CYLINDRICAL:
+    case PANO_FORMAT_PANINI:
 	break;
     case PANO_FORMAT_FISHEYE_FF:
 	features->maxVFOV = 360;


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

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

From: <dmg@us...> - 2008-12-29 22:22

Revision: 913
          http://panotools.svn.sourceforge.net/panotools/?rev=913&view=rev
Author:   dmg
Date:     2008-12-29 21:37:58 +0000 (Mon, 29 Dec 2008)

Log Message:
-----------
2008-12-29  dmg  <dmg@...>

* queryfeature.c (panoProjectionFeaturesQuery): Added querying
features for panini; this will allow Hugin to use it

Modified Paths:
--------------
    trunk/libpano/ChangeLog
    trunk/libpano/queryfeature.c

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2008-12-29 12:07:28 UTC (rev 912)
+++ trunk/libpano/ChangeLog	2008-12-29 21:37:58 UTC (rev 913)
@@ -1,3 +1,8 @@
+2008-12-29  dmg  <dmg@...>
+
+	* queryfeature.c (panoProjectionFeaturesQuery): Added querying
+	features for panini; this will allow Hugin to use it.
+
 2008-12-29  dmg  <dmg@...>
 
 	* panorama.h, math.c, adjust.c, queryfeature.c, filter.h,

Modified: trunk/libpano/queryfeature.c
===================================================================
--- trunk/libpano/queryfeature.c	2008-12-29 12:07:28 UTC (rev 912)
+++ trunk/libpano/queryfeature.c	2008-12-29 21:37:58 UTC (rev 913)
@@ -307,6 +307,7 @@
     "Lambert Equal Area Azimuthal",
     "Albers Equal Area Conic",
     "Miller Cylindrical",
+    "Panini",
 };
 
 static int panoFormatID[PANO_FORMAT_COUNT] = {
@@ -321,7 +322,8 @@
     _lambert,
     _lambertazimuthal,
     _albersequalareaconic,
-    _millercylindrical
+    _millercylindrical,
+    _panini
     };
 
 int panoProjectionFormatCount(void)
@@ -364,8 +366,11 @@
 	break;
     case PANO_FORMAT_EQUIRECTANGULAR:
     case PANO_FORMAT_MILLER_CYLINDRICAL:
+	break;
     case PANO_FORMAT_PANINI:
-	break;
+	features->maxVFOV = 179;
+	features->maxHFOV = 230;
+        break;
     case PANO_FORMAT_FISHEYE_FF:
 	features->maxVFOV = 360;
 	features->maxHFOV = 360;


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

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

From: <dmg@us...> - 2008-12-29 23:05

Revision: 914
          http://panotools.svn.sourceforge.net/panotools/?rev=914&view=rev
Author:   dmg
Date:     2008-12-29 23:05:31 +0000 (Mon, 29 Dec 2008)

Log Message:
-----------
2008-12-29  dmg  <dmg@...>

* panorama.h, math.c, adjust.c, queryfeature.c, filter.h: Finally
added the architectural.

Modified Paths:
--------------
    trunk/libpano/ChangeLog
    trunk/libpano/adjust.c
    trunk/libpano/filter.h
    trunk/libpano/math.c
    trunk/libpano/panorama.h
    trunk/libpano/parser.c
    trunk/libpano/queryfeature.c

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2008-12-29 21:37:58 UTC (rev 913)
+++ trunk/libpano/ChangeLog	2008-12-29 23:05:31 UTC (rev 914)
@@ -1,5 +1,8 @@
 2008-12-29  dmg  <dmg@...>
 
+	* panorama.h, math.c, adjust.c, queryfeature.c, filter.h: Finally
+	added the architectural.
+
 	* queryfeature.c (panoProjectionFeaturesQuery): Added querying
 	features for panini; this will allow Hugin to use it.
 

Modified: trunk/libpano/adjust.c
===================================================================
--- trunk/libpano/adjust.c	2008-12-29 21:37:58 UTC (rev 913)
+++ trunk/libpano/adjust.c	2008-12-29 23:05:31 UTC (rev 914)
@@ -693,6 +693,11 @@
 	    panini_erect(b/2.0, 0.0, &tx, &ty, & tpara);
             mp->distance = pn->width/(2.0*tx);
             break;
+        case _architectural: 
+	    tpara = 1;
+	    arch_erect(b/2.0, 0.0, &tx, &ty, & tpara);
+            mp->distance = pn->width/(2.0*tx);
+            break;
         case _lambertazimuthal: 
 	    tpara = 1;
 	    lambertazimuthal_erect(b/2.0, 0.0, &tx, &ty, & tpara);
@@ -805,6 +810,10 @@
 	{
 		SetDesc(stack[i],	erect_panini,		&(mp->distance)	); i++;	// Convert panini to sphere
     }
+   	else if(pn->format == _architectural)
+	{
+		SetDesc(stack[i],	erect_arch,		&(mp->distance)	); i++;	// Convert arch to sphere
+    }
    	else if(pn->format == _lambert)
 	{
 		SetDesc(stack[i],	erect_lambert,		&(mp->distance)	); i++;	// Convert lambert to sphere
@@ -982,6 +991,11 @@
 	    panini_erect(b/2.0, 0.0, &tx, &ty, & tpara);
 	    mp->distance = pn->width/(2.0*tx);
             break;
+	case _architectural:
+	    tpara = 1;
+	    arch_erect(b/2.0, 0.0, &tx, &ty, & tpara);
+	    mp->distance = pn->width/(2.0*tx);
+            break;
         case _stereographic:
             tpara = 1;
             stereographic_erect(b/2.0, 0.0, &tx, &ty, & tpara);
@@ -1157,6 +1171,10 @@
 	{
 		SetDesc(stack[i],	panini_erect,		&(mp->distance)	); i++;	// Convert panini to sphere
     }
+   	else if(pn->format == _architectural)
+	{
+		SetDesc(stack[i],	arch_erect,		&(mp->distance)	); i++;	// Convert arch to sphere
+    }
    	else if(pn->format == _lambert)
 	{
 		SetDesc(stack[i],	lambert_erect,		&(mp->distance)	); i++;	// Convert sphere to lambert

Modified: trunk/libpano/filter.h
===================================================================
--- trunk/libpano/filter.h	2008-12-29 21:37:58 UTC (rev 913)
+++ trunk/libpano/filter.h	2008-12-29 23:05:31 UTC (rev 914)
@@ -852,7 +852,10 @@
 int panini_erect		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );
 int erect_panini		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );
 
+int arch_erect		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );
+int erect_arch		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );
 
+
 int mirror_sphere_cp	( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );	
 int mirror_pano		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );	
 int sphere_cp_mirror	( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );	

Modified: trunk/libpano/math.c
===================================================================
--- trunk/libpano/math.c	2008-12-29 21:37:58 UTC (rev 913)
+++ trunk/libpano/math.c	2008-12-29 23:05:31 UTC (rev 914)
@@ -695,7 +695,40 @@
     return 1;
 }
 
+/** convert from erect to miller */
+int arch_erect( double x_dest,double  y_dest, double* x_src, double* y_src, void* params)
+{
+    // params: distanceparam
+    double phi;
 
+    phi = y_dest/distanceparam;
+    if (phi < 0) {
+        millercylindrical_erect(x_dest, y_dest, x_src, y_src, params);
+    } else {
+        lambert_erect(x_dest, y_dest, x_src, y_src, params);
+    }
+
+    return 1;
+}
+
+/** convert from erect to miller */
+int erect_arch( double x_dest,double  y_dest, double* x_src, double* y_src, void* params)
+{
+    // params: distanceparam
+    double y;
+
+    y = y_dest/distanceparam;
+    if (y < 0) {
+        erect_millercylindrical(x_dest, y_dest, x_src, y_src, params);
+    } else {
+        erect_lambert(x_dest, y_dest, x_src, y_src, params);
+    }
+
+    return 1;
+}
+
+
+
 /** convert from mercator to erect */
 int erect_millercylindrical( double x_dest,double  y_dest, double* x_src, double* y_src, void* params)
 {

Modified: trunk/libpano/panorama.h
===================================================================
--- trunk/libpano/panorama.h	2008-12-29 21:37:58 UTC (rev 913)
+++ trunk/libpano/panorama.h	2008-12-29 23:05:31 UTC (rev 914)
@@ -258,6 +258,7 @@
     _albersequalareaconic = 17,
     _millercylindrical = 18,
     _panini = 19,
+    _architectural = 20,
 };
 
 enum
@@ -275,9 +276,10 @@
     PANO_FORMAT_ALBERS_EQUAL_AREA_CONIC = 10,
     PANO_FORMAT_MILLER_CYLINDRICAL = 11,
     PANO_FORMAT_PANINI = 12,
+    PANO_FORMAT_ARCHITECTURAL = 13,
 };
 
-#define PANO_FORMAT_COUNT 13
+#define PANO_FORMAT_COUNT 14
 
 // A large rectangle
 

Modified: trunk/libpano/parser.c
===================================================================
--- trunk/libpano/parser.c	2008-12-29 21:37:58 UTC (rev 913)
+++ trunk/libpano/parser.c	2008-12-29 23:05:31 UTC (rev 914)
@@ -495,6 +495,9 @@
                         case PANO_FORMAT_PANINI:
                             gl->pano.format = _panini;
                             break;
+                        case PANO_FORMAT_ARCHITECTURAL:
+                            gl->pano.format = _architectural;
+                            break;
                         default:
                             PrintError( "Unknown panorama projection: %d", gl->pano.format );
                             return -1;
@@ -993,6 +996,9 @@
 	    case 12:
 		p->pano.format = _panini;
 		break;
+	    case 13:
+		p->pano.format = _architectural;
+		break;
 	    default:
 		PrintError( "Unknown panorama projection: %d", p->pano.format );
 		return -1;

Modified: trunk/libpano/queryfeature.c
===================================================================
--- trunk/libpano/queryfeature.c	2008-12-29 21:37:58 UTC (rev 913)
+++ trunk/libpano/queryfeature.c	2008-12-29 23:05:31 UTC (rev 914)
@@ -70,6 +70,7 @@
   {"PanoType10","Albers Conical Equal Area"},
   {"PanoType11","Miller Cylindrical"},
   {"PanoType12","Panini"},
+  {"PanoType13","Architectural"},
   // Filter Types
   //   fix: Fixed Windowsize
   //   aa: Antialiasing filter with adaptive filter size
@@ -308,6 +309,7 @@
     "Albers Equal Area Conic",
     "Miller Cylindrical",
     "Panini",
+    "Architectural",
 };
 
 static int panoFormatID[PANO_FORMAT_COUNT] = {
@@ -323,7 +325,8 @@
     _lambertazimuthal,
     _albersequalareaconic,
     _millercylindrical,
-    _panini
+    _panini,
+    _architectural,
     };
 
 int panoProjectionFormatCount(void)
@@ -366,6 +369,7 @@
 	break;
     case PANO_FORMAT_EQUIRECTANGULAR:
     case PANO_FORMAT_MILLER_CYLINDRICAL:
+    case PANO_FORMAT_ARCHITECTURAL:
 	break;
     case PANO_FORMAT_PANINI:
 	features->maxVFOV = 179;


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

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

From: <jim0watters@us...> - 2008-12-31 05:25

Revision: 917
          http://panotools.svn.sourceforge.net/panotools/?rev=917&view=rev
Author:   jim0watters
Date:     2008-12-31 05:25:43 +0000 (Wed, 31 Dec 2008)

Log Message:
-----------
Initialize TrformStr structure before use

Modified Paths:
--------------
    trunk/libpano/PTcommon.c
    trunk/libpano/correct.c
    trunk/libpano/filter.c
    trunk/libpano/morpher.c
    trunk/libpano/pt_stdint.h
    trunk/libpano/pteditor.c
    trunk/libpano/ptpicker.c

Modified: trunk/libpano/PTcommon.c
===================================================================
--- trunk/libpano/PTcommon.c	2008-12-31 01:06:08 UTC (rev 916)
+++ trunk/libpano/PTcommon.c	2008-12-31 05:25:43 UTC (rev 917)
@@ -670,6 +670,7 @@
     SetImageDefaults(&resultPanorama);
 
     //transform structure holds input and output images, and some miscellaneous other information
+    memset(&transform, 0, sizeof(TrformStr));
     transform.src = &image1;    // Input image
     transform.dest = &resultPanorama;   // Output image
     transform.mode = 8;         // How to run transformation
@@ -1018,7 +1019,7 @@
         printf("Prefs FastT %d:/n,  prefs->fastStep);
 	    */
 
-            MakePano(&transform, prefs);
+            MyMakePano(&transform, prefs, loopCounter);
 
             if (transform.success == 0) {       // Error 
                 PrintError("Error converting image");

Modified: trunk/libpano/correct.c
===================================================================
--- trunk/libpano/correct.c	2008-12-31 01:06:08 UTC (rev 916)
+++ trunk/libpano/correct.c	2008-12-31 05:25:43 UTC (rev 917)
@@ -665,6 +665,8 @@
 			PrintError("Could not allocate %ld bytes", dest->dataSize );
 			return -1;
 		}
+
+    memset(&TrCrop, 0, sizeof(TrformStr));
 		TrCrop.src 	= src;
 		TrCrop.dest = dest;
 		TrCrop.success = 0;

Modified: trunk/libpano/filter.c
===================================================================
--- trunk/libpano/filter.c	2008-12-31 01:06:08 UTC (rev 916)
+++ trunk/libpano/filter.c	2008-12-31 05:25:43 UTC (rev 917)
@@ -861,6 +861,12 @@
         im->selection.bottom    = 0;
         im->selection.left      = 0;
         im->selection.right     = 0;
+        im->cropInformation.cropped_height  = 0;
+        im->cropInformation.cropped_width   = 0;
+        im->cropInformation.full_height     = 0;
+        im->cropInformation.full_width      = 0;
+        im->cropInformation.x_offset        = 0;
+        im->cropInformation.y_offset        = 0;
         panoSetMetadataDefaults(&im->metadata);
 }
 

Modified: trunk/libpano/morpher.c
===================================================================
--- trunk/libpano/morpher.c	2008-12-31 01:06:08 UTC (rev 916)
+++ trunk/libpano/morpher.c	2008-12-31 05:25:43 UTC (rev 917)
@@ -210,7 +210,7 @@
 		return -1;
 	}
 	
-
+  memset(&Tr, 0, sizeof(TrformStr));
 	Tr.mode					= _show_progress;
 	Tr.interpolator			= _spline36;
 	Tr.gamma				= 1.0;

Modified: trunk/libpano/pt_stdint.h
===================================================================
--- trunk/libpano/pt_stdint.h	2008-12-31 01:06:08 UTC (rev 916)
+++ trunk/libpano/pt_stdint.h	2008-12-31 05:25:43 UTC (rev 917)
@@ -16,8 +16,18 @@
 
 #  define vsnprintf _vsnprintf
 #  define snprintf _snprintf
+
+#ifdef _CPLUSPLUS
+/* define if your compiler understands inline commands */
+#define INLINE _inline
+#else
+#define INLINE
+#endif
+
+
 # else
 #  include <stdint.h>
+#define INLINE inline
 # endif
 
 #endif

Modified: trunk/libpano/pteditor.c
===================================================================
--- trunk/libpano/pteditor.c	2008-12-31 01:06:08 UTC (rev 916)
+++ trunk/libpano/pteditor.c	2008-12-31 05:25:43 UTC (rev 917)
@@ -163,7 +163,8 @@
 
 	if( readPrefs( (char*) &spref, _sizep ) != 0 )
 		SetSizeDefaults	( &spref );
-	
+
+	memset(&Tr, 0, sizeof(TrformStr));
 	Tr.src 	= pano;
 	Tr.dest	= &dest;
 
@@ -255,6 +256,7 @@
 	if( readPrefs( (char*) &spref, _sizep ) != 0 )
 		SetSizeDefaults	( &spref );
 	
+  memset(&Tr, 0, sizeof(TrformStr));
 	Tr.src 	= &src;
 	Tr.dest	= &dest;
 

Modified: trunk/libpano/ptpicker.c
===================================================================
--- trunk/libpano/ptpicker.c	2008-12-31 01:06:08 UTC (rev 916)
+++ trunk/libpano/ptpicker.c	2008-12-31 05:25:43 UTC (rev 917)
@@ -1155,6 +1155,7 @@
 	w_seek 	= h_seek 	= (int)(sqrt((double) (*env)->GetArrayLength(env, jseek))+0.5);	
 	
 	pc_Tr 	= (TrformStr *) malloc(sizeof(TrformStr));
+  memset(pc_Tr, 0, sizeof(TrformStr));
 	pc_reg 	= &reg;
 	pc_adj	= (aPrefs*) malloc(sizeof(aPrefs));
 	SetAdjustDefaults(pc_adj);


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

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

From: <jim0watters@us...> - 2008-12-31 05:59

Revision: 918
          http://panotools.svn.sourceforge.net/panotools/?rev=918&view=rev
Author:   jim0watters
Date:     2008-12-31 05:59:23 +0000 (Wed, 31 Dec 2008)

Log Message:
-----------
adjust.c, filter.h, math.c, panorama.h, parser.c & queryfeateature.c
  added mirror, equisolid, orthographic, and stereographic as input image formats
  added equisolid, orthographic, stereographic as output panorama formats
  add some more defines to panorama.h to help image and pano formats

Modified Paths:
--------------
    trunk/libpano/ChangeLog
    trunk/libpano/adjust.c
    trunk/libpano/doc/Optimize.txt
    trunk/libpano/doc/stitch.txt
    trunk/libpano/filter.h
    trunk/libpano/math.c
    trunk/libpano/panorama.h
    trunk/libpano/parser.c
    trunk/libpano/queryfeature.c

Property Changed:
----------------
    trunk/libpano/


Property changes on: trunk/libpano
___________________________________________________________________
Modified: svn:ignore
   - COPYING
INSTALL
aclocal.m4
autom4te.cache
config
config.log
config.status
configure
libtool
Makefile
Makefile.in
.obj
*.o
*.lo
*.la
.deps
.libs
config.h
config.h.in
stamp-h*
Debug
Release
*.ncb
*.suo

   + COPYING
INSTALL
aclocal.m4
autom4te.cache
config
config.log
config.status
configure
libtool
Makefile
Makefile.in
.obj
*.o
*.lo
*.la
.deps
.libs
config.h
config.h.in
stamp-h*
Debug
Release
*.ncb
*.suo
Debug LIB CMD
Release LIB CMD
Debug DLL CMD
*.orig


Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2008-12-31 05:25:43 UTC (rev 917)
+++ trunk/libpano/ChangeLog	2008-12-31 05:59:23 UTC (rev 918)
@@ -1,3 +1,10 @@
+2008-01-26 Jim Watters <jwatters@...>
+
+	* adjust.c, filter.h, math.c, panorama.h, parser.c & queryfeateature.c
+	added mirror, equisolid, orthographic, and stereographic as input image formats
+	added equisolid, orthographic, stereographic as output panorama formats
+
+
 2008-12-29  dmg  <dmg@...>
 
 	* panorama.h, math.c, adjust.c, queryfeature.c, filter.h: Finally

Modified: trunk/libpano/adjust.c
===================================================================
--- trunk/libpano/adjust.c	2008-12-31 05:25:43 UTC (rev 917)
+++ trunk/libpano/adjust.c	2008-12-31 05:59:23 UTC (rev 918)
@@ -565,9 +565,9 @@
 
 void SetMakeParams( struct fDesc *stack, struct MakeParams *mp, Image *im , Image *pn, int color )
 {
-	int 		i;
-	double		a,b;						// field of view in rad
-        double          tx,ty, tpara;               // temporary variables
+  int         i;
+  double      a,b;                        // field of view in rad
+  double      tx,ty, tpara;               // temporary variables
 /* Joost Nieuwenhuijse, 3 feb 2005: Fix for cropping bug
    If a script containing the 'C' crop parameter was stitched by PTStitcher,
    it would fail if the cropping area is partially outside the source image.
@@ -583,45 +583,45 @@
    and vertical offset are added to compensate for the shift of the center of the
    crop area relative to the center of the image.
 */
-        int image_selection_width=im->width;
-        int image_selection_height=im->height;
-	mp->im = im;
-	mp->pn = pn;
-        if(im->cP.horizontal)
-        {
-          mp->horizontal=im->cP.horizontal_params[color];
-        }
-        else
-        {
-          mp->horizontal=0;
-        }
-        if(im->cP.vertical)
-        {
-          mp->vertical=im->cP.vertical_params[color];
-        }
-        else
-        {
-          mp->vertical=0;
-        }
-        if( (im->selection.left != 0) || (im->selection.top != 0) || (im->selection.bottom != 0) || (im->selection.right != 0) )
-        {
-          if(im->cP.cutFrame)
-          {
-            image_selection_width  = im->selection.right  - im->selection.left;
-            image_selection_height = im->selection.bottom - im->selection.top;
-            mp->horizontal += (im->selection.right  + im->selection.left - im->width)/2.0;
-            mp->vertical   += (im->selection.bottom + im->selection.top  - im->height)/2.0;
-          }
-        }
+  int image_selection_width=im->width;
+  int image_selection_height=im->height;
+  mp->im = im;
+  mp->pn = pn;
+  if(im->cP.horizontal)
+  {
+    mp->horizontal=im->cP.horizontal_params[color];
+  }
+  else
+  {
+    mp->horizontal=0;
+  }
+  if(im->cP.vertical)
+  {
+    mp->vertical=im->cP.vertical_params[color];
+  }
+  else
+  {
+    mp->vertical=0;
+  }
+  if( (im->selection.left != 0) || (im->selection.top != 0) || (im->selection.bottom != 0) || (im->selection.right != 0) )
+  {
+    if(im->cP.cutFrame)
+    {
+      image_selection_width  = im->selection.right  - im->selection.left;
+      image_selection_height = im->selection.bottom - im->selection.top;
+      mp->horizontal += (im->selection.right  + im->selection.left - im->width)/2.0;
+      mp->vertical   += (im->selection.bottom + im->selection.top  - im->height)/2.0;
+    }
+  }
 
-	a	=	 DEG_TO_RAD( im->hfov );	// field of view in rad
-	b	=	 DEG_TO_RAD( pn->hfov );
+  a   =    DEG_TO_RAD( im->hfov );    // field of view in rad
+  b   =    DEG_TO_RAD( pn->hfov );
 
-	SetMatrix(  	- DEG_TO_RAD( im->pitch ),
-					0.0,
-					- DEG_TO_RAD( im->roll ),
-					mp->mt,
-					0 );
+  SetMatrix( - DEG_TO_RAD( im->pitch ),
+             0.0,
+             - DEG_TO_RAD( im->roll ),
+             mp->mt,
+             0 );
 
 #if 0
         switch (pn->format)
@@ -671,554 +671,601 @@
   * Added more output projection types. Broke mp->distance and mp->scale factor calculation
   * into separate parts, making it easier to add new projection types
  */
-        // calculate distance
-        switch (pn->format)
-        {
-        case _rectilinear:
-            mp->distance        = (double) pn->width / (2.0 * tan(b/2.0));
-            break;
-        case _equirectangular:
-        case _fisheye_ff:
-        case _fisheye_circ:
-        case _panorama:
-        case _lambert:
-        case _mercator:
-	case _millercylindrical:
-        case _sinusoidal:
-            // horizontal pixels per degree
-            mp->distance        = ((double) pn->width) / b;
-            break;
-        case _panini: 
-	    tpara = 1;
-	    panini_erect(b/2.0, 0.0, &tx, &ty, & tpara);
-            mp->distance = pn->width/(2.0*tx);
-            break;
-        case _architectural: 
-	    tpara = 1;
-	    arch_erect(b/2.0, 0.0, &tx, &ty, & tpara);
-            mp->distance = pn->width/(2.0*tx);
-            break;
-        case _lambertazimuthal: 
-	    tpara = 1;
-	    lambertazimuthal_erect(b/2.0, 0.0, &tx, &ty, & tpara);
-            mp->distance = pn->width/(2.0*tx);
-            break;
-        case _stereographic:
-            tpara = 1;
-            stereographic_erect(b/2.0, 0.0, &tx, &ty, & tpara);
-            mp->distance = pn->width/(2.0*tx);
-            break;
-        case _trans_mercator:
-            tpara = 1;
-            transmercator_erect(b/2.0, 0.0, &tx, &ty, &tpara);
-            mp->distance = pn->width/(2.0*tx);
-            break;
-	case _albersequalareaconic:
-	    mp->distance = 1.0;
-	    //albersequalareaconic_erect(1.924913116, -PI/2.0, &tx, &ty, mp); //b/2.0
-	    albersequalareaconic_distance(&tx, mp);
-	    mp->distance = pn->width/(2.0*tx);
-	    break;
-        default:
-            // unknown
-            PrintError ("SetMakeParams: Unsupported panorama projection");
-            // no way to report an error back to the caller...
-            mp->distance = 1;
-        }
+  // calculate distance
+  switch (pn->format)
+  {
+    case _rectilinear:
+      mp->distance        = (double) pn->width / (2.0 * tan(b/2.0));
+      break;
+    case _equirectangular:
+    case _fisheye_ff:
+    case _fisheye_circ:
+    case _panorama:
+    case _lambert:
+    case _mercator:
+    case _millercylindrical:
+    case _sinusoidal:
+    case _mirror:
+      // horizontal pixels per degree
+      mp->distance        = ((double) pn->width) / b;
+      break;
+    case _panini: 
+      tpara = 1;
+      panini_erect(b/2.0, 0.0, &tx, &ty, & tpara);
+      mp->distance = pn->width/(2.0*tx);
+      break;
+    case _architectural: 
+      tpara = 1;
+      arch_erect(b/2.0, 0.0, &tx, &ty, & tpara);
+      mp->distance = pn->width/(2.0*tx);
+      break;
+    case _lambertazimuthal: 
+      tpara = 1;
+      lambertazimuthal_erect(b/2.0, 0.0, &tx, &ty, & tpara);
+      mp->distance = pn->width/(2.0*tx);
+      break;
+    case _stereographic:
+      tpara = 1;
+      stereographic_erect(b/2.0, 0.0, &tx, &ty, & tpara);
+      mp->distance = pn->width/(2.0*tx);
+      break;
+    case _trans_mercator:
+      tpara = 1;
+      transmercator_erect(b/2.0, 0.0, &tx, &ty, &tpara);
+      mp->distance = pn->width/(2.0*tx);
+      break;
+    case _albersequalareaconic:
+      mp->distance = 1.0;
+      //albersequalareaconic_erect(1.924913116, -PI/2.0, &tx, &ty, mp); //b/2.0
+      albersequalareaconic_distance(&tx, mp);
+      mp->distance = pn->width/(2.0*tx);
+      break;
+    case _equisolid:
+      mp->distance  = (double) pn->width / (4.0 * sin(b/4.0));
+      break;
+    case _orthographic:
+      mp->distance  = (double) pn->width / (2.0 * sin(b/2.0));
+      break;
+    default:
+      // unknown
+      PrintError ("SetMakeParams: Unsupported panorama projection");
+      // no way to report an error back to the caller...
+      mp->distance = 1;
+      break;
+  }
 
-        // calculate final scaling factor, that reverses the mp->distance
-        // scaling and applies the required output scaling factor
-        switch (im->format)
-        {
-        case _rectilinear:
-            // calculate distance for this projection
-            mp->scale[0] = (double) image_selection_width / (2.0 * tan(a/2.0)) / mp->distance;
-            break;
-        case _equirectangular:
-        case _panorama:
-        case _fisheye_ff:
-        case _fisheye_circ:
-        case _mercator:
-        case _sinusoidal:
-            mp->scale[0] = ((double) image_selection_width) / a / mp->distance;
-            break;
-        default:
-            PrintError ("SetMakeParams: Unsupported input image projection");
-            // no way to report an error back to the caller...
-            mp->scale[0] = 1;
-        }
-        mp->scale[1]    = mp->scale[0];
+  // calculate final scaling factor, that reverses the mp->distance
+  // scaling and applies the required output scaling factor
+  switch (im->format)
+  {
+    case _rectilinear:
+      // calculate distance for this projection
+      mp->scale[0] = (double) image_selection_width / (2.0 * tan(a/2.0)) / mp->distance;
+      break;
+    case _equirectangular:
+    case _panorama:
+    case _fisheye_ff:
+    case _fisheye_circ:
+    case _mercator:
+    case _sinusoidal:
+      mp->scale[0] = ((double) image_selection_width) / a / mp->distance;
+      break;
+    case _equisolid:
+    case _mirror:
+      mp->scale[0] = (double) image_selection_width / (4.0 * sin(a/4.0)) / mp->distance;
+      break;
+    case _orthographic:
+      mp->scale[0] = (double) image_selection_width / (2.0 * sin(a/2.0)) / mp->distance;
+      break;
+    case _stereographic:
+      mp->scale[0] = (double) image_selection_width / (4.0 * tan(a/4.0)) / mp->distance;
+      break;
+    default:
+      PrintError ("SetMakeParams: Unsupported input image projection");
+      // no way to report an error back to the caller...
+      mp->scale[0] = 1;
+      break;
+    }
+    mp->scale[1]    = mp->scale[0];
 
-//        printf("new params: mp->distance: %lf, mp->scale: %lf\n\n", mp->distance, mp->scale[0]);
+//  printf("new params: mp->distance: %lf, mp->scale: %lf\n\n", mp->distance, mp->scale[0]);
 
-	mp->shear[0] 	= im->cP.shear_x / image_selection_height;
-	mp->shear[1] 	= im->cP.shear_y / image_selection_width;
-	mp->rot[0]		= mp->distance * PI;								// 180 in screenpoints
-	mp->rot[1]		= -im->yaw *  mp->distance * PI / 180.0; 			//    rotation angle in screenpoints
+    mp->shear[0]    = im->cP.shear_x / image_selection_height;
+    mp->shear[1]    = im->cP.shear_y / image_selection_width;
+    mp->rot[0]      = mp->distance * PI;                                // 180 in screenpoints
+    mp->rot[1]      = -im->yaw *  mp->distance * PI / 180.0;            // rotation angle in screenpoints
 
+    /*
+    printf("Image format %d\n", im->format);
+    printf("shear[0] %f\n", mp->shear[0]);
+    printf("shear[1] %f\n", mp->shear[1]);
+    printf("rot[0] %f\n", mp->rot[0]);
+    printf("rot[1] %f\n", mp->rot[1]);
+    printf("scale[0] %f\n", mp->rot[0]);
+    */
 
-	/*
-	printf("Image format %d\n", im->format);
-	printf("shear[0] %f\n", mp->shear[0]);
-	printf("shear[1] %f\n", mp->shear[1]);
-	printf("rot[0] %f\n", mp->rot[0]);
-	printf("rot[1] %f\n", mp->rot[1]);
-	printf("scale[0] %f\n", mp->rot[0]);
-	*/
+    mp->perspect[0] = (void*)(mp->mt);
+    mp->perspect[1] = (void*)&(mp->distance);
+            
+    for(i=0; i<4; i++)
+      mp->rad[i]  = im->cP.radial_params[color][i];
+    mp->rad[5] = im->cP.radial_params[color][4];
 
+    if( (im->cP.correction_mode & 3) == correction_mode_radial )
+      mp->rad[4]  = ( (double)( image_selection_width < image_selection_height ? image_selection_width : image_selection_height) ) / 2.0;
+    else
+      mp->rad[4]  = ((double) image_selection_height) / 2.0;
 
-	mp->perspect[0] = (void*)(mp->mt);
-	mp->perspect[1] = (void*)&(mp->distance);
-			
-	for(i=0; i<4; i++)
-		mp->rad[i] 	= im->cP.radial_params[color][i];
-	mp->rad[5] = im->cP.radial_params[color][4];
-
-	if( (im->cP.correction_mode & 3) == correction_mode_radial )
-		mp->rad[4] 	= ( (double)( image_selection_width < image_selection_height ? image_selection_width : image_selection_height) ) / 2.0;
-	else
-		mp->rad[4] 	= ((double) image_selection_height) / 2.0;
-
-
 // Joost: removed, see above
-//	mp->horizontal 	= im->cP.horizontal_params[color];
-//	mp->vertical 	= im->cP.vertical_params[color];
+//  mp->horizontal  = im->cP.horizontal_params[color];
+//  mp->vertical  = im->cP.vertical_params[color];
 
-	i = 0;
+    i = 0;
 
-	if(pn->format == _rectilinear)									// rectilinear panorama
-	{
-		SetDesc(stack[i],	erect_rect,		&(mp->distance)	); i++;	// Convert rectilinear to equirect
-	}
-	else if(pn->format == _panorama)
-	{
-		SetDesc(stack[i],	erect_pano,		&(mp->distance)	); i++;	// Convert panoramic to equirect
-	}
-	else if(pn->format == _fisheye_circ || pn->format == _fisheye_ff)
-	{
-		SetDesc(stack[i],	erect_sphere_tp,		&(mp->distance)	); i++;	// Convert panoramic to sphere
-	}
-   	else if(pn->format == _mercator)
-	{
-		SetDesc(stack[i],	erect_mercator,		&(mp->distance)	); i++;	// Convert mercator to sphere
+    if(pn->format == _rectilinear)                                  // rectilinear panorama
+    {
+      SetDesc(stack[i],   erect_rect,             &(mp->distance) ); i++;   // Convert rectilinear to equirect
     }
-   	else if(pn->format == _millercylindrical)
-	{
-		SetDesc(stack[i],	erect_millercylindrical,		&(mp->distance)	); i++;	// Convert miller to sphere
+    else if(pn->format == _panorama)
+    {
+      SetDesc(stack[i],   erect_pano,             &(mp->distance) ); i++;   // Convert panoramic to equirect
     }
-   	else if(pn->format == _panini)
-	{
-		SetDesc(stack[i],	erect_panini,		&(mp->distance)	); i++;	// Convert panini to sphere
+    else if(pn->format == _fisheye_circ || pn->format == _fisheye_ff)
+    {
+      SetDesc(stack[i],   erect_sphere_tp,        &(mp->distance) ); i++; // Convert fisheye to equirect
     }
-   	else if(pn->format == _architectural)
-	{
-		SetDesc(stack[i],	erect_arch,		&(mp->distance)	); i++;	// Convert arch to sphere
+    else if(pn->format == _equisolid)
+    {
+      SetDesc(stack[i],   sphere_tp_equisolid,    &(mp->distance) ); i++; // Convert fisheye equisolid to spherical
+      SetDesc(stack[i],   erect_sphere_tp,        &(mp->distance) ); i++; // Convert spherical to equirect
     }
-   	else if(pn->format == _lambert)
-	{
-		SetDesc(stack[i],	erect_lambert,		&(mp->distance)	); i++;	// Convert lambert to sphere
+    else if(pn->format == _mirror)
+    {
+      SetDesc(stack[i],   sphere_cp_mirror,       &(mp->distance) ); i++; // Convert mirror to spherical
+      SetDesc(stack[i],   erect_sphere_cp,        &(mp->distance) ); i++; // Convert spherical to equirect
     }
-   	else if(pn->format == _lambertazimuthal)
-	{
-		SetDesc(stack[i],	erect_lambertazimuthal,		&(mp->distance)	); i++;	// Convert lambert to sphere
+    else if(pn->format == _orthographic)
+    {
+      SetDesc(stack[i],   sphere_tp_orthographic, &(mp->distance) ); i++; // Convert fisheye orthographic to spherical
+      SetDesc(stack[i],   erect_sphere_tp,        &(mp->distance) ); i++; // Convert spherical to equirect
     }
-   	else if(pn->format == _trans_mercator)
-	{
-		SetDesc(stack[i], erect_transmercator, &(mp->distance)	); i++;	// Convert transverse mercator to sphere
+    else if(pn->format == _mercator)
+    {
+      SetDesc(stack[i],   erect_mercator,         &(mp->distance) ); i++; // Convert mercator to equirect
     }
-	else if(pn->format == _stereographic)
-	{
-		SetDesc(stack[i], erect_stereographic, &(mp->distance) ); i++;	// Convert stereographic to sphere
+    else if(pn->format == _millercylindrical)
+    {
+      SetDesc(stack[i],   erect_millercylindrical, &(mp->distance) ); i++; // Convert miller to equirect
     }
-   	else if(pn->format == _sinusoidal)
-	{
-		SetDesc(stack[i],	erect_sinusoidal,		&(mp->distance)	); i++;	// Convert sinusoidal to sphere
-	}
-   	else if(pn->format == _albersequalareaconic)
-	{
-		SetDesc(stack[i],	erect_albersequalareaconic,		mp	); i++;	// Convert albersequalareaconic to sphere
-	}
-   	else if(pn->format == _equirectangular) 
-	{
-		// no conversion needed		
+    else if(pn->format == _panini)
+    {
+    SetDesc(stack[i],     erect_panini,           &(mp->distance) ); i++; // Convert panini to sphere
+    }
+    else if(pn->format == _architectural)
+    {
+      SetDesc(stack[i],   erect_arch,             &(mp->distance) ); i++; // Convert arch to sphere
+    }
+    else if(pn->format == _lambert)
+    {
+      SetDesc(stack[i],   erect_lambert,          &(mp->distance) ); i++; // Convert lambert to equirect
+    }
+    else if(pn->format == _lambertazimuthal)
+    {
+      SetDesc(stack[i],   erect_lambertazimuthal, &(mp->distance) ); i++; // Convert lambert to equirect
+    }
+    else if(pn->format == _trans_mercator)
+    {
+      SetDesc(stack[i],   erect_transmercator,    &(mp->distance)  ); i++; // Convert transverse mercator to equirect
+    }
+    else if(pn->format == _stereographic)
+    {
+      SetDesc(stack[i],   erect_stereographic,    &(mp->distance) ); i++;  // Convert stereographic to equirect
+    }
+    else if(pn->format == _sinusoidal)
+    {
+      SetDesc(stack[i],   erect_sinusoidal,       &(mp->distance) ); i++; // Convert sinusoidal to equirect
+    }
+    else if(pn->format == _albersequalareaconic)
+    {
+      SetDesc(stack[i],   erect_albersequalareaconic,     mp  ); i++; // Convert albersequalareaconic to equirect
+    }
+    else if(pn->format == _equirectangular) 
+    {
+      // no conversion needed     
     } else {
-		PrintError("Projection type %d not supported, using equirectangular", pn->format);
-	}
+      PrintError("Projection type %d not supported, using equirectangular", pn->format);
+    }
 
+    SetDesc(  stack[i],   rotate_erect,           mp->rot         ); i++; // Rotate equirect. image horizontally
+    SetDesc(  stack[i],   sphere_tp_erect,        &(mp->distance) ); i++; // Convert spherical image to equirect.
+    SetDesc(  stack[i],   persp_sphere,           mp->perspect    ); i++; // Perspective Control spherical Image
 
-	SetDesc(	stack[i],	rotate_erect,		mp->rot			); i++;	// Rotate equirect. image horizontally
-	SetDesc(	stack[i],	sphere_tp_erect,	&(mp->distance)	); i++;	// Convert spherical image to equirect.
-	SetDesc(	stack[i],	persp_sphere,		mp->perspect	); i++;	// Perspective Control spherical Image
+    if(im->format      == _rectilinear)                                    // rectilinear image
+    {
+      SetDesc(stack[i],   rect_sphere_tp,         &(mp->distance) ); i++; // Convert rectilinear to spherical
+    }
+    else if(im->format == _panorama)                                   //  pamoramic image
+    {
+      SetDesc(stack[i],   pano_sphere_tp,         &(mp->distance) ); i++; // Convert panoramic to spherical
+    }
+    else if(im->format == _equirectangular)                            //  equirectangular image
+    {
+      SetDesc(stack[i],   erect_sphere_tp,        &(mp->distance) ); i++; // Convert equirectangular to spherical
+    }
 
-	if(im->format 		== _rectilinear)									// rectilinear image
-	{
-		SetDesc(stack[i],	rect_sphere_tp,		&(mp->distance)	); i++;	// Convert rectilinear to spherical
-	}
-	else if	(im->format 	== _panorama)									//  pamoramic image
-	{
-		SetDesc(stack[i],	pano_sphere_tp,		&(mp->distance)	); i++;	// Convert panoramic to spherical
-	}
-	else if	(im->format 	== _equirectangular)							//  PSphere image
-	{
-		SetDesc(stack[i],	erect_sphere_tp,	&(mp->distance)	); i++;	// Convert PSphere to spherical
-	}
+    SetDesc(  stack[i],   resize,                 mp->scale       ); i++; // Scale image
 
-	SetDesc(	stack[i],	resize,				mp->scale		); i++; // Scale image
+    if( im->cP.radial )
+    {
+      switch( im->cP.correction_mode & 3 )
+      {
+        case correction_mode_radial:    SetDesc(stack[i],radial,mp->rad);     i++; break;
+        case correction_mode_vertical:  SetDesc(stack[i],vertical,mp->rad);   i++; break;
+        case correction_mode_deregister:SetDesc(stack[i],deregister,mp->rad); i++; break;
+      }
+    }
+    if (mp->vertical != 0.0)
+    {
+      SetDesc(stack[i],   vert,                   &(mp->vertical));   i++;
+    }
+    if (mp->horizontal != 0.0)
+    {
+      SetDesc(stack[i],   horiz,                  &(mp->horizontal)); i++;
+    }
+    if( im->cP.shear )
+    {
+      SetDesc( stack[i],  shear,                  mp->shear       ); i++;
+    }
 
-	if( im->cP.radial )
-	{
-		switch( im->cP.correction_mode & 3 )
-	{
-			case correction_mode_radial:    SetDesc(stack[i],radial,mp->rad); 	  i++; break;
-			case correction_mode_vertical:  SetDesc(stack[i],vertical,mp->rad);   i++; break;
-			case correction_mode_deregister:SetDesc(stack[i],deregister,mp->rad); i++; break;
-		}
-	}
-//	if (  im->cP.vertical)
-	if (mp->vertical != 0.0)
-	{
-		SetDesc(stack[i],vert,				&(mp->vertical)); 	i++;
-	}
-//	if ( im->cP.horizontal )
-	if (mp->horizontal != 0.0)
-		{
-		SetDesc(stack[i],horiz,				&(mp->horizontal)); i++;
-		}
-	if( im->cP.shear )
-	{
-		SetDesc( stack[i],shear,			mp->shear		); i++;
-	}
+    stack[i].func  = (trfn)NULL;
 
-	stack[i].func  = (trfn)NULL;
-
 // print stack for debugging
 #if 0
-	printf( "Rotate params: %lg  %lg\n" , mp->rot[0], mp->rot[1]);
-	printf( "Distance     : %lg\n" , mp->distance);
-	printf( "Perspect params: %lg  %lg  %lg\n",a, beta , gammar );  	
-	if(aP->format 		== _rectilinear)									// rectilinear image
-	{
-		printf( "Rectilinear\n" );  	
-	}
-	else if	(aP->format 	== _panorama)									//  pamoramic image
-	{
-		printf( "Panorama\n" );
-	}
-	else
-		printf( "Fisheye\n" );  	
-	
-	printf( "Scaling     : %lg\n" , mp->scale[0]);
+    printf( "Rotate params: %lg  %lg\n" , mp->rot[0], mp->rot[1]);
+    printf( "Distance     : %lg\n" , mp->distance);
+    printf( "Perspect params: %lg  %lg  %lg\n",a, beta , gammar );      
+    if(aP->format       == _rectilinear)                                    // rectilinear image
+    {
+      printf( "Rectilinear\n" );      
+    }
+    else if (aP->format     == _panorama)                                   //  pamoramic image
+    {
+      printf( "Panorama\n" );
+    }
+    else
+    {
+      printf( "Fisheye\n" );      
+    }
 
-	if(  aP->correct )
-	{
-		printf( "Correct:\n" );  	
-		if( aP->c_prefs.shear )
-		{
-			printf( "Shear: %lg\n", mp->shear );  	
-		}
-		if ( aP->c_prefs.horizontal )
-		{
-			printf( "horiz:%lg\n", mp->horizontal );  
-		}
-		if (  aP->c_prefs.vertical)
-		{
-			printf( "vert:%lg\n", mp->vertical );  
-		}
-		if( aP->c_prefs.radial )
-		{
-			printf( "Polynomial:\n" );  	
-			if( aP->c_prefs.isScanningSlit )
-			{
-				printf( "Scanning Slit:\n" );  	
-			}
-			else
-			{
-				printf( "Radial:\n" );  	
-				printf( "Params: %lg %lg %lg %lg %lg\n", mp->rad[0],mp->rad[1],mp->rad[2],mp->rad[3],mp->rad[4] );  	
-			}
-		}
-	}
+    printf( "Scaling     : %lg\n" , mp->scale[0]);
 
+    if(  aP->correct )
+    {
+      printf( "Correct:\n" );     
+      if( aP->c_prefs.shear )
+      {
+        printf( "Shear: %lg\n", mp->shear );    
+      }
+      if ( aP->c_prefs.horizontal )
+      {
+        printf( "horiz:%lg\n", mp->horizontal );  
+      }
+      if (  aP->c_prefs.vertical)
+      {
+        printf( "vert:%lg\n", mp->vertical );  
+      }
+      if( aP->c_prefs.radial )
+      {
+        printf( "Polynomial:\n" );      
+        if( aP->c_prefs.isScanningSlit )
+        {
+          printf( "Scanning Slit:\n" );   
+        }
+        else
+        {
+          printf( "Radial:\n" );      
+          printf( "Params: %lg %lg %lg %lg %lg\n", mp->rad[0],mp->rad[1],mp->rad[2],mp->rad[3],mp->rad[4] );      
+        }
+      }
+    }
+
 #endif
 }
 
 
 // Set inverse Makeparameters depending on adjustprefs, color and source image
 
-void 	SetInvMakeParams( struct fDesc *stack, struct MakeParams *mp, Image *im , Image *pn, int color )
+void  SetInvMakeParams( struct fDesc *stack, struct MakeParams *mp, Image *im , Image *pn, int color )
 {
 
-	int 		i;
-	double		a,b;							// field of view in rad
-	double      tx,ty,tpara;
+  int     i;
+  double    a,b;              // field of view in rad
+  double      tx,ty,tpara;
 
-	a =	 DEG_TO_RAD( im->hfov );	// field of view in rad		
-	b =	 DEG_TO_RAD( pn->hfov );
+  a =  DEG_TO_RAD( im->hfov );  // field of view in rad   
+  b =  DEG_TO_RAD( pn->hfov );
 
 
-	mp->im = im;
-	mp->pn = pn;
-	SetMatrix( 	DEG_TO_RAD( im->pitch ), 
-				0.0, 
-				DEG_TO_RAD( im->roll ), 
-				mp->mt, 
-				1 );
+  mp->im = im;
+  mp->pn = pn;
+  SetMatrix( DEG_TO_RAD( im->pitch ), 
+             0.0, 
+             DEG_TO_RAD( im->roll ), 
+             mp->mt, 
+             1 );
 
-        // dangelo: added mercator, sinusoidal and stereographic projection
-        switch (pn->format)
-        {
-        case _rectilinear:
-            mp->distance        = (double) pn->width / (2.0 * tan(b/2.0));
-            break;
-        case _equirectangular:
-        case _fisheye_ff:
-        case _fisheye_circ:
-        case _panorama:
-        case _lambert:
-        case _mercator:
-        case _millercylindrical:
-        case _sinusoidal:
-            // horizontal pixels per degree
-            mp->distance        = ((double) pn->width) / b;
-            break;
-	case _lambertazimuthal:
-	    tpara = 1;
-	    lambertazimuthal_erect(b/2.0, 0.0, &tx, &ty, & tpara);
-	    mp->distance = pn->width/(2.0*tx);
-            break;
-	case _panini:
-	    tpara = 1;
-	    panini_erect(b/2.0, 0.0, &tx, &ty, & tpara);
-	    mp->distance = pn->width/(2.0*tx);
-            break;
-	case _architectural:
-	    tpara = 1;
-	    arch_erect(b/2.0, 0.0, &tx, &ty, & tpara);
-	    mp->distance = pn->width/(2.0*tx);
-            break;
-        case _stereographic:
-            tpara = 1;
-            stereographic_erect(b/2.0, 0.0, &tx, &ty, & tpara);
-            mp->distance = pn->width/(2.0*tx);
-            break;
-        case _trans_mercator:
-            tpara = 1;
-            transmercator_erect(b/2.0, 0.0, &tx, &ty, & tpara);
-            mp->distance = pn->width/(2.0*tx);
-            break;
-        case _albersequalareaconic:
-            mp->distance = 1.0;
-            //albersequalareaconic_erect(1.924913116, -PI/2.0, &tx, &ty, mp);  //b/2.0
-	    albersequalareaconic_distance(&tx, mp);
-            mp->distance = pn->width/(2.0*tx);
-            break;
-        default:
-            // unknown
-            PrintError ("SetInvMakeParams: Unsupported panorama projection");
-            // no way to report an error back to the caller...
-            mp->distance = 1;
-        }
+  // dangelo: added mercator, sinusoidal and stereographic projection
+  switch (pn->format)
+  {
+    case _rectilinear:
+      mp->distance        = (double) pn->width / (2.0 * tan(b/2.0));
+      break;
+    case _equirectangular:
+    case _fisheye_ff:
+    case _fisheye_circ:
+    case _panorama:
+    case _lambert:
+    case _mercator:
+    case _millercylindrical:
+    case _sinusoidal:
+    case _mirror:
+      // horizontal pixels per rads
+      mp->distance        = ((double) pn->width) / b;
+      break;
+    case _lambertazimuthal:
+      tpara = 1;
+      lambertazimuthal_erect(b/2.0, 0.0, &tx, &ty, & tpara);
+      mp->distance = pn->width/(2.0*tx);
+      break;
+    case _panini:
+      tpara = 1;
+      panini_erect(b/2.0, 0.0, &tx, &ty, & tpara);
+      mp->distance = pn->width/(2.0*tx);
+      break;
+    case _architectural:
+      tpara = 1;
+      arch_erect(b/2.0, 0.0, &tx, &ty, & tpara);
+      mp->distance = pn->width/(2.0*tx);
+      break;
+    case _stereographic:
+      tpara = 1;
+      stereographic_erect(b/2.0, 0.0, &tx, &ty, & tpara);
+      mp->distance = pn->width/(2.0*tx);
+      break;
+    case _trans_mercator:
+      tpara = 1;
+      transmercator_erect(b/2.0, 0.0, &tx, &ty, & tpara);
+      mp->distance = pn->width/(2.0*tx);
+      break;
+    case _albersequalareaconic:
+      mp->distance = 1.0;
+      //albersequalareaconic_erect(1.924913116, -PI/2.0, &tx, &ty, mp);  //b/2.0
+    albersequalareaconic_distance(&tx, mp);
+      mp->distance = pn->width/(2.0*tx);
+      break;
+    case _equisolid:
+      mp->distance  = (double) pn->width / (4.0 * sin(b/4.0));
+      break;
+    case _orthographic:
+      mp->distance  = (double) pn->width / (2.0 * sin(b/2.0));
+      break;
+    default:
+      // unknown
+      PrintError ("SetInvMakeParams: Unsupported panorama projection");
+      // no way to report an error back to the caller...
+      mp->distance = 1;
+      break;
+  }
 
-        // calculate final scaling factor, that reverses the mp->distance
-        // scaling and applies the required output scaling factor
-        switch (im->format)
-        {
-        case _rectilinear:
-            // calculate distance for this projection
-            mp->scale[0] = (double) im->width / (2.0 * tan(a/2.0)) / mp->distance;
-            break;
-        case _equirectangular:
-        case _panorama:
-        case _fisheye_ff:
-        case _fisheye_circ:
-        case _mercator:
-        case _sinusoidal:
-            mp->scale[0] = ((double) im->width) / a / mp->distance;
-            break;
-        default:
-            PrintError ("SetInvMakeParams: Unsupported input image projection");
-            // no way to report an error back to the caller...
-            mp->scale[0] = 1;
-        }
-        mp->scale[1]    = mp->scale[0];
+  // calculate final scaling factor, that reverses the mp->distance
+  // scaling and applies the required output scaling factor
+  switch (im->format)
+  {
+    case _rectilinear:
+      // calculate distance for this projection
+      mp->scale[0] = (double) im->width / (2.0 * tan(a/2.0)) / mp->distance;
+      break;
+    case _equirectangular:
+    case _panorama:
+    case _fisheye_ff:
+    case _fisheye_circ:
+    case _mercator:
+    case _sinusoidal:
+      mp->scale[0] = ((double) im->width) / a / mp->distance;
+      break;
+    case _equisolid:
+    case _mirror:
+      mp->scale[0] = (double) im->width / (4.0 * sin(a/4.0)) / mp->distance;
+      break;
+    case _orthographic:
+      mp->scale[0] = (double) im->width / (2.0 * sin(a/2.0)) / mp->distance;
+      break;
+    case _stereographic:
+      mp->scale[0] = (double) im->width / (4.0 * tan(a/4.0)) / mp->distance;
+      break;
+   default:
+      PrintError ("SetInvMakeParams: Unsupported input image projection");
+      // no way to report an error back to the caller...
+      mp->scale[0] = 1;
+      break;
+  }
+  mp->scale[1]    = mp->scale[0];
 
-        /*
-	if(pn->format == _rectilinear)									// rectilinear panorama
-	{
-		mp->distance 	= (double) pn->width / (2.0 * tan(b/2.0));
-		if(im->format == _rectilinear)										// rectilinear image
-		{
-			mp->scale[0] = ((double)pn->hfov / im->hfov) * 
-						   (a /(2.0 * tan(a/2.0))) * ((double)im->width/(double) pn->width)
-						   * 2.0 * tan(b/2.0) / b; 
+  mp->shear[0]  = -im->cP.shear_x / im->height;
+  mp->shear[1]  = -im->cP.shear_y / im->width;
+  
+  mp->scale[0] = 1.0 / mp->scale[0];
+  mp->scale[1]  = mp->scale[0];
+  mp->horizontal  = -im->cP.horizontal_params[color];
+  mp->vertical  = -im->cP.vertical_params[color];
+  for(i=0; i<4; i++)
+    mp->rad[i]  = im->cP.radial_params[color][i];
+  mp->rad[5] = im->cP.radial_params[color][4];
+  
+  switch( im->cP.correction_mode & 3 )
+  {
+    case correction_mode_radial: mp->rad[4] = ((double)(im->width < im->height ? im->width : im->height) ) / 2.0;break;
+    case correction_mode_vertical: 
+    case correction_mode_deregister: mp->rad[4] = ((double) im->height) / 2.0;break;
+  }
 
-		}
-		else 																//  pamoramic or fisheye image
-		{
-			mp->scale[0] = ((double)pn->hfov / im->hfov) * ((double)im->width/ (double) pn->width)
-						   * 2.0 * tan(b/2.0) / b; 
-		}
-	}
-	else																// equirectangular or panoramic 
-	{
-		mp->distance 	= ((double) pn->width) / b;
-		if(im->format == _rectilinear)										// rectilinear image
-		{
-			mp->scale[0] = ((double)pn->hfov / im->hfov) * (a /(2.0 * tan(a/2.0))) * ((double)im->width)/ ((double) pn->width); 
+  mp->rot[0]    = mp->distance * PI;                // 180 in screenpoints
+  mp->rot[1]    = im->yaw *  mp->distance * PI / 180.0;       //    rotation angle in screenpoints
 
-		}
-		else 																//  pamoramic or fisheye image
-		{
-			mp->scale[0] = ((double)pn->hfov / im->hfov) * ((double)im->width)/ ((double) pn->width); 
-		}
-	}
-        */
+  mp->perspect[0] = (void*)(mp->mt);
+  mp->perspect[1] = (void*)&(mp->distance);
 
-	mp->shear[0] 	= -im->cP.shear_x / im->height;
-	mp->shear[1] 	= -im->cP.shear_y / im->width;
-	
-	mp->scale[0] = 1.0 / mp->scale[0];
-	mp->scale[1] 	= mp->scale[0];
-	mp->horizontal 	= -im->cP.horizontal_params[color];
-	mp->vertical 	= -im->cP.vertical_params[color];
-	for(i=0; i<4; i++)
-		mp->rad[i] 	= im->cP.radial_params[color][i];
-	mp->rad[5] = im->cP.radial_params[color][4];
-	
-	switch( im->cP.correction_mode & 3 )
-	{
-		case correction_mode_radial: mp->rad[4] = ((double)(im->width < im->height ? im->width : im->height) ) / 2.0;break;
-		case correction_mode_vertical: 
-		case correction_mode_deregister: mp->rad[4] = ((double) im->height) / 2.0;break;
-	}
 
-	mp->rot[0]		= mp->distance * PI;								// 180 in screenpoints
-	mp->rot[1]		= im->yaw *  mp->distance * PI / 180.0; 			//    rotation angle in screenpoints
+  i = 0;  // Stack counter
+    
+    // Perform radial correction
+  if( im->cP.shear )
+  {
+    SetDesc( stack[i],shear,      mp->shear   ); i++;
+  }
+    
+  if ( im->cP.horizontal )
+  {
+    SetDesc(stack[i],horiz,       &(mp->horizontal)); i++;
+  }
+  if (  im->cP.vertical)
+  {
+    SetDesc(stack[i],vert,        &(mp->vertical));   i++;
+  }
+  if(   im->cP.radial )
+  {
+    switch( im->cP.correction_mode & 3)
+    {
+      case correction_mode_radial:   SetDesc(stack[i],inv_radial,mp->rad);  i++; break;
+      case correction_mode_vertical: SetDesc(stack[i],inv_vertical,mp->rad);  i++; break;
+      case correction_mode_deregister: break;
+    }
+  }
+  
+  SetDesc(  stack[i], resize,       mp->scale   ); i++; // Scale image
+  
+  if(im->format     == _rectilinear)                  // rectilinear image
+  {
+    SetDesc(stack[i], sphere_tp_rect,   &(mp->distance) ); i++; // Convert rectilinear to spherical
+  }
+  else if (im->format   == _panorama)                 //  pamoramic image
+  {
+    SetDesc(stack[i], sphere_tp_pano,   &(mp->distance) ); i++; // Convert panoramic to spherical
+  }
+  else if (im->format   == _equirectangular)          //  equirectangular image
+  {
+    SetDesc(stack[i], sphere_tp_erect,  &(mp->distance) ); i++; // Convert equirectangular to spherical
+  }
+  else if (im->format   == _mirror)                   //  Mirror image
+  {
+//todo    SetDesc(stack[i], sphere_tp_mirror,  &(mp->distance) ); i++; // Convert mirror to spherical
+  }
+  else if (im->format   == _equisolid)                //  Fisheye equisolid image
+  {
+    SetDesc(stack[i], sphere_tp_equisolid,  &(mp->distance) ); i++; // Convert equisolid to spherical
+  }
+  else if (im->format   == _orthographic)             //  Fisheye orthographic image
+  {
+    SetDesc(stack[i], sphere_tp_orthographic,  &(mp->distance) ); i++; // Convert orthographic to spherical
+  }
+  else if (im->format   == _stereographic)             //  Fisheye orthographic image
+  {
+    //SetDesc(stack[i], sphere_tp_stereographic,  &(mp->distance) ); i++; // Convert stereographic to spherical
+  }
 
-	mp->perspect[0] = (void*)(mp->mt);
-	mp->perspect[1] = (void*)&(mp->distance);
 
+  SetDesc(  stack[i], persp_sphere,   mp->perspect  ); i++; // Perspective Control spherical Image
+  SetDesc(  stack[i], erect_sphere_tp,  &(mp->distance) ); i++; // Convert spherical image to equirect.
+  SetDesc(  stack[i], rotate_erect,   mp->rot     ); i++; // Rotate equirect. image horizontally
 
-
-
-	i = 0;	// Stack counter
-		
-		// Perform radial correction
-	if( im->cP.shear )
-	{
-		SetDesc( stack[i],shear,			mp->shear		); i++;
-	}
-		
-	if ( im->cP.horizontal )
-	{
-		SetDesc(stack[i],horiz,				&(mp->horizontal)); i++;
-	}
-	if (  im->cP.vertical)
-	{
-		SetDesc(stack[i],vert,				&(mp->vertical)); 	i++;
-	}
-	if(   im->cP.radial )
-	{
-		switch( im->cP.correction_mode & 3)
-		{
-			case correction_mode_radial:   SetDesc(stack[i],inv_radial,mp->rad); 	i++; break;
-			case correction_mode_vertical: SetDesc(stack[i],inv_vertical,mp->rad); 	i++; break;
-			case correction_mode_deregister: break;
-		}
-	}
-	
-	SetDesc(	stack[i],	resize,				mp->scale		); i++; // Scale image
-	
-	if(im->format 		== _rectilinear)									// rectilinear image
-	{
-		SetDesc(stack[i],	sphere_tp_rect,		&(mp->distance)	); i++;	// 
-	}
-	else if	(im->format 	== _panorama)									//  pamoramic image
-	{
-		SetDesc(stack[i],	sphere_tp_pano,		&(mp->distance)	); i++;	// Convert panoramic to spherical
-	}
-	else if	(im->format 	== _equirectangular)							//  PSphere image
-	{
-		SetDesc(stack[i],	sphere_tp_erect,	&(mp->distance)	); i++;	// Convert Psphere to spherical
-	}
-
-
-	SetDesc(	stack[i],	persp_sphere,		mp->perspect	); i++;	// Perspective Control spherical Image
-	SetDesc(	stack[i],	erect_sphere_tp,	&(mp->distance)	); i++;	// Convert spherical image to equirect.
-	SetDesc(	stack[i],	rotate_erect,		mp->rot			); i++;	// Rotate equirect. image horizontally
-
-	if(pn->format == _rectilinear)									// rectilinear panorama
-	{
-		SetDesc(stack[i],	rect_erect,		&(mp->distance)	); i++;	// Convert rectilinear to spherical
-	}
-	else if(pn->format == _panorama)
-	{
-		SetDesc(stack[i],	pano_erect,		&(mp->distance)	); i++;	// Convert rectilinear to spherical
-	}
-	else if(pn->format == _fisheye_circ || pn->format == _fisheye_ff )
-	{
-		SetDesc(stack[i],	sphere_tp_erect,		&(mp->distance)	); i++;	// Convert rectilinear to spherical
-	}
-   	else if(pn->format == _mercator)
-	{
-		SetDesc(stack[i],	mercator_erect,		&(mp->distance)	); i++;	// Convert sphere to sphere
-    }
-   	else if(pn->format == _millercylindrical)
-	{
-		SetDesc(stack[i],	millercylindrical_erect,		&(mp->distance)	); i++;	// Convert sphere to sphere
-    }
-   	else if(pn->format == _panini)
-	{
-		SetDesc(stack[i],	panini_erect,		&(mp->distance)	); i++;	// Convert panini to sphere
-    }
-   	else if(pn->format == _architectural)
-	{
-		SetDesc(stack[i],	arch_erect,		&(mp->distance)	); i++;	// Convert arch to sphere
-    }
-   	else if(pn->format == _lambert)
-	{
-		SetDesc(stack[i],	lambert_erect,		&(mp->distance)	); i++;	// Convert sphere to lambert
-    }
-   	else if(pn->format == _lambertazimuthal)
-	{
-		SetDesc(stack[i],	lambertazimuthal_erect,		&(mp->distance)	); i++;	// Convert sphere to lambert azimuthal
-    }
-   	else if(pn->format == _trans_mercator)
-	{
-		SetDesc(stack[i],	transmercator_erect,		&(mp->distance)	); i++;	// Convert sphere to transverse mercator
-    }
-	else if(pn->format == _stereographic)
-	{
-		SetDesc(stack[i],	stereographic_erect,		&(mp->distance)	); i++;	// Convert sphere to stereographic
-    }
-   	else if(pn->format == _sinusoidal)
-	{
-		SetDesc(stack[i],	sinusoidal_erect,		&(mp->distance)	); i++;	// Convert sphere to sinusoidal
-	}
-   	else if(pn->format == _albersequalareaconic)
-	{
-		SetDesc(stack[i],	albersequalareaconic_erect,		mp	); i++;	// Convert sphere to albersequalareaconic
-	}
-   	else if(pn->format == _equirectangular) 
-	{
-		// no conversion needed		
-    } else {
-		PrintError("Projection type %d not supported, using equirectangular", pn->format);
-	}
-	
-	stack[i].func = (trfn)NULL;
+  if(pn->format == _rectilinear)                  // rectilinear panorama
+  {
+    SetDesc(stack[i], rect_erect,   &(mp->distance) ); i++; // Convert equirectangular to rectilinear
+  }
+  else if(pn->format == _panorama)
+  {
+    SetDesc(stack[i], pano_erect,   &(mp->distance) ); i++; // Convert equirectangular to Cylindrical panorama
+  }
+  else if(pn->format == _fisheye_circ || pn->format == _fisheye_ff )
+  {
+    SetDesc(stack[i], sphere_tp_erect,    &(mp->distance) ); i++; // Convert equirectangular to spherical
+  }
+  else if(pn->format == _mercator)
+  {
+    SetDesc(stack[i], mercator_erect,   &(mp->distance) ); i++; // Convert equirectangular to mercator
+  }
+  else if(pn->format == _millercylindrical)
+  {
+    SetDesc(stack[i], millercylindrical_erect,    &(mp->distance) ); i++; // Convert equirectangular to miller cylindrical
+  }
+  else if(pn->format == _panini)
+  {
+    SetDesc(stack[i], panini_erect,  &(mp->distance) ); i++; // Convert panini to sphere
+  }
+  else if(pn->format == _architectural)
+  {
+    SetDesc(stack[i], arch_erect,   &(mp->distance) ); i++; // Convert arch to sphere
+  }
+  else if(pn->format == _lambert)
+  {
+    SetDesc(stack[i], lambert_erect,    &(mp->distance) ); i++; // Convert equirectangular to lambert
+  }
+  else if(pn->format == _lambertazimuthal)
+  {
+    SetDesc(stack[i], lambertazimuthal_erect,   &(mp->distance) ); i++; // Convert equirectangular to lambert azimuthal
+  }
+  else if(pn->format == _trans_mercator)
+  {
+    SetDesc(stack[i], transmercator_erect,    &(mp->distance) ); i++; // Convert equirectangular to transverse mercator
+  }
+  else if(pn->format == _mirror)
+  {
+    SetDesc(stack[i], mirror_erect,    &(mp->distance) ); i++; // Convert equirectangular to mirror
+  }
+  else if(pn->format == _stereographic)
+  {
+    SetDesc(stack[i], stereographic_erect,    &(mp->distance) ); i++; // Convert equirectangular to stereographic
+  }
+    else if(pn->format == _sinusoidal)
+  {
+    SetDesc(stack[i], sinusoidal_erect,   &(mp->distance) ); i++; // Convert equirectangular to sinusoidal
+  }
+  else if(pn->format == _albersequalareaconic)
+  {
+    SetDesc(stack[i], albersequalareaconic_erect,   mp  ); i++; // Convert equirectangular to albersequalareaconic
+  }
+  else if(pn->format == _equisolid )
+  {
+    SetDesc(stack[i], sphere_tp_erect,    &(mp->distance) ); i++; // Convert equirectangular to spherical
+    SetDesc(stack[i], equisolid_sphere_tp,    &(mp->distance) ); i++; // Convert spherical to equisolid
+  }
+  else if(pn->format == _orthographic )
+  {
+    SetDesc(stack[i], sphere_tp_erect,    &(mp->distance) ); i++; // Convert equirectangular to spherical
+    SetDesc(stack[i], orthographic_sphere_tp,    &(mp->distance) ); i++; // Convert spherical to orthographic
+  }
+  else if(pn->format == _equirectangular) 
+  {
+    // no conversion needed   
+  }
+  else 
+  {
+    PrintError("Projection type %d not supported, using equirectangular", pn->format);
+  }
+  
+  stack[i].func = (trfn)NULL;
 }
 
-void 	SetInvMakeParamsCorrect( struct fDesc *stack, struct MakeParams *mp, Image *im , Image *pn, int color )
+void SetInvMakeParamsCorrect( struct fDesc *stack, struct MakeParams *mp, Image *im , Image *pn, int color )
 {
 /* Thomas Rauscher, Sep 2005: Transfered the changes of Joost Nieuwenhuijse for MakeParams
    to the inverse function. This has broken the optimizer, now there are two functions.
 */
 
-	Image imSel;	/* create a tempory copy of the image to manipulate */
-	memcpy( &imSel, im, sizeof(Image));
+  Image imSel; /* create a tempory copy of the image to manipulate */
+  memcpy( &imSel, im, sizeof(Image));
 
-	if(im->cP.horizontal)
+  if(im->cP.horizontal)
     {
         mp->horizontal = im->cP.horizontal_params[color];
     }
@@ -2569,7 +2616,7 @@
 				"Image height must be positive",
 				"Field of View must be positive",
 				"Field of View must be smaller than 180 degrees in rectilinear Images",
-				"Unsupported Image Format (must be 0,1,2,3 or 4)",
+				"Unsupported Image Format (must be 0,1,2,3,4,7,8,10,14 or 19)",
 				"Panorama Width must be positive",
 				"Panorama Height must be positive",
 				"Field of View must be smaller than 180 degrees in rectilinear Panos",
@@ -2590,9 +2637,12 @@
 		if( g->im[i].height <= 0 )		err = 4;
 		if( g->im[i].hfov   <= 0.0 )	err = 5;
 		if( g->im[i].format == _rectilinear && g->im[i].hfov >= 180.0 )	err = 6;
-		if( g->im[i].format != _rectilinear && g->im[i].format != _panorama &&
-		    g->im[i].format != _fisheye_circ && g->im[i].format != _fisheye_ff && g->im[i].format != _equirectangular)
-										err = 7;
+		if( g->im[i].format != _rectilinear     && g->im[i].format != _panorama &&
+        g->im[i].format != _fisheye_circ    && g->im[i].format != _fisheye_ff && 
+        g->im[i].format != _equirectangular && g->im[i].format != _orthographic &&
+        g->im[i].format != _mirror          && g->im[i].format != _stereographic && 
+        g->im[i].format != _equisolid)
+            err = 7;
 	}
 	
 	// Check Panorama specs
@@ -2603,13 +2653,12 @@
 	if( g->pano.format == _rectilinear && g->pano.hfov >= 180.0 )	err = 10;
 	
 	
-	if( g->pano.format != _rectilinear 		&& g->pano.format != _panorama &&
-		g->pano.format != _equirectangular 	&& g->pano.format != _fisheye_ff &&
-		g->pano.format != _stereographic 	&& g->pano.format != _mercator &&
-		g->pano.format != _trans_mercator 	&& g->pano.format != _sinusoidal &&
- 	        g->pano.format != _lambert              && g->pano.format != _lambertazimuthal &&
-		g->pano.format != _albersequalareaconic
-	     ) 
+	if( g->pano.format != _rectilinear        && g->pano.format != _panorama &&
+      g->pano.format != _equirectangular    && g->pano.format != _fisheye_ff &&
+      g->pano.format != _stereographic      && g->pano.format != _mercator &&
+      g->pano.format != _trans_mercator     && g->pano.format != _sinusoidal &&
+      g->pano.format != _lambert            && g->pano.format != _lambertazimuthal &&
+      g->pano.format != _albersequalareaconic) 
 		    	err=11;
 		    
 	// Check Control Points

Modified: trunk/libpano/doc/Optimize.txt
===================================================================
--- trunk/libpano/doc/Optimize.txt	2008-12-31 05:25:43 UTC (rev 917)
+++ trunk/libpano/doc/Optimize.txt	2008-12-31 05:59:23 UTC (rev 918)
@@ -20,17 +20,22 @@
 # w1000        width in pixels
 # h600         height in pixels (default: width/2)
 # f0            projection format,
-#                  0 - rectilinear (for printing and viewing)
+#                  0 - Rectilinear (for printing and viewing)
 #                  1 - Cylindrical (for Printing and QTVR)
 #                  2 - Equirectangular ( for Spherical panos), default
-#                  3 - full-frame fisheye
-#                  4 - stereographic
-#                  5 - mercator
-#                  6 - transverse mercator
-#                  7 - sinusoidal
+#                  3 - Fisheye Equidistance full-frame
+#                  4 - Fisheye Stereographic full-frame
+#                  5 - Mercator
+#                  6 - Transverse Mercator
+#                  7 - Sinusoidal
 #                  8 - Lambert Equal Area Cylindrical
 #                  9 - Lambert Azimuthal
 #                 10 - Albers Equal Area Conical
+#                 11 - Miller Cylindrical
+#                 12 - Panini (for wide angle printing and viewing)
+#                 13 - Architectural (combines Miller Cylindrical and Lambert Azimuthal)
+#                 14 - Fisheye Orthographic full-frame
+#                 15 - Fisheye Equisolid full-frame
 #
 # P"p1 p2 ..."    Optional parameters for some projections
 #
@@ -101,13 +106,16 @@
 # set here and the optimizer will automaticaly add them to the o lines
 # ----------------
 # f0           projection format,
-#                               0 - rectilinear (normal lenses)
-#                               1 - Panoramic (Scanning cameras like Noblex)
-#                               2 - Circular fisheye
-#                               3 - full-frame fisheye
-#                               4 - PSphere (equirectangular)
-#                               8 - Orthographic. This is only allowed in PTStereo and
-#                                      for the first image. This indicates a map or ground plan.
+#                  0 - Rectilinear (normal lenses)
+#                  1 - Panoramic (Scanning cameras like Noblex)
+#                  2 - Fisheye Equidistance Circular
+#                  3 - Fisheye Equidistance full-frame
+#                  4 - Equirectangular (Spherical panos)
+#                  7 - Mirror
+#                  8 - Fisheye Orthographic (This is only allowed in PTStereo and
+#                         for the first image. This indicates a map or ground plan)
+#                 10 - Fisheye Stereographic
+#                 19 - Fisheye Equisolid
 # w600         width in pixels
 # h1000        height in pixels
 # v82          horizontal field of view of image (required, but ignored for f8)

Modified: trunk/libpano/doc/stitch.txt
===================================================================
--- trunk/libpano/doc/stitch.txt	2008-12-31 05:25:43 UTC (rev 917)
+++ trunk/libpano/doc/stitch.txt	2008-12-31 05:59:23 UTC (rev 918)
@@ -19,17 +19,23 @@
 # w1000        width in pixels
 # h600         height in pixels (default: width/2)
 # f0           projection format,
-#                  0 - rectilinear (for printing and viewing)
+#                  0 - Rectilinear (for printing and viewing)
 #                  1 - Cylindrical (for Printing and QTVR)
 #                  2 - Equirectangular ( for Spherical panos), default
-#                  3 - full-frame fisheye
-#                  4 - stereographic
-#                  5 - mercator
-#                  6 - transverse mercator
-#                  7 - sinusoidal
+#                  3 - Fisheye Equidistance full-frame
+#                  4 - Fisheye Stereographic full-frame
+#                  5 - Mercator
+#                  6 - Transverse Mercator
+#                  7 - Sinusoidal
 #                  8 - Lambert Equal Area Cylindrical
 #                  9 - Lambert Azimuthal
 #                 10 - Albers Equal Area Conical
+#                 11 - Miller Cylindrical
+#                 12 - Panini (for wide angle printing and viewing)
+#                 13 - Architectural (combines Miller Cylindrical and Lambert Azimuthal)
+#                 14 - Fisheye Orthographic full-frame
+#                 15 - Fisheye Equisolid full-frame
+
 #
 # P"p1 p2 ..."    Optional parameters for some projections
 #
@@ -94,11 +100,16 @@
 # The 'o' lines describe input images. One line per image is required
 # The width and height of the image is obtained from image
 # f0           projection format,
-#                  0 - rectilinear (normal lenses)
+#                  0 - Rectilinear (normal lenses)
 #                  1 - Panoramic (Scanning cameras like Noblex)
-#                  2 - Circular fisheye
-#                  3 - full-frame fisheye
-#                  4 - PSphere, equirectangular
+#                  2 - Fisheye Equidistance Circular
+#                  3 - Fisheye Equidistance full-frame
+#                  4 - Equirectangular (Spherical panos)
+#                  7 - Mirror
+#                  8 - Fisheye Orthographic (This is only allowed in PTStereo and
+#                         for the first image. This indicates a map or ground plan)
+#                 10 - Fisheye Stereographic
+#                 19 - Fisheye Equisolid
 # v82          horizontal field of view of image (required)
 # y0           yaw angle (required)
 # p43          pitch angle (required)

Modified: trunk/libpano/filter.h
===================================================================
--- trunk/libpano/filter.h	2008-12-31 05:25:43 UTC (rev 917)
+++ trunk/libpano/filter.h	2008-12-31 05:59:23 UTC (rev 918)
@@ -859,9 +859,15 @@
 int mirror_sphere_cp	( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );	
 int mirror_pano		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );	
 int sphere_cp_mirror	( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );	
+
 int sphere_tp_pano		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );
-
 int pano_sphere_tp		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );
+//int sphere_tp_mirror( double x_dest,double  y_dest, double* x_src, double* y_src, void* params);
+//int mirror_sphere_tp( double x_dest,double  y_dest, double* x_src, double* y_src, void* params);
+int sphere_tp_equisolid( double x_dest,double  y_dest, double* x_src, double* y_src, void* params);
+int equisolid_sphere_tp( double x_dest,double  y_dest, double* x_src, double* y_src, void* params);
+int sphere_tp_orthographic( double x_dest,double  y_dest, double* x_src, double* y_src, void* params);
+int orthographic_sphere_tp( double x_dest,double  y_dest, double* x_src, double* y_src, void* params);
 
 int rotate_erect		( double x_dest, double y_dest, double* x_src, double* y_src, void* params );
 int inv_radial			( double x_dest, double y_dest, double* x_src, double* y_src, void* params );

Modified: trunk/libpano/math.c
===================================================================
--- trunk/libpano/math.c	2008-12-31 05:25:43 UTC (rev 917)
+++ trunk/libpano/math.c	2008-12-31 05:59:23 UTC (rev 918)
@@ -658,7 +658,6 @@
     *x_src = distanceparam * atan2( x * sin(c), (ro * cos(c)));
 
     return 1;
-
 }
 
 
@@ -749,13 +748,13 @@
     // params: distanceparam
   // this is the inverse
 
-    double phi, lambdaHalf;
+    double phi, lambdaHalf, temp;
 
     phi = y_dest/distanceparam;
     lambdaHalf = x_dest/ (distanceparam*2);
 
     *x_src = distanceparam * 2 * tan (lambdaHalf);
-    double temp  = cos(lambdaHalf);
+    temp  = cos(lambdaHalf);
     *y_src = distanceparam *  phi / (temp * temp);
 
     return 1;
@@ -767,7 +766,6 @@
 {
     double y;
     double x;
-    double lambdaHalf;
     double temp;
 
     double phi;
@@ -1233,6 +1231,7 @@
     return 1;
 }
 
+
 int sphere_tp_erect( double x_dest,double  y_dest, double* x_src, double* y_src, void* params)
 {
 	// params: double distanceparam
@@ -1279,6 +1278,7 @@
     return 1;
 }
 
+
 int erect_sphere_cp( double x_dest,double  y_dest, double* x_src, double* y_src, void* params)
 {
 	// params: double distanceparam, double b
@@ -1300,6 +1300,7 @@
     return 1;
 }
 
+
 int rect_sphere_tp( double x_dest,double  y_dest, double* x_src, double* y_src, void* params)
 {
 	// params: double distanceparam
@@ -1332,6 +1333,7 @@
     return 1;
 }
 
+
 int sphere_tp_rect( double x_dest,double  y_dest, double* x_src, double* y_src, void* params)
 {	
 	// params: double distanceparam
@@ -1356,6 +1358,7 @@
     return 1;
 }
 
+
 int sphere_tp_pano( double x_dest,double  y_dest, double* x_src, double* y_src, void* params)
 {
 	// params: double distanceparam
@@ -1394,6 +1397,7 @@
     return 1;
 }
 
+
 int pano_sphere_tp( double x_dest,double  y_dest, double* x_src, double* y_src, void* params)
 {
 	// params: double distanceparam
@@ -1448,6 +1452,7 @@
     return 1;
 }
 
+
 int erect_rect( double x_dest,double  y_dest, double* x_src, double* y_src, void* params)
 {
 	// params: double distanceparam
@@ -1515,6 +1520,7 @@
     return 1;
 }
 
+
 int mirror_sphere_cp( double x_dest,double  y_dest, double* x_src, double* y_src, void* params)
 {
 	// params: double distanceparam, double b
@@ -1531,6 +1537,7 @@
     return 1;
 }
 
+
 int mirror_erect( double x_dest,double  y_dest, double* x_src, double* y_src, void* params)
 {
 	// params: double distanceparam, double b, double b2
@@ -1547,6 +1554,7 @@
     return 1;
 }
 
+
 int mirror_pano( double x_dest,double  y_dest, double* x_src, double* y_src, void* params)
 {
 	// params: double distanceparam, double b
@@ -1564,6 +1572,7 @@
     return 1;
 }
 
+
 int sphere_cp_mirror( double x_dest,double  y_dest, double* x_src, double* y_src, void* params)
 {
 	// params: double distanceparam, double b
@@ -1580,7 +1589,84 @@
     return 1;
 }
 
+/*
+int sphere_tp_mirror( double x_dest,double  y_dest, double* x_src, double* y_src, void* params);
+{
+  return 1;
+}
 
+int mirror_sphere_tp( double x_dest,double  y_dest, double* x_src, double* y_src, void* params);
+{
+  return 1;
+}
+*/
+
+int sphere_tp_equisolid( double x_dest,double  y_dest, double* x_src, double* y_src, void* params)
+{
+  // params: double distance
+
+  register double phi, theta, rho;
+
+  rho = sqrt( x_dest*x_dest + y_dest*y_dest );
+  
+  theta = 2.0 * asin( rho/(2.0*((double*)params)[0]) );
+  phi   = atan2( y_dest , x_dest );
+
+  *x_src = ((double*)params)[0] * theta * cos( phi );
+  *y_src = ((double*)params)[0] * theta * sin( phi );
+  return 1;
+}
+
+
+int equisolid_sphere_tp( double x_dest,double  y_dest, double* x_src, double* y_src, void* params)
+{
+  // params: double distance
+
+  register double rho, phi, theta;
+
+  theta = sqrt( x_dest * x_dest + y_dest * y_dest ) / ((double*)params)[0];
+  phi   = atan2( y_dest , x_dest );
+  
+  rho = 2.0 * ((double*)params)[0] * sin( theta / 2.0 );
+  
+  *x_src = rho * cos( phi );
+  *y_src = rho * sin( phi );
+  return 1;
+}
+
+int sphere_tp_orthographic( double x_dest,double  y_dest, double* x_src, double* y_src, void* params)
+{
+  // params: double distance
+
+  register double phi, theta, rho;
+
+  rho = sqrt( x_dest*x_dest + y_dest*y_dest );
+  
+  theta = 1.0 * asin( rho/(1.0*((double*)params)[0]) );
+  phi   = atan2( y_dest , x_dest );
+
+  *x_src = ((double*)params)[0] * theta * cos( phi );
+  *y_src = ((double*)params)[0] * theta * sin( phi );
+  return 1;
+}
+
+
+int orthographic_sphere_tp( double x_dest,double  y_dest, double* x_src, double* y_src, void* params)
+{
+  // params: double distance
+
+  register double rho, phi, theta;
+
+  theta = sqrt( x_dest * x_dest + y_dest * y_dest ) / ((double*)params)[0];
+  phi   = atan2( y_dest , x_dest );
+  
+  rho = 1.0 * ((double*)params)[0] * sin( theta / 1.0 );
+  
+  *x_src = rho * cos( phi );
+  *y_src = rho * sin( phi );
+  return 1;
+}
+
 int shift_scale_rotate( double x_dest,double  y_dest, double* x_src, double* y_src, void* params){
 	// params: double shift_x, shift_y, scale, cos_phi, sin_phi
 	
@@ -1596,14 +1682,6 @@
 
 
 
-
-
-
-
-
-
-
-
 // Correct radial luminance change using parabel
 
 unsigned char radlum( unsigned char srcPixel, int xc, int yc, void *params )

Modified: trunk/libpano/panorama.h
===================================================================
--- trunk/libpano/panorama.h	2008-12-31 05:25:43 UTC (rev 917)
+++ trunk/libpano/panorama.h	2008-12-31 05:59:23 UTC (rev 918)
@@ -232,23 +232,24 @@
     _fremoveBlurr,
     _nf_internal,
     _nf_custom,
-    _fresize
+    _fresize,
+    _flogtransform
 };
 
 
 enum
 {                               // Enumerates for Image.format
-    _rectilinear = 0,
-    _panorama = 1,
-    _fisheye_circ = 2,
-    _fisheye_ff = 3,
+    _rectilinear = 0,           // (Standand) FOV (rectilinear) =  2 * arctan (frame size/(focal length * 2))
+    _panorama = 1,              // Cylindrical
+    _fisheye_circ = 2,          // fisheye-equidistance Circular
+    _fisheye_ff = 3,            // fisheye-equidistance Full Frame
     _equirectangular = 4,
-    _spherical_cp = 5,
-    _spherical_tp = 6,
-    _mirror = 7,
-    _orthographic = 8,
+    _spherical_cp = 5,          // Fisheye-Horizontal is an image shot with the camera held horizontally. The equator is now in the center of the image.
+    _spherical_tp = 6,          // Fisheye-vertical is an image shot with the camera held vertically up.  The panorama is extracted from the circumpherence of the image. 
+    _mirror = 7,                // convex mirror. This is the reflection of a convex, spherical image. The horizontal field of view is calculated using the formula HFov = 2*arcsin(radius of mirror/radius of curvature of mirror)
+    _orthographic = 8,          // fisheye-orthographic FOV  (orthogonal fisheye) = 2 * arcsin (frame size/(focal length *2)
     _cubic = 9,
-    _stereographic = 10,
+    _stereographic = 10,        // fisheye stereographic FOV (stereographic fisheye) = 4 * arctan (frame size/(focal length * 4))
     _mercator = 11,
     _trans_mercator = 12,
     _trans_panorama = 13,
@@ -259,6 +260,7 @@
     _millercylindrical = 18,
     _panini = 19,
     _architectural = 20,
+    _equisolid   = 21,          // fisheye-equisolid  FOV (equisolid fisheye) = 4 * arcsin (frame size/(focal length * 4))
 };
 
 enum
@@ -277,10 +279,26 @@
     PANO_FORMAT_MILLER_CYLINDRICAL = 11,
     PANO_FORMAT_PANINI = 12,
     PANO_FORMAT_ARCHITECTURAL = 13,
+    PANO_FORMAT_ORTHOGRAPHIC = 14,
+    PANO_FORMAT_EQUISOLID = 15,
 };
 
-#define PANO_FORMAT_COUNT 14
+#define PANO_FORMAT_COUNT 16
 
+enum
+{                               // Enumerates external number of image f<index>
+    IMAGE_FORMAT_RECTILINEAR = 0,
+    IMAGE_FORMAT_PANORAMA = 1,
+    IMAGE_FORMAT_FISHEYE_EQUIDISTANCECIRC = 2,
+    IMAGE_FORMAT_FISHEYE_EQUIDISTANCEFF = 3,
+    IMAGE_FORMAT_EQUIRECTANGULAR = 4,
+    IMAGE_FORMAT_MIRROR = 7,
+    IMAGE_FORMAT_FISHEYE_ORTHOGRAPHIC = 8,
+    IMAGE_FORMAT_FISHEYE_STEREOGRAPHIC = 10,
+    IMAGE_FORMAT_FISHEYE_EQUISOLID = 19,
+};
+#define IMAGE_FORMAT_COUNT 9
+
 // A large rectangle
 
 typedef struct

Modified: trunk/libpano/parser.c
===================================================================
--- trunk/libpano/parser.c	2008-12-31 05:25:43 UTC (rev 917)
+++ trunk/libpano/parser.c	2008-12-31 05:59:23 UTC (rev 918)
@@ -229,17 +229,20 @@
                                         READ_VAR( "%d", &k );
                                         switch (k)
                                         {
-                                            case 0:   im->format = _rectilinear;    break;
-                                            case 1:   im->format = _panorama;
+                                          case IMAGE_FORMAT_RECTILINEAR:                im->format = _rectilinear;    break;
+                                          case IMAGE_FORMAT_PANORAMA:                   im->format = _panorama;
                                                         im->cP.correction_mode |= correction_mode_vertical;
                                                         break;
-                                            case 2:   im->format = _fisheye_circ;   break;
-                                            case 3:   im->format = _fisheye_ff;     break;
-                                            case 4:   im->format = _equirectangular;
+                                          case IMAGE_FORMAT_FISHEYE_EQUIDISTANCECIRC:   im->format = _fisheye_circ;   break;
+                                          case IMAGE_FORMAT_FISHEYE_EQUIDISTANCEFF:     im->format = _fisheye_ff;     break;
+                                          case IMAGE_FORMAT_EQUIRECTANGULAR:            im->format = _equirectangular;
                                                         im->cP.correction_mode |= correction_mode_vertical;
                                                         break;
-                                            case 8:   im->format = _orthographic; break;
-                                            default:  PrintError("Syntax error in script: Line %d", lineNum);
+                                          case IMAGE_FORMAT_MIRROR:                     im->format = _mirror; break;
+                                          case IMAGE_FORMAT_FISHEYE_ORTHOGRAPHIC:       im->format = _orthographic; break;
+                                          case IMAGE_FORMAT_FISHEYE_STEREOGRAPHIC:      im->format = _stereographic; break;
+                                          case IMAGE_FORMAT_FISHEYE_EQUISOLID:          im->format = _equisolid; break;
+                                          default:  PrintError("Syntax error in script: Line %d", lineNum);
                                                         return -1;
                                                         break;
                                         }
@@ -645,11 +648,23 @@
     sprintf( line, "\n# Panorama description\n" );strcat( res, line );
     switch( g->pano.format )
     {
-                case _mercator:             format = 4; break;
-                case _equirectangular:      format = 2; break;
-        case _rectilinear:          format = 0; break;
-        case _panorama:             format = 1; break;
-        default:            format = -1; break;
+        case _rectilinear:            format = PANO_FORMAT_RECTILINEAR; break;
+        case _panorama:               format = PANO_FORMAT_PANORAMA; break;
+        case _equirectangular:        format = PANO_FORMAT_EQUIRECTANGULAR; break;
+        case _fisheye_ff:             format = PANO_FORMAT_FISHEYE_FF; break;
+        case _stereographic:          format = PANO_FORMAT_STEREOGRAPHIC; break;
+        case _mercator:               format = PANO_FORMAT_MERCATOR; break;
+        case _trans_mercator:         format = PANO_FORMAT_TRANS_MERCATOR; break;
+        case _sinusoidal:             format = PANO_FORMAT_SINUSOIDAL; break;
+        case _lambert:                format = PANO_FORMAT_LAMBERT_EQUAL_AREA_CONIC; break;
+        case _lambertazimuthal:       format = PANO_FORMAT_LAMBERT_AZIMUTHAL; break;
+        case _albersequalareaconic:   format = PANO_FORMAT_ALBERS_EQUAL_AREA_CONIC; break;
+        case _millercylindrical:      format = PANO_FORMAT_MILLER_CYLINDRICAL; break;
+        case _panini:                 format = PANO_FORMAT_PANINI; break;
+        case _architectural:          format = PANO_FORMAT_ARCHITECTURAL; break;
+        case _orthographic:           format = PANO_FORMAT_ORTHOGRAPHIC; break;
+        case _equisolid:              format = PANO_FORMAT_EQUISOLID; break;
+        default:                      format = -1; break;
     }
         
     sprintf( line, "# p f%d w"FMT_INT32" h"FMT_INT32" v%g n\"%s\"\n\n", format, g->pano.width, g->pano.height, g->pano.hfov, g->pano.name );strcat( res, line );
@@ -663,12 +678,16 @@
     {
         switch( g->im[i].format )
         {
-            case _rectilinear       : format = 0; break;
-            case _panorama          : format = 1; break;
-            case _fisheye_circ      : format = 2; break;
-            case _fisheye_ff        : format = 3; break;
-            case _equirectangular   : format = 4; break;
-            default: break;
+            case _rectilinear:        format = IMAGE_FORMAT_RECTILINEAR; break;
+            case _panorama:           format = IMAGE_FORMAT_PANORAMA; break;
+            case _fisheye_circ:       format = IMAGE_FORMAT_FISHEYE_EQUIDISTANCECIRC; break;
+            case _fisheye_ff:         format = IMAGE_FORMAT_FISHEYE_EQUIDISTANCEFF; break;
+            case _equirectangular:    format = IMAGE_FORMAT_EQUIRECTANGULAR; break;
+            case _mirror:             format = IMAGE_FORMAT_MIRROR; break;
+            case _orthographic:       format = IMAGE_FORMAT_FISHEYE_ORTHOGRAPHIC; break;
+            case _stereographic:      format = IMAGE_FORMAT_FISHEYE_STEREOGRAPHIC; break;
+            case _equisolid:          format = IMAGE_FORMAT_FISHEYE_EQUISOLID; break;
+            default:                  format = -1; break;
         }
         sprintf( cmd, "o f%d ", format );
 
@@ -956,53 +975,59 @@
 		    free( script );
 		    return -1;
 		}
-	    switch (p->pano.format) {
-	    case 0:
-		p->pano.format = _rectilinear;
-		break;
-	    case 1:
-		p->pano.format = _panorama;
-		break;
-	    case 2:
-		p->pano.format = _equirectangular;
-		break;
-	    case 3:
-		p->pano.format = _fisheye_ff;
-		break;
-	    case 4:
-		p->pano.format = _stereographic;
-		break;
-	    case 5:
-		p->pano.format = _mercator;
-		break;
-	    case 6:
-		p->pano.format = _trans_mercator;
-		break;
-	    case 7:
-		p->pano.format = _sinusoidal;
-		break;
-	    case 8:
-		p->pano.format = _lambert;
-		break;
-	    case 9:
-		p->pano.format = _lambertazimuthal;
-		break;
-	    case 10:
-		p->pano.format = _albersequalareaconic;
-		break;
-	    case 11:
-		p->pano.format = _millercylindrical;
-		break;
-	    case 12:
-		p->pano.format = _panini;
-		break;
-	    case 13:
-		p->pano.format = _architectural;
-		break;
-	    default:
-		PrintError( "Unknown panorama projection: %d", p->pano.format );
-		return -1;
-	    }
+      switch (p->pano.format) {
+        case PANO_FORMAT_RECTILINEAR:
+          p->pano.format = _rectilinear;
+          break;
+        case PANO_FORMAT_PANORAMA:
+          p->pano.format = _panorama;
+          break;
+        case PANO_FORMAT_EQUIRECTANGULAR:
+          p->pano.format = _equirectangular;
+          break;
+        case PANO_FORMAT_FISHEYE_FF:
+          p->pano.format = _fisheye_ff;
+          break;
+        case PANO_FORMAT_STEREOGRAPHIC:
+          p->pano.format = _stereographic;
+          break;
+        case PANO_FORMAT_MERCATOR:
+          p->pano.format = _mercator;
+          break;
+        case PANO_FORMAT_TRANS_MERCATOR:
+          p->pano.format = _trans_mercator;
+          break;
+        case PANO_FORMAT_SINUSOIDAL:
+          p->pano.format = _sinusoidal;
+          break;
+        case PANO_FORMAT_LAMBERT_EQUAL_AREA_CONIC:
+          p->pano.format = _lambert;
+          break;
+        case PANO_FORMAT_LAMBERT_AZIMUTHAL:
+          p->pano.format = _lambertazimuthal;
+          break;
+        case PANO_FORMAT_ALBERS_EQUAL_AREA_CONIC:
+          p->pano.format = _albersequalareaconic;
+          break;
+        case PANO_FORMAT_MILLER_CYLINDRICAL:
+          p->pano.format = _millercylindrical;
+          break;
+        case PANO_FORMAT_PANINI:
+          p->pano.format = _panini;
+          break;
+        case PANO_FORMAT_ARCHITECTURAL:
+          p->pano.format = _architectural;
+          break;
+        case PANO_FORMAT_ORTHOGRAPHIC:
+          p->pano.format = _orthographic;
+          break;
+        case PANO_FORMAT_EQUISOLID:
+          p->pano.format = _equisolid;
+          break;
+        default:
+          PrintError( "Unknown panorama projection: %d", p->pano.format );
+          return -1;
+        }
 	    if( (p->pano.format == _rectilinear || p->pano.format == _trans_mercator) && p->pano.hfov >= 180.0 ) {
 		PrintError( "Destination image must have HFOV < 180" );
 		return -1;

Modified: trunk/libpano/queryfeature.c
===================================================================
--- trunk/libpano/queryfeature.c	2008-12-31 05:25:43 UTC (rev 917)
+++ trunk/libpano/queryfeature.c	2008-12-31 05:59:23 UTC (rev 918)
@@ -46,15 +46,35 @@
   // If a lens type is unavailable, set its name to ""
   {"LensType0","Normal (rectilinear)"},
   {"LensType1","Cylindrical"},
-  {"LensType2","Circular"},
-  {"LensType3","Full Frame"},
+  {"LensType2","Fisheye Equidistance Circular"},
+  {"LensType3","Fisheye Equidistance Full Frame"},
   {"LensType4","Equirectangular"},
+  {"LensType5",""},//"_spherical_cp"},
+  {"LensType6",""},//"_spherical_tp"},
+  {"LensType7","Mirror"},
+  {"LensType8","Fisheye Orthographic"},
+  {"LensType9",""},//"_cubic"},
+  {"LensType10","Fisheye Stereographic"},  // fisheye stereographic
+  {"LensType11",""},//"_mercator"},
+  {"LensType12",""},//"_trans_mercator"},
+  {"LensType13",""},//"_trans_panorama"},
+  {"LensType14",""},//"_sinusoidal"},
+  {"LensType15",""},//"_lambert"},
+  {"LensType16",""},//"_lambertazimuthal"},
+  {"LensType17",""},//"_albersequalareaconic"},
+  {"LensType18",""},//"_millercylindrical"},
+  {"LensType19","Fisheye Equisolid"},
+
   // Source lens type crop format (C)ircle or (R)ectangle:
   {"LensMask0","R"},
   {"LensMask1","R"},
   {"LensMask2","C"},
   {"LensMask3","R"},
   {"LensMask4","R"},
+  {"LensMask7","C"},
+  {"LensMask8","C"},
+  {"LensMask10","C"},
+  {"LensMask19","C"},
   // Pano lens type names 
   // If a lens type is unavailable, set its name to ""
   {"PanoType0","Normal (rectilinear)"},
@@ -71,6 +91,8 @@
   {"PanoType11","Miller Cylindrical"},
   {"PanoType12","Panini"},
   {"PanoType13","Architectural"},
+  {"PanoType14","Architectural"},
+  {"PanoType15","Architectural"},
   // Filter Types
   //   fix: Fixed Windowsize
   //   aa: Antialiasing filter with adaptive filter size


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

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

From: <dmg@us...> - 2009-01-03 07:23

Revision: 921
          http://panotools.svn.sourceforge.net/panotools/?rev=921&view=rev
Author:   dmg
Date:     2009-01-03 07:22:57 +0000 (Sat, 03 Jan 2009)

Log Message:
-----------
2009-01-02  dmg  <dmg@...>

* * adjust.c, filter.h, math.c, panorama.h, parser.c &
queryfeateature.c:

Fixed the panini (or should we call it pannini) and renamed
previous projection as equirectangular panini. It might have to
change its name

Modified Paths:
--------------
    trunk/libpano/ChangeLog
    trunk/libpano/adjust.c
    trunk/libpano/filter.h
    trunk/libpano/math.c
    trunk/libpano/panorama.h
    trunk/libpano/parser.c
    trunk/libpano/queryfeature.c

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2008-12-31 22:47:41 UTC (rev 920)
+++ trunk/libpano/ChangeLog	2009-01-03 07:22:57 UTC (rev 921)
@@ -1,3 +1,13 @@
+2009-01-02  dmg  <dmg@...>
+
+	* * adjust.c, filter.h, math.c, panorama.h, parser.c &
+	queryfeateature.c:
+
+	Fixed the panini (or should we call it pannini) and renamed
+	previous projection as equirectangular panini. It might have to
+	change its name
+	
+
 2008-01-26 Jim Watters <jwatters@...>
 
 	* adjust.c, filter.h, math.c, panorama.h, parser.c & queryfeateature.c

Modified: trunk/libpano/adjust.c
===================================================================
--- trunk/libpano/adjust.c	2008-12-31 22:47:41 UTC (rev 920)
+++ trunk/libpano/adjust.c	2009-01-03 07:22:57 UTC (rev 921)
@@ -694,6 +694,11 @@
       panini_erect(b/2.0, 0.0, &tx, &ty, & tpara);
       mp->distance = pn->width/(2.0*tx);
       break;
+    case _equipanini: 
+      tpara = 1;
+      equipanini_erect(b/2.0, 0.0, &tx, &ty, & tpara);
+      mp->distance = pn->width/(2.0*tx);
+      break;
     case _architectural: 
       tpara = 1;
       arch_erect(b/2.0, 0.0, &tx, &ty, & tpara);
@@ -841,6 +846,10 @@
     {
     SetDesc(stack[i],     erect_panini,           &(mp->distance) ); i++; // Convert panini to sphere
     }
+    else if(pn->format == _equipanini)
+    {
+    SetDesc(stack[i],     erect_equipanini,           &(mp->distance) ); i++; // Convert equipanini to sphere
+    }
     else if(pn->format == _architectural)
     {
       SetDesc(stack[i],   erect_arch,             &(mp->distance) ); i++; // Convert arch to sphere
@@ -1022,6 +1031,11 @@
       panini_erect(b/2.0, 0.0, &tx, &ty, & tpara);
       mp->distance = pn->width/(2.0*tx);
       break;
+    case _equipanini:
+      tpara = 1;
+      equipanini_erect(b/2.0, 0.0, &tx, &ty, & tpara);
+      mp->distance = pn->width/(2.0*tx);
+      break;
     case _architectural:
       tpara = 1;
       arch_erect(b/2.0, 0.0, &tx, &ty, & tpara);
@@ -1202,6 +1216,10 @@
   {
     SetDesc(stack[i], panini_erect,  &(mp->distance) ); i++; // Convert panini to sphere
   }
+  else if(pn->format == _equipanini)
+  {
+    SetDesc(stack[i], equipanini_erect,  &(mp->distance) ); i++; // Convert panini to sphere
+  }
   else if(pn->format == _architectural)
   {
     SetDesc(stack[i], arch_erect,   &(mp->distance) ); i++; // Convert arch to sphere

Modified: trunk/libpano/filter.h
===================================================================
--- trunk/libpano/filter.h	2008-12-31 22:47:41 UTC (rev 920)
+++ trunk/libpano/filter.h	2009-01-03 07:22:57 UTC (rev 921)
@@ -851,6 +851,8 @@
 int erect_millercylindrical		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );
 int panini_erect		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );
 int erect_panini		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );
+int equipanini_erect		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );
+int erect_equipanini		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );
 
 int arch_erect		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );
 int erect_arch		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );

Modified: trunk/libpano/math.c
===================================================================
--- trunk/libpano/math.c	2008-12-31 22:47:41 UTC (rev 920)
+++ trunk/libpano/math.c	2009-01-03 07:22:57 UTC (rev 921)
@@ -748,14 +748,23 @@
     // params: distanceparam
   // this is the inverse
 
-    double phi, lambdaHalf, temp;
+    double phi, lambdaHalf, temp,y,x;
 
     phi = y_dest/distanceparam;
     lambdaHalf = x_dest/ (distanceparam*2);
+    x = 2 * tan (lambdaHalf);
 
-    *x_src = distanceparam * 2 * tan (lambdaHalf);
+    // Conver from central cylindrical
+    phi = tan(phi);
+
+    *x_src = distanceparam * x;
     temp  = cos(lambdaHalf);
-    *y_src = distanceparam *  phi / (temp * temp);
+    
+    y = tan(phi) / (temp * temp);
+    
+    // At this point we have mapped to central cylindrical, now to equirectangular
+      
+    *y_src = distanceparam *  y;
 
     return 1;
 }
@@ -768,14 +777,72 @@
     double x;
     double temp;
 
+    double  lambda;
+
     double phi;
     y = y_dest/distanceparam;
     x = x_dest/distanceparam;
+    lambda = atan(x/2);
+ 
+    // then project from opposite edge of the cylinder
+    temp = cos(lambda);
+    phi = y * temp * temp;
 
-    temp = cos(x/2);
+    // First convert to central cylindrical
+    phi  = atan( phi);
+
+    *x_src = 2 * lambda * distanceparam;
+    *y_src = phi * distanceparam;
+
+    return 1;
+}
+
+
+
+/** convert from erect to equi panini */
+int equipanini_erect( double x_dest,double  y_dest, double* x_src, double* y_src, void* params)
+{
+    // params: distanceparam
+  // this is the inverse
+
+    double phi, lambdaHalf, temp,y,x;
+
+    phi = y_dest/distanceparam;
+    lambdaHalf = x_dest/ (distanceparam*2);
+    x = 2 * tan (lambdaHalf);
+
+    *x_src = distanceparam * x;
+    temp  = cos(lambdaHalf);
+    
+    y = tan(phi) / (temp * temp);
+    
+    // At this point we have mapped to central cylindrical, now to equirectangular
+      
+    *y_src = distanceparam *  y;
+
+    return 1;
+}
+
+
+/** convert from equi panini to erect */
+int erect_equipanini( double x_dest,double  y_dest, double* x_src, double* y_src, void* params)
+{
+    double y;
+    double x;
+    double temp;
+
+    double  lambda;
+
+    double phi;
+    y = y_dest/distanceparam;
+    x = x_dest/distanceparam;
+    lambda = atan(x/2);
+ 
+    // then project from opposite edge of the cylinder
+    temp = cos(lambda);
     phi = y * temp * temp;
 
-    *x_src = 2 * atan2(x,2) * distanceparam;
+    *x_src = 2 * lambda * distanceparam;
     *y_src = phi * distanceparam;
 
     return 1;

Modified: trunk/libpano/panorama.h
===================================================================
--- trunk/libpano/panorama.h	2008-12-31 22:47:41 UTC (rev 920)
+++ trunk/libpano/panorama.h	2009-01-03 07:22:57 UTC (rev 921)
@@ -261,6 +261,7 @@
     _panini = 19,
     _architectural = 20,
     _equisolid   = 21,          // fisheye-equisolid  FOV (equisolid fisheye) = 4 * arcsin (frame size/(focal length * 4))
+    _equipanini = 22,
 };
 
 enum
@@ -281,9 +282,10 @@
     PANO_FORMAT_ARCHITECTURAL = 13,
     PANO_FORMAT_ORTHOGRAPHIC = 14,
     PANO_FORMAT_EQUISOLID = 15,
+    PANO_FORMAT_EQUI_PANINI = 16,
 };
 
-#define PANO_FORMAT_COUNT 16
+#define PANO_FORMAT_COUNT 17
 
 enum
 {                               // Enumerates external number of image f<index>

Modified: trunk/libpano/parser.c
===================================================================
--- trunk/libpano/parser.c	2008-12-31 22:47:41 UTC (rev 920)
+++ trunk/libpano/parser.c	2009-01-03 07:22:57 UTC (rev 921)
@@ -498,6 +498,9 @@
                         case PANO_FORMAT_PANINI:
                             gl->pano.format = _panini;
                             break;
+                        case PANO_FORMAT_EQUI_PANINI:
+                            gl->pano.format = _equipanini;
+                            break;
                         case PANO_FORMAT_ARCHITECTURAL:
                             gl->pano.format = _architectural;
                             break;
@@ -661,6 +664,7 @@
         case _albersequalareaconic:   format = PANO_FORMAT_ALBERS_EQUAL_AREA_CONIC; break;
         case _millercylindrical:      format = PANO_FORMAT_MILLER_CYLINDRICAL; break;
         case _panini:                 format = PANO_FORMAT_PANINI; break;
+        case _equipanini:             format = PANO_FORMAT_EQUI_PANINI; break;
         case _architectural:          format = PANO_FORMAT_ARCHITECTURAL; break;
         case _orthographic:           format = PANO_FORMAT_ORTHOGRAPHIC; break;
         case _equisolid:              format = PANO_FORMAT_EQUISOLID; break;
@@ -1015,6 +1019,9 @@
         case PANO_FORMAT_PANINI:
           p->pano.format = _panini;
           break;
+        case PANO_FORMAT_EQUI_PANINI:
+          p->pano.format = _equipanini;
+          break;
         case PANO_FORMAT_ARCHITECTURAL:
           p->pano.format = _architectural;
           break;

Modified: trunk/libpano/queryfeature.c
===================================================================
--- trunk/libpano/queryfeature.c	2008-12-31 22:47:41 UTC (rev 920)
+++ trunk/libpano/queryfeature.c	2009-01-03 07:22:57 UTC (rev 921)
@@ -93,7 +93,10 @@
   {"PanoType13","Architectural"},
   {"PanoType14","Orthographic"},
   {"PanoType15","Equisolid"},
+  {"PanoType16","Equirectangular Panini"},
+
   // Filter Types
+
   //   fix: Fixed Windowsize
   //   aa: Antialiasing filter with adaptive filter size
   // Filter Names 
@@ -334,6 +337,7 @@
     "Architectural",
     "Orthographic",
     "Equisolid",
+    "Equirectangular Panini",
 };
 
 static int panoFormatID[PANO_FORMAT_COUNT] = {
@@ -353,8 +357,10 @@
     _architectural,
     _orthographic,
     _equisolid,
+    _equipanini,
     };
 
+
 int panoProjectionFormatCount(void)
 {
     // REturn the number of Projection formats available in the library
@@ -401,6 +407,10 @@
 	features->maxVFOV = 179;
 	features->maxHFOV = 230;
         break;
+    case PANO_FORMAT_EQUI_PANINI:
+	features->maxVFOV = 179;
+	features->maxHFOV = 230;
+        break;
     case PANO_FORMAT_FISHEYE_FF:
     case PANO_FORMAT_ORTHOGRAPHIC:
     case PANO_FORMAT_EQUISOLID:


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

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

From: <brunopostle@us...> - 2009-01-17 22:46

Revision: 924
          http://panotools.svn.sourceforge.net/panotools/?rev=924&view=rev
Author:   brunopostle
Date:     2009-01-17 22:35:41 +0000 (Sat, 17 Jan 2009)

Log Message:
-----------
fix reverse calculation for pannini (Thomas Modes)

Modified Paths:
--------------
    trunk/libpano/ChangeLog
    trunk/libpano/math.c

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2009-01-08 23:47:30 UTC (rev 923)
+++ trunk/libpano/ChangeLog	2009-01-17 22:35:41 UTC (rev 924)
@@ -1,3 +1,7 @@
+2009-01-17 Thomas Modes
+
+	* match.c: fix reverse calculation for pannini
+
 2009-01-02  dmg  <dmg@...>
 
 	* * adjust.c, filter.h, math.c, panorama.h, parser.c &

Modified: trunk/libpano/math.c
===================================================================
--- trunk/libpano/math.c	2009-01-08 23:47:30 UTC (rev 923)
+++ trunk/libpano/math.c	2009-01-17 22:35:41 UTC (rev 924)
@@ -792,7 +792,7 @@
     phi  = atan( phi);
 
     *x_src = 2 * lambda * distanceparam;
-    *y_src = phi * distanceparam;
+    *y_src = atan(phi) * distanceparam;
 
     return 1;
 }
@@ -843,7 +843,7 @@
     phi = y * temp * temp;
 
     *x_src = 2 * lambda * distanceparam;
-    *y_src = phi * distanceparam;
+    *y_src = atan(phi) * distanceparam;
 
     return 1;
 }


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

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

From: <brunopostle@us...> - 2009-02-01 17:59

Revision: 927
          http://panotools.svn.sourceforge.net/panotools/?rev=927&view=rev
Author:   brunopostle
Date:     2009-02-01 17:59:30 +0000 (Sun, 01 Feb 2009)

Log Message:
-----------
Remove GPL incompatible files (bug #1861841), this removes mac classic support
and hopefully doesn't break anything in OS X.

Modified Paths:
--------------
    trunk/libpano/Makefile.am

Removed Paths:
-------------
    trunk/libpano/PixMap.c
    trunk/libpano/PixMap.h
    trunk/libpano/README.mac
    trunk/libpano/makefile.mac
    trunk/libpano/pict.c

Modified: trunk/libpano/Makefile.am
===================================================================
--- trunk/libpano/Makefile.am	2009-02-01 17:37:06 UTC (rev 926)
+++ trunk/libpano/Makefile.am	2009-02-01 17:59:30 UTC (rev 927)
@@ -53,8 +53,8 @@
 endif
 
 if HAVE_MAC
-MAC_SRC =  PixMap.c pict.c shell_mac.c sys_mac.c ppm.c
-MAC_HDR =  PixMap.h
+MAC_SRC =  shell_mac.c sys_mac.c ppm.c
+MAC_HDR =  
 
 install-exec-hook:
 	@true
@@ -102,11 +102,11 @@
 	rm -rf `find $(distdir) -name CVS`
 	rm -rf `find $(distdir) -name .cvsignore`
 
-EXTRA_DIST =  gpl.txt README.linux README.windows README.mac \
-	      makefile.linux makefile.mac makefile.win32 \
+EXTRA_DIST =  gpl.txt README.linux README.windows \
+	      makefile.linux makefile.win32 \
 	      bootstrap filter.r libpano13.def pano13.rc \
-	      seamer_.c sys_X11.c sys_win.c bmp.c PixMap.c pict.c shell_mac.c \
-	      sys_mac.c ppm.c PixMap.h sys_ansi.c ppm.c ZComb.h adjust.h \
+	      seamer_.c sys_X11.c sys_win.c bmp.c shell_mac.c \
+	      sys_mac.c ppm.c sys_ansi.c ppm.c ZComb.h adjust.h \
 	      pano13vc.def libpano.vcproj PanoTools.pbproj.tgz
 
 MAINTAINERCLEANFILES = \

Deleted: trunk/libpano/PixMap.c
===================================================================
--- trunk/libpano/PixMap.c	2009-02-01 17:37:06 UTC (rev 926)
+++ trunk/libpano/PixMap.c	2009-02-01 17:59:30 UTC (rev 927)
@@ -1,1137 +0,0 @@
-/* File PixMap.c
-	PixMap manipulation routines, implementation.
-	Copyright (c) 1996, 1997 by John Montbriand.  All Rights Reserved.
-	Permission hereby granted for public use.
-    	Distribute freely in areas where the laws of copyright apply.
-	USE AT YOUR OWN RISK.
-	DO NOT DISTRIBUTE MODIFIED COPIES.
-	Comments/questions/postcards* to the author at the address:
-	  John Montbriand
-	  P.O. Box. 1133
-	  Saskatoon Saskatchewan Canada
-	  S7K 3N2
-	or by email at:
-	  tinyjohn@...
-	*if you mail a postcard, then I will provide you with technical support
-	regarding questions you may have about this file.
-
-*/
-
-
-#include "PixMap.h"
-#include <Memory.h>
-//#include <OSUtils.h> //commented by Kekus Digital
-//#include <ToolUtils.h> //commented by Kekus Digital
-//#include <FixMath.h> //commented by Kekus Digital
-#include <Math.h>
-//#include <Gestalt.h> //commented by Kekus Digital
-//#include <ImageCompression.h> //commented by Kekus Digital
-//#include <PictUtils.h> //commented by Kekus Digital
-#include <QuickTime/ImageCompression.h> //added by Kekus Digital
-#include <String.h>
-
-
-PixMapHandle MakePixMap(short width, short height, CTabHandle clut) {
-	long row_bytes, depth;
-	Ptr raster_data;
-	long bytecount;
-	CTabHandle colours;
-	PixMapHandle newpix;
-	PixMapPtr pixptr;
-	
-		/* calculate required depth */
-	if (clut == NULL)
-		depth = 8;
-	else if ((*clut)->ctSize < 2)
-		depth = 1;
-	else if ((*clut)->ctSize < 4)
-		depth = 2;
-	else if ((*clut)->ctSize < 16)
-		depth = 4;
-	else depth = 8;
-	
-		/* set up initial values for locals */
-	row_bytes = ((depth * ((long) width) + 31) >> 5) << 2;
-	bytecount = row_bytes * ((long) height);
-	colours = NULL;
-	raster_data = NULL;
-	newpix = NULL;
-	
-		/* check for valid rowbytes */
-	if (row_bytes > 0x00003FFF) goto bail;
-
-		/* allocate the raster data */
-	raster_data = NewPtrClear(bytecount);
-	if (raster_data == NULL) goto bail;
-
-		/* copy the colour table */
-	if (clut == NULL) {
-		colours = GetCTable(8);
-		if (colours == NULL) goto bail;
-	} else {
-		colours = clut;
-		if (HandToHand((Handle*) &colours) != noErr) {
-			colours = NULL;
-			goto bail;
-		}
-	}
-		/* create the pixmap handle */
-	newpix = (PixMapHandle) NewHandleClear(sizeof(PixMap));
-	if (newpix == NULL) goto bail;
-	
-		/* set up the pixmap fields */
-	pixptr = *newpix;
-	pixptr->baseAddr = raster_data;
-	pixptr->rowBytes = (row_bytes | 0x8000);
-	pixptr->bounds.right = width;
-	pixptr->bounds.bottom = height;
-	pixptr->hRes = 0x00480000; /* resolution = 72 dots per inch */
-	pixptr->vRes = 0x00480000;
-	pixptr->pixelSize = depth;
-	pixptr->cmpCount = 1;
-	pixptr->cmpSize = depth;
-	pixptr->pmTable = colours;
-
-		/* done */
-	return newpix;
-
-bail:
-	if (raster_data != NULL) DisposePtr(raster_data);
-	if (newpix != NULL) DisposeHandle((Handle) newpix);
-	if (colours != NULL) DisposeHandle((Handle) colours);
-	return NULL;
-}
-
-PixMapHandle Make16BitPixMap(short width, short height) {
-	long row_bytes;
-	Ptr raster_data;
-	long bytecount, response;
-	CTabHandle colours;
-	PixMapHandle newpix;
-	PixMapPtr pixptr;
-	unsigned char *rowptr;
-	unsigned short *pixelptr;
-	short y, x;
-
-		/* is it possible? */
-	if (Gestalt(gestaltQuickdrawVersion, &response) != noErr) response = 0;
-	if (response < gestalt32BitQD) return NULL;
-
-		/* set up initial values for locals */
-	row_bytes = ((16 * ((long) width) + 31) >> 5) << 2;
-	bytecount = row_bytes * ((long) height);
-	colours = NULL;
-	raster_data = NULL;
-	newpix = NULL;
-	
-		/* check for valid rowbytes */
-	if (row_bytes > 0x00003FFF) goto bail;
-	
-		/* allocate the raster data */
-	raster_data = NewPtr(bytecount);
-	if (raster_data == NULL) goto bail;
-	rowptr = (unsigned char *) raster_data;
-	for (y=0; y< height; y++, rowptr += row_bytes)
-		for (pixelptr = (unsigned short *) rowptr, x=0; x<width; x++)
-			*pixelptr++ = 0x7FFF;
-
-		/* dummy colour table */
-	colours = (CTabHandle) NewHandleClear(8);
-	if (colours == NULL) goto bail;
-	(*colours)->ctSeed = 15;
-	(*colours)->ctSize = -1;
-
-		/* create the pixmap handle */
-	newpix = (PixMapHandle) NewHandleClear(sizeof(PixMap));
-	if (newpix == NULL) goto bail;
-	
-		/* set up the pixmap fields */
-	pixptr = *newpix;
-	pixptr->baseAddr = raster_data;
-	pixptr->rowBytes = (row_bytes | 0x8000);
-	pixptr->bounds.right = width;
-	pixptr->bounds.bottom = height;
-	pixptr->hRes = 0x00480000; /* resolution = 72 dots per inch */
-	pixptr->vRes = 0x00480000;
-	pixptr->pixelSize = 16;
-	pixptr->pixelType = RGBDirect;
-	pixptr->cmpCount = 3;
-	pixptr->cmpSize = 5;
-	pixptr->pmTable = colours;
-
-		/* done */
-	return newpix;
-
-bail:
-	if (raster_data != NULL) DisposePtr(raster_data);
-	if (newpix != NULL) DisposeHandle((Handle) newpix);
-	if (colours != NULL) DisposeHandle((Handle) colours);
-	return NULL;
-}
-
-
-PixMapHandle Make32BitPixMap(short width, short height) {
-	long row_bytes;
-	Ptr raster_data;
-	long bytecount, response;
-	CTabHandle colours;
-	PixMapHandle newpix;
-	PixMapPtr pixptr;
-	unsigned char *rowptr;
-	unsigned long *pixelptr;
-	short y, x;
-
-		/* is it possible? */
-	if (Gestalt(gestaltQuickdrawVersion, &response) != noErr) response = 0;
-	if (response < gestalt32BitQD) return NULL;
-
-		/* set up initial values for locals */
-	row_bytes = ((32 * ((long) width) + 31) >> 5) << 2;
-	bytecount = row_bytes * ((long) height);
-	colours = NULL;
-	raster_data = NULL;
-	newpix = NULL;
-	
-		/* check for valid rowbytes */
-	if (row_bytes > 0x00003FFF) goto bail;
-
-		/* allocate the raster data */
-	raster_data = NewPtr(bytecount);
-	if (raster_data == NULL) goto bail;
-	rowptr = (unsigned char *) raster_data;
-	for (y=0; y< height; y++, rowptr += row_bytes)
-		for (pixelptr = (unsigned long *) rowptr, x=0; x<width; x++)
-			*pixelptr++ = 0x00FFFFFF;
-
-		/* dummy colour table */
-	colours = (CTabHandle) NewHandleClear(8);
-	if (colours == NULL) goto bail;
-	(*colours)->ctSeed = 24;
-	(*colours)->ctSize = -1;
-
-		/* create the pixmap handle */
-	newpix = (PixMapHandle) NewHandleClear(sizeof(PixMap));
-	if (newpix == NULL) goto bail;
-	
-		/* set up the pixmap fields */
-	pixptr = *newpix;
-	pixptr->baseAddr = raster_data;
-	pixptr->rowBytes = (row_bytes | 0x8000);
-	pixptr->bounds.right = width;
-	pixptr->bounds.bottom = height;
-	pixptr->hRes = 0x00480000; /* resolution = 72 dots per inch */
-	pixptr->vRes = 0x00480000;
-	pixptr->pixelSize = 32;
-	pixptr->pixelType = RGBDirect;
-	pixptr->cmpCount = 3;
-	pixptr->cmpSize = 8;
-	pixptr->pmTable = colours;
-
-		/* done */
-	return newpix;
-
-bail:
-	if (raster_data != NULL) DisposePtr(raster_data);
-	if (newpix != NULL) DisposeHandle((Handle) newpix);
-	if (colours != NULL) DisposeHandle((Handle) colours);
-	return NULL;
-}
-
-
-PixMapHandle MakeScreenLikePixMap(Rect *globalRect) {
-	long maxArea, area;
-	PixMapHandle device_pix;
-	GDHandle device;
-	short width, height;
-	Rect sect, device_box;
-		/* search for maximum intersecting device */
-	device_pix = NULL;
-	maxArea = 0;
-	for (device = GetDeviceList(); device; device = GetNextDevice(device)) {
-		device_box = (*device)->gdRect;
-		if (TestDeviceAttribute(device, screenDevice)
-		  && TestDeviceAttribute(device, screenActive)
-		  && SectRect(globalRect, &device_box, &sect)) {
-			area = (sect.right - sect.left) * (sect.bottom - sect.top);
-			if (area > maxArea) {
-				device_pix = (*device)->gdPMap;
-				maxArea = area;
-			}
-		}
-	}
-		/* create a pixmap */
-	if (device_pix != NULL) {
-		width = globalRect->right - globalRect->left;
-		height = globalRect->bottom - globalRect->top;
-		if ((*device_pix)->pixelSize <= 8)
-			return MakePixMap(width, height, (*device_pix)->pmTable);
-		else if ((*device_pix)->pixelSize == 16)
-			return Make16BitPixMap(width, height);
-		else if ((*device_pix)->pixelSize == 32)
-			return Make32BitPixMap(width, height);
-	}
-	return NULL;
-}
-
-
-void KillPixMap(PixMapHandle pix) {
-	DisposePtr((*pix)->baseAddr);
-	DisposeHandle((Handle) (*pix)->pmTable);
-	DisposeHandle((Handle) pix);
-}
-
-long PixMapSize(PixMapHandle pix) {
-	if (pix == NULL) return 0;
-	return GetPtrSize((*pix)->baseAddr)
-		+ GetHandleSize((Handle) (*pix)->pmTable)
-		+ GetHandleSize((Handle) pix);
-}
-
-void SetPixMapPixel(PixMapHandle pix, short h, short v, long value) {
-	long row_bytes;
-	unsigned char *dst;
-	row_bytes = (*pix)->rowBytes & 0x00003FFF;
-	dst = (unsigned char *) (*pix)->baseAddr;
-	switch ((*pix)->pixelSize) {
-		case 1:
-			dst += ((long) v) * row_bytes;
-			if (value != 0) BitSet(dst, h); else BitClr(dst, h);
-			break;
-		case 2:
-			dst += ((long) v) * row_bytes + ((long) (h>>2));
-			switch (h&3) {
-				case 0:
-					*dst = ((*dst) & 0x3F) | (value<<6);
-					break;
-				case 1:
-					*dst = ((*dst) & 0xCF) | ((value&0x03)<<4);
-					break;
-				case 2:
-					*dst = ((*dst) & 0xF3) | ((value&0x03)<<2);
-					break;
-				case 3:
-					*dst = ((*dst) & 0xFC) | (value&0x03);
-					break;
-			}
-			break;
-		case 4:
-			dst += ((long) v) * row_bytes + ((long) (h>>1));
-			if ((h&1) == 0) {
-				*dst = ((*dst) & 0x0F) | (value<<4);
-			} else {
-				*dst = ((*dst) & 0xF0) | (value & 0x0F);
-			}
-			break;
-		case 8:
-			dst += ((long) v) * row_bytes + ((long) h);
-			*dst = (unsigned char) value;
-			break;
-		case 16:
-			dst += ((long) v) * row_bytes + (((long) h) * 2);
-			* ((short*) dst) = (short) value;
-			break;
-		case 32:
-			dst += ((long) v) * row_bytes + (((long) h) * 4);
-			* ((long*) dst) = value;
-			break;
-	}
-}
-
-
-long GetPixMapPixel(PixMapHandle pix, short h, short v) {
-	long row_bytes, the_value;
-	unsigned char *src;
-	row_bytes = ((*pix)->rowBytes & 0x00003FFF);
-	src = (unsigned char *) (*pix)->baseAddr;
-	switch ((*pix)->pixelSize) {
-		case 1:
-			src += ((long) v) * row_bytes;
-			if (BitTst(src, h)) the_value = 1; else the_value = 0;
-			break;
-		case 2:
-			src += ((long) v) * row_bytes + (((long) h) >> 2);
-			switch (h&3) {
-				case 0:
-					the_value = (long) (((*src) >> 6) & 0x03);
-					break;
-				case 1:
-					the_value = (long) (((*src) >> 4) & 0x03);
-					break;
-				case 2:
-					the_value = (long) (((*src) >> 2) & 0x03);
-					break;
-				case 3:
-					the_value = (long) ((*src) & 0x03);
-					break;
-			}
-			break;
-		case 4:
-			src += ((long) v) * row_bytes + (((long) h) >> 1);
-			if ((h&1) == 0) {
-				the_value = (long) (((*src) >> 4) & 0x0F);
-			} else {
-				the_value = (long) ((*src) & 0x0F);
-			}
-			break;
-		case 8:
-			src += ((long) v) * row_bytes + ((long) h);
-			the_value = (long) ((*src) & 0x000000FF);
-			break;
-		case 16:
-			src += ((long) v) * row_bytes + (((long) h) << 1);
-			the_value = (long) ((* ((short*) src)) & 0x0000FFFF);
-			break;
-		case 32:
-			src += ((long) v) * row_bytes + (((long) h) << 2);
-			the_value = * ((long*) src);
-			break;
-	}
-	return the_value;
-}
-
-
-#if defined(powerc) || defined(__powerc)
-
-static short pixround(float x) {
-	float low, high;
-	low = floor(x);
-	high = ceil(x);
-	if (fabs(low - x) < fabs(high - x))
-		return (short) low;
-	else return (short) high;
-}
-
-PixMapHandle RotatePixMap(PixMapHandle pix, short cx, short cy, float angle) {
-	unsigned long srcrow, dstrow;
-	long x, y, width, height;
-	unsigned char *srcbase, *dstbase, *d;
-	float rad, crad, srad, zx, zy;
-	short hpos, vpos;
-	PixMapHandle new_pix;
-	if ((*pix)->pixelSize <= 8)
-		new_pix = MakePixMap((*pix)->bounds.right, (*pix)->bounds.bottom, (*pix)->pmTable);
-	else if ((*pix)->pixelSize == 16)
-		new_pix = Make16BitPixMap((*pix)->bounds.right, (*pix)->bounds.bottom);
-	else if ((*pix)->pixelSize == 32)
-		new_pix = Make32BitPixMap((*pix)->bounds.right, (*pix)->bounds.bottom);
-	else return NULL;
-	if (new_pix != NULL) {
-		rad = 0.017453 * angle;
-		crad = cos(rad);
-		srad = sin(rad);
-		srcrow = ((*pix)->rowBytes & 0x3FFF);
-		dstrow = ((*new_pix)->rowBytes & 0x3FFF);
-		srcbase = (unsigned char*) (*pix)->baseAddr;
-		dstbase = (unsigned char*) (*new_pix)->baseAddr;
-		height = (*pix)->bounds.bottom;
-		width = (*pix)->bounds.right;
-		switch ((*pix)->pixelSize) {
-			case 1:
-			case 2:
-			case 4:
-				for (y = 0; y < height; y++)
-					for (x = 0; x < width; x++) {
-						zx = (float) (x - cx);
-						zy = (float) (y - cy);
-						vpos = pixround((zy*crad) - (zx*srad) + ((float) cy));
-						if (vpos >= 0 && vpos < height) {
-							hpos = pixround((zx*crad) + (zy*srad) + ((float) cx));
-							if (hpos >= 0 && hpos < width)
-								SetPixMapPixel(new_pix, x, y, GetPixMapPixel(pix, hpos, vpos));
-						}
-					}
-				break;
-			case 8:
-				for (y = 0; y < height; y++, dstbase += dstrow)
-					for (d = dstbase, x = 0; x < width; x++, d++) {
-						zx = (float) (x - cx);
-						zy = (float) (y - cy);
-						vpos = pixround((zy*crad) - (zx*srad) + ((float) cy));
-						if (vpos >= 0 && vpos < height) {
-							hpos = pixround((zx*crad) + (zy*srad) + ((float) cx));
-							if (hpos >= 0 && hpos < width)
-								*d = *(srcbase + vpos * srcrow + hpos);
-						}
-					}
-				break;
-			case 16:
-				for (y = 0; y < height; y++, dstbase += dstrow)
-					for (d = dstbase, x = 0; x < width; x++, d += 2) {
-						zx = (float) (x - cx);
-						zy = (float) (y - cy);
-						vpos = pixround((zy * crad) - (zx * srad) + ((float) cy));
-						if (vpos >= 0 && vpos < height) {
-							hpos = pixround((zx * crad) + (zy * srad) + ((float) cx));
-							if (hpos >= 0 && hpos < width)
-								* ((short*) d) = * ((short*) (srcbase + vpos * srcrow + (hpos<<1)));
-						}
-					}
-				break;
-			case 32:
-				for (y = 0; y < height; y++, dstbase += dstrow)
-					for (d = dstbase, x = 0; x < width; x++, d += 4) {
-						zx = (float) (x - cx);
-						zy = (float) (y - cy);
-						vpos = pixround((zy * crad) - (zx * srad) + ((float) cy));
-						if (vpos >= 0 && vpos < height) {
-							hpos = pixround((zx * crad) + (zy * srad) + ((float) cx));
-							if (hpos >= 0 && hpos < width)
-								* ((long*) d) = * ((long*) (srcbase + vpos * srcrow + (hpos<<2)));
-						}
-					}
-				break;
-		}
-	}
-	return new_pix;
-}
-
-#else
-
-PixMapHandle RotatePixMap(PixMapHandle pix, short cx, short cy, float angle) {
-	unsigned long srcrow, dstrow;
-	long x, y, i, width, height;
-	unsigned char *srcbase, *dstbase, *d, *s;
-	Fixed rad, crad, srad, zx, zy, cxx, cyy;
-	short hpos, vpos;
-	PixMapHandle new_pix;
-	if ((*pix)->pixelSize <= 8)
-		new_pix = MakePixMap((*pix)->bounds.right, (*pix)->bounds.bottom, (*pix)->pmTable);
-	else if ((*pix)->pixelSize == 16)
-		new_pix = Make16BitPixMap((*pix)->bounds.right, (*pix)->bounds.bottom);
-	else if ((*pix)->pixelSize == 32)
-		new_pix = Make32BitPixMap((*pix)->bounds.right, (*pix)->bounds.bottom);
-	else return NULL;
-	if (new_pix != NULL) {
-		rad = FixMul(0x00000478, X2Fix(angle));
-		crad = FracCos(rad);
-		srad = FracSin(rad);
-		srcrow = ((*pix)->rowBytes & 0x3FFF);
-		dstrow = ((*new_pix)->rowBytes & 0x3FFF);
-		srcbase = (unsigned char*) (*pix)->baseAddr;
-		dstbase = (unsigned char*) (*new_pix)->baseAddr;
-		height = (*pix)->bounds.bottom;
-		width = (*pix)->bounds.right;
-		cxx = FixRatio(cx, 1);
-		cyy = FixRatio(cy, 1);
-		switch ((*pix)->pixelSize) {
-			case 1:
-			case 2:
-			case 4:
-				for (y = 0; y < height; y++)
-					for (x = 0; x < width; x++) {
-						zx = FixRatio(x, 1) - cxx;
-						zy = FixRatio(y, 1) - cyy;
-						vpos = FixRound(FracMul(zy, crad) - FracMul(zx, srad) + cyy);
-						if (vpos >= 0 && vpos < height) {
-							hpos = FixRound(FracMul(zx, crad) + FracMul(zy, srad) + cxx);
-							if (hpos >= 0 && hpos < width)
-								SetPixMapPixel(new_pix, x, y, GetPixMapPixel(pix, hpos, vpos));
-						}
-					}
-				break;
-			case 8:
-				for (y = 0; y < height; y++, dstbase += dstrow)
-					for (d = dstbase, x = 0; x < width; x++, d++) {
-						zx = FixRatio(x, 1) - cxx;
-						zy = FixRatio(y, 1) - cyy;
-						vpos = FixRound(FracMul(zy, crad) - FracMul(zx, srad) + cyy);
-						if (vpos >= 0 && vpos < height) {
-							hpos = FixRound(FracMul(zx, crad) + FracMul(zy, srad) + cxx);
-							if (hpos >= 0 && hpos < width)
-								*d = *(srcbase + vpos * srcrow + hpos);
-						}
-					}
-				break;
-			case 16:
-				for (y = 0; y < height; y++, dstbase += dstrow)
-					for (d = dstbase, x = 0; x < width; x++, d += 2) {
-						zx = FixRatio(x, 1) - cxx;
-						zy = FixRatio(y, 1) - cyy;
-						vpos = FixRound(FracMul(zy, crad) - FracMul(zx, srad) + cyy);
-						if (vpos >= 0 && vpos < height) {
-							hpos = FixRound(FracMul(zx, crad) + FracMul(zy, srad) + cxx);
-							if (hpos >= 0 && hpos < width)
-								* ((short*) d) = * ((short*) (srcbase + vpos * srcrow + (hpos<<1)));
-						}
-					}
-				break;
-			case 32:
-				for (y = 0; y < height; y++, dstbase += dstrow)
-					for (d = dstbase, x = 0; x < width; x++, d += 4) {
-						zx = FixRatio(x, 1) - cxx;
-						zy = FixRatio(y, 1) - cyy;
-						vpos = FixRound(FracMul(zy, crad) - FracMul(zx, srad) + cyy);
-						if (vpos >= 0 && vpos < height) {
-							hpos = FixRound(FracMul(zx, crad) + FracMul(zy, srad) + cxx);
-							if (hpos >= 0 && hpos < width)
-								* ((long*) d) = * ((long*) (srcbase + vpos * srcrow + (hpos<<2)));
-						}
-					}
-				break;
-		}
-	}
-	return new_pix;
-}
-
-#endif
-
-
-PixMapHandle RotatePixRight(PixMapHandle pix) {
-	unsigned long srcrow, dstrow, x, y, dstcol, width, height;
-	unsigned char *srcbase, *dstbase, *s, *d;
-	PixMapHandle new_pix;
-		
-		/* establish the next pixmap */
-	if ((*pix)->pixelSize <= 8)
-		new_pix = MakePixMap((*pix)->bounds.bottom, (*pix)->bounds.right, (*pix)->pmTable);
-	else if ((*pix)->pixelSize == 16)
-		new_pix = Make16BitPixMap((*pix)->bounds.bottom, (*pix)->bounds.right);
-	else if ((*pix)->pixelSize == 32)
-		new_pix = Make32BitPixMap((*pix)->bounds.bottom, (*pix)->bounds.right);
-	else return NULL;
-	
-	if (new_pix == NULL) return NULL;
-	
-		/* set up locals */
-	srcrow = ((*pix)->rowBytes & 0x3FFF);
-	dstrow = ((*new_pix)->rowBytes & 0x3FFF);
-	srcbase = (unsigned char*) (*pix)->baseAddr;
-	dstbase = (unsigned char*) (*new_pix)->baseAddr;
-	dstcol = height = (*pix)->bounds.bottom;
-	width = (*pix)->bounds.right;
-		
-		/* rotate the image */
-	switch ((*pix)->pixelSize) {
-		case 1:
-		case 2:
-		case 4:
-			for (y = 0; y < height; y++)
-				for (x=0; x < width; x++)
-					SetPixMapPixel(new_pix, height - y - 1, x, GetPixMapPixel(pix, x, y));
-			break;
-		case 8:
-			for (y = 0; y < height; y++, srcbase += srcrow)
-				for (s = srcbase, d = dstbase + (--dstcol), x=0; x < width; x++, d += dstrow)
-					*d = *s++;
-			break;
-		case 16:
-			for (y = 0; y < height; y++, srcbase += srcrow)
-				for (s = srcbase, d = dstbase + ((--dstcol) << 1), x=0; x < width; x++, s += 2, d += dstrow)
-					* ((short*) d) = * ((short*) s);
-			break;
-		case 32:
-			for (y = 0; y < height; y++, srcbase += srcrow)
-				for (s = srcbase, d = dstbase + ((--dstcol) << 2), x=0; x < width; x++, s += 4, d += dstrow)
-					* ((long*) d) = * ((long*) s);
-			break;
-	}
-	
-		/* done */
-	return new_pix;
-}
-
-
-PixMapHandle RotatePixLeft(PixMapHandle pix) {
-	unsigned long srcrow, dstrow, x, y, dstcol, width, height;
-	unsigned char *srcbase, *dstbase, *s, *d, *dststart;
-	PixMapHandle new_pix;
-		
-		/* get the next pixmap */
-	if ((*pix)->pixelSize <= 8)
-		new_pix = MakePixMap((*pix)->bounds.bottom, (*pix)->bounds.right, (*pix)->pmTable);
-	else if ((*pix)->pixelSize == 16)
-		new_pix = Make16BitPixMap((*pix)->bounds.bottom, (*pix)->bounds.right);
-	else if ((*pix)->pixelSize == 32)
-		new_pix = Make32BitPixMap((*pix)->bounds.bottom, (*pix)->bounds.right);
-	else return NULL;
-	if (new_pix == NULL) return NULL;
-	
-		/* set up the locals */
-	srcrow = ((*pix)->rowBytes & 0x3FFF);
-	dstrow = ((*new_pix)->rowBytes & 0x3FFF);
-	srcbase = (unsigned char*) (*pix)->baseAddr;
-	dstbase = (unsigned char*) (*new_pix)->baseAddr;
-	height = (*pix)->bounds.bottom;
-	width = (*pix)->bounds.right;
-	dststart = dstbase + ((width-1) * dstrow);
-	dstcol = 0;
-	
-		/* rotate the image */
-	switch ((*pix)->pixelSize) {
-		case 1:
-		case 2:
-		case 4:
-			for (y = 0; y < height; y++)
-				for (x=0; x < width; x++)
-					SetPixMapPixel(new_pix, y, width - x - 1, GetPixMapPixel(pix, x, y));
-			break;
-		case 8:
-			for (y = 0; y < height; y++, srcbase += srcrow)
-				for (s = srcbase, d = dststart + (dstcol++), x = 0; x < width; x++, d -= dstrow)
-					*d = *s++;
-			break;
-		case 16:
-			for (y = 0; y < height; y++, srcbase += srcrow)
-				for (s = srcbase, d = dststart + ((dstcol++) << 1), x = 0; x < width; x++, s += 2, d -= dstrow)
-					* ((short*) d) = * ((short*) s);
-			break;
-		case 32:
-			for (y = 0; y < height; y++, srcbase += srcrow)
-				for (s = srcbase, d = dststart + ((dstcol++) << 2), x = 0; x < width; x++, s += 4, d -= dstrow)
-					* ((long*) d) = * ((long*) s);
-			break;
-	}
-	return new_pix;
-}
-
-PixMapHandle FlipPixVertical(PixMapHandle pix) {
-	unsigned long srcrow, dstrow, y, width, height;
-	unsigned char *srcbase, *dstbase;
-	PixMapHandle new_pix;
-	
-		/* get the next pixmap */
-	if ((*pix)->pixelSize <= 8)
-		new_pix = MakePixMap((*pix)->bounds.right, (*pix)->bounds.bottom, (*pix)->pmTable);
-	else if ((*pix)->pixelSize == 16)
-		new_pix = Make16BitPixMap((*pix)->bounds.right, (*pix)->bounds.bottom);
-	else if ((*pix)->pixelSize == 32)
-		new_pix = Make32BitPixMap((*pix)->bounds.right, (*pix)->bounds.bottom);
-	else return NULL;
-	if (new_pix == NULL) return NULL;
-	
-		/* set up the locals */
-	srcrow = ((*pix)->rowBytes & 0x3FFF);
-	dstrow = ((*new_pix)->rowBytes & 0x3FFF);
-	srcbase = (unsigned char*) (*pix)->baseAddr;
-	dstbase = (unsigned char*) (*new_pix)->baseAddr;
-	height = (*pix)->bounds.bottom;
-	width = (*pix)->bounds.right;
-	dstbase += (height * dstrow);
-	
-		/* flip the image */
-	for (y=0; y < height; y++) {
-		dstbase -= dstrow;
-		BlockMoveData(srcbase, dstbase, dstrow);
-		srcbase += srcrow; 
-	}
-	return new_pix;
-}
-
-PixMapHandle FlipPixHorizontal(PixMapHandle pix) {
-	unsigned long srcrow, dstrow, x, y, width, height;
-	unsigned char *srcbase, *dstbase, *s, *d;
-	PixMapHandle new_pix;
-	
-		/* get the next pixmap */
-	if ((*pix)->pixelSize <= 8)
-		new_pix = MakePixMap((*pix)->bounds.right, (*pix)->bounds.bottom, (*pix)->pmTable);
-	else if ((*pix)->pixelSize == 16)
-		new_pix = Make16BitPixMap((*pix)->bounds.right, (*pix)->bounds.bottom);
-	else if ((*pix)->pixelSize == 32)
-		new_pix = Make32BitPixMap((*pix)->bounds.right, (*pix)->bounds.bottom);
-	else return NULL;
-	if (new_pix == NULL) return NULL;
-	
-		/* set up the locals */
-	srcrow = ((*pix)->rowBytes & 0x3FFF);
-	dstrow = ((*new_pix)->rowBytes & 0x3FFF);
-	srcbase = (unsigned char*) (*pix)->baseAddr;
-	dstbase = (unsigned char*) (*new_pix)->baseAddr;
-	height = (*pix)->bounds.bottom;
-	width = (*pix)->bounds.right;
-	
-		/* flip the image */
-	switch ((*pix)->pixelSize) {
-		case 1:
-		case 2:
-		case 4:
-			for (y = 0; y < height; y++)
-				for (x=0; x < width; x++)
-					SetPixMapPixel(new_pix, width - x - 1, y, GetPixMapPixel(pix, x, y));
-			break;
-		case 8:
-			for (y = 0; y < height; y++, srcbase += srcrow, dstbase += dstrow)
-				for(s = srcbase + width, d = dstbase, x = 0; x < width; x++)
-					*d++ = *--s;
-			break;
-		case 16:
-			for (y = 0; y < height; y++, srcbase += srcrow, dstbase += dstrow)
-				for(s = srcbase + (width << 1) - 2, d = dstbase, x = 0; x < width; x++, d += 2, s -= 2)
-					* ((short*) d) = * ((short*) s);
-			break;
-		case 32:
-			for (y = 0; y < height; y++, srcbase += srcrow, dstbase += dstrow)
-				for(s = srcbase + (width << 2) - 4, d = dstbase, x = 0; x < width; x++, d += 4, s -= 4)
-					* ((long*) d) = * ((long*) s);
-			break;
-	}
-	return new_pix;
-}
-
-
-PixMapHandle DuplicatePixMap(PixMapHandle pix) {
-	unsigned long srcrow, dstrow, y, width, height;
-	unsigned char *srcbase, *dstbase;
-	PixMapHandle new_pix;
-	
-		/* get the next pixmap */
-	if ((*pix)->pixelSize <= 8)
-		new_pix = MakePixMap((*pix)->bounds.right, (*pix)->bounds.bottom, (*pix)->pmTable);
-	else if ((*pix)->pixelSize == 16)
-		new_pix = Make16BitPixMap((*pix)->bounds.right, (*pix)->bounds.bottom);
-	else if ((*pix)->pixelSize == 32)
-		new_pix = Make32BitPixMap((*pix)->bounds.right, (*pix)->bounds.bottom);
-	else return NULL;
-	if (new_pix == NULL) return NULL;
-	
-		/* set up the locals */
-	srcrow = ((*pix)->rowBytes & 0x3FFF);
-	dstrow = ((*new_pix)->rowBytes & 0x3FFF);
-	srcbase = (unsigned char*) (*pix)->baseAddr;
-	dstbase = (unsigned char*) (*new_pix)->baseAddr;
-	height = (*pix)->bounds.bottom;
-	width = (*pix)->bounds.right;
-	
-		/* copy the image */
-	for (y=0; y < height; y++) {
-		BlockMoveData(srcbase, dstbase, dstrow);
-		srcbase += srcrow; 
-		dstbase += dstrow;
-	}
-	return new_pix;
-}
-
-
-PixMapHandle PICTToPixMap(PicHandle pic, CTabHandle clut) {
-	Rect bounds;
-	PixMapHandle pix;
-	PixMapPort *pxmp;
-	bounds = (*pic)->picFrame;
-	OffsetRect(&bounds, -bounds.left, -bounds.top);
-	pix = MakePixMap(bounds.right, bounds.bottom, clut);
-	if (pix != NULL)
-		WithPixMap(pix, pxmp) {
-			DrawPicture(pic, &bounds);
-		}
-	return pix;
-}
-
-PixMapHandle PICTTo16BitPixMap(PicHandle pic) {
-	Rect bounds;
-	PixMapHandle pix;
-	PixMapPort *pxmp;
-	bounds = (*pic)->picFrame;
-	OffsetRect(&bounds, -bounds.left, -bounds.top);
-	pix = Make16BitPixMap(bounds.right, bounds.bottom);
-	if (pix != NULL)
-		WithPixMap(pix, pxmp) {
-			DrawPicture(pic, &bounds);
-		}
-	return pix;
-}
-
-
-PixMapHandle PICTTo32BitPixMap(PicHandle pic) {
-	Rect bounds;
-	PixMapHandle pix;
-	PixMapPort *pxmp;
-	bounds = (*pic)->picFrame;
-	OffsetRect(&bounds, -bounds.left, -bounds.top);
-	pix = Make32BitPixMap(bounds.right, bounds.bottom);
-	if (pix != NULL)
-		WithPixMap(pix, pxmp) {
-			DrawPicture(pic, &bounds);
-		}
-	return pix;
-}
-
-
-PicHandle PixMapToPICT(PixMapHandle pix) {
-	PicHandle pic;
-	GrafPtr saved;
-	//CGrafPort port;//commented by Kekus Digital
-	CGrafPtr port;//added by Kekus Digital
-	Rect bounds;
-	bounds = (*pix)->bounds;
-	GetPort(&saved);
-	//OpenCPort(&port);//commented by Kekus Digital
-        port = CreateNewPort();//added by Kekus Digital
-	pic = OpenPicture(&bounds);
-	ClipRect(&bounds);
-	PlotPixMap(pix, 0, 0, srcCopy);
-	ClosePicture();
-	SetPort(saved);
-	//ClosePort((GrafPtr) &port);//commented by Kekus Digital
-        DisposePort(port);//added by Kekus Digital
-	if (GetHandleSize((Handle) pic) == sizeof(Picture)) {
-		KillPicture(pic);
-		pic = NULL;
-	}
-	return pic;
-}
-
-
-PicHandle PixMapToCompressedPICT(PixMapHandle pix) {
-	GrafPtr saved;
-	//CGrafPort port;//commented by Kekus Digital
-	CGrafPtr port;//added by Kekus Digital
-	PicHandle pic;
-	Rect bounds;
-	OSErr err;
-	long buffersize, response;
-	Ptr compBuffer;
-	ImageDescriptionHandle iDesc;
-	Boolean port_open;
-	
-		/* can it be done? */
-	if (Gestalt(gestaltCompressionMgr, &response) != noErr) return NULL;
-	
-		/* initial state */
-	compBuffer = NULL;
-	iDesc = NULL;
-	pic = NULL;
-	port_open = false;
-
-		/* draw the picture, make sure we have a port */
-	GetPort(&saved);
-	//OpenCPort(&port);//commented by Kekus Digital
-        port = CreateNewPort();//added by Kekus Digital
-	ClipRect(&bounds);
-	port_open = true;
-	
-		/* calculate sizes */
-	bounds = (*pix)->bounds;
-	err = GetMaxCompressionSize(pix, &bounds, 0, codecHighQuality, 'jpeg', anyCodec, &buffersize);
-	if (err != noErr) goto bail;
-	
-		/* allocate storage */
-	compBuffer = NewPtr(buffersize);
-	if ((err = MemError()) != noErr) goto bail;
-	iDesc = (ImageDescriptionHandle) NewHandleClear(sizeof(ImageDescription));
-	if ((err = MemError()) != noErr) goto bail;
-	
-		/* compress the image */
-	err = CompressImage(pix, &bounds, codecHighQuality, 'jpeg', iDesc, compBuffer);
-	if (err != noErr) goto bail;
-		
-		/* put the compressed image in a picture */
-	pic = OpenPicture(&bounds);
-	ClipRect(&bounds);
-	err = DecompressImage(compBuffer, iDesc, pix, &bounds, &bounds, srcCopy, NULL);
-	ClosePicture();
-	
-		/* verify that the picture is ok */
-	if (err != noErr || GetHandleSize((Handle) pic) == sizeof(Picture)) goto bail;
-	
-		/* clean up and go */
-	SetPort(saved);
-	//ClosePort((GrafPtr) &port);//commented by Kekus Digital
-        DisposePort(port);//added by Kekus Digital
-	DisposePtr(compBuffer);
-	DisposeHandle((Handle) iDesc);
-	return pic;
-
-bail:
-	if (port_open)  {
-		SetPort(saved);
-		//ClosePort((GrafPtr) &port);//commented by Kekus Digital
-                DisposePort(port);//added by Kekus Digital
-	}
-	if (pic != NULL) KillPicture(pic);
-	if (compBuffer != NULL) DisposePtr(compBuffer);
-	if (iDesc != NULL) DisposeHandle((Handle) iDesc);
-	return NULL;
-}
-
-
-PixMapPort* NewPxMP(PixMapHandle pix) {
-	GDHandle the_device;
-	ITabHandle inverse_table;
-	PixMapPort* pxmp;
-	Boolean device_active;
-	Rect r;
-        RgnHandle the_VisRgn = nil;
-	
-		/* set up initial variable states */
-	the_device = NULL;
-	inverse_table = NULL;
-	pxmp = NULL;
-	device_active = false;
-	
-		/* allocate the pxmp */
-	pxmp = (PixMapPort*) NewPtr(sizeof(PixMapPort));
-	if (pxmp == NULL) goto bail;
-	
-		/* create the graphics device */
-	inverse_table = (ITabHandle) NewHandleClear(2);
-	if (inverse_table == NULL) goto bail;
-	if ((*pix)->pixelSize <= 8) { /* set it up only for indexed devices */
-		MakeITable((*pix)->pmTable, inverse_table, 4);
-		if (QDError() != noErr) goto bail;
-	}
-	
-		/* create the graphics device */
-	the_device = (GDHandle) NewHandleClear(sizeof(GDevice));
-	if (the_device == NULL) goto bail;
-	if ((*pix)->pixelSize <= 8)
-		(*the_device)->gdType = clutType;
-	else (*the_device)->gdType = directType;
-	(*the_device)->gdITable = inverse_table;
-	(*the_device)->gdResPref = 4;
-	(*the_device)->gdPMap = pix;
-	(*the_device)->gdRect = (*pix)->bounds;
-	(*the_device)->gdMode = -1;
-	SetDeviceAttribute(the_device, gdDevType, true);
-	SetDeviceAttribute(the_device, noDriver, true);
-
-		/* save the current grafport and device */
-	GetPort(&pxmp->saved_port);
-	pxmp->saved_device = GetGDevice();
-
-		/* set the current device to the new one*/
-	SetGDevice((pxmp->pdevice = the_device));
-	device_active = true;
-
-		/* Open the new grafport*/
-	//OpenCPort(&pxmp->pport);//commented by Kekus Digital
-        pxmp->pport = CreateNewPort();//added by Kekus Digital
-	//SetPort((GrafPtr) &pxmp->pport); //commented by Kekus Digital
-	SetPort((GrafPtr) pxmp->pport); //added by Kekus Digital
-	r = (*pix)->bounds;
-	PortSize(r.right, r.bottom);
-	ClipRect(&r);
-	//RectRgn(pxmp->pport.visRgn, &r);//commented by Kekus Digital
-        
-        GetPortVisibleRegion(pxmp->pport,the_VisRgn );//added by Kekus Digital
-	RectRgn(the_VisRgn, &r);//added by Kekus Digital
-
-		/* done */
-	return pxmp;
-
-bail:
-	if (device_active) SetGDevice(pxmp->saved_device);
-	if (inverse_table != NULL) DisposeHandle((Handle) inverse_table);
-	if (the_device != NULL) DisposeHandle((Handle) the_device);
-	if (pxmp != NULL) DisposePtr((Ptr) pxmp);
-	return NULL;
-}
-
-void DisposePxMP(PixMapPort* px) {
-	if (px->pdevice == GetGDevice()) {
-		SetGDevice(px->saved_device);
-		SetPort(px->saved_port);
-	}
-	//CloseCPort(&px->pport);//commented by Kekus Digital
-        DisposePort(px->pport);//added by Kekus Digital
-	DisposeHandle((Handle) ((*px->pdevice)->gdITable));
-	DisposeHandle((Handle) (px->pdevice));
-	DisposePtr((Ptr) px);
-}
-
-void PlotPixMap(PixMapHandle pix, short h, short v, short mode) {
-	GrafPtr port;
-	Rect src, dst;
-	char hstate;
-	GetPort(&port);
-	hstate = HGetState((Handle) pix);
-	HLock((Handle) pix);
-	src = dst = (*pix)->bounds;
-	OffsetRect(&dst, h, v);
-	//CopyBits((BitMap *) (*pix), &port->portBits, &src, &dst, mode, NULL);//commented by Kekus Digital
-	CopyBits((BitMap *) (*pix), GetPortBitMapForCopyBits(port), &src, &dst, mode, NULL);//added by Kekus Digital
-	HSetState((Handle) pix, hstate);
-}
-
-void PixMapCopy(PixMapHandle pix, Rect *src, Rect *dst, short mode) {
-	GrafPtr port;
-	char hstate;
-	GetPort(&port);
-	hstate = HGetState((Handle) pix);
-	HLock((Handle) pix);
-	//CopyBits((BitMap *) (*pix), &port->portBits, src, dst, mode, NULL);//commented by Kekus Digital
-	CopyBits((BitMap *) (*pix), GetPortBitMapForCopyBits(port), src, dst, mode, NULL);//added by Kekus Digital
-	HSetState((Handle) pix, hstate);
-}
-
-PixPatHandle PixMap2PixPat(PixMapHandle pix, Pattern *the_pattern) {
-	PixPat ppat;
-	PixMap pmap;
-	PixPatHandle the_pixpat;
-	long bytecount;
-	char ctstate;
-	short width, height;
-	OSErr err;
-	
-		/* recoverable state */
-	the_pixpat = NULL;
-
-		/* check parameters */
-	if ((*pix)->pixelSize > 8) goto bail;
-	width = (*pix)->bounds.right;
-	if (width != 8 && width != 16 && width != 32 && width != 64 && width != 128)
-		goto bail;
-	height = (*pix)->bounds.bottom;
-	if (height != 8 && height != 16 && height != 32 && height != 64 && height != 128)
-		goto bail;	
-	
-		/* set variables to correct initial settings */
-	bytecount = ((long) ((*pix)->rowBytes & 0x3FFF)) * ((long) (*pix)->bounds.bottom);
-	ppat.patType = 1;
-	ppat.patMap = (PixMapHandle) sizeof(PixPat);
-	ppat.patData = (Handle) (sizeof(PixPat) + sizeof(PixMap));
-	ppat.patXData = NULL;
-	ppat.patXValid = -1;
-	ppat.patXMap = NULL;
-	ppat.pat1Data = *the_pattern;
-	pmap = **pix;
-	pmap.baseAddr = NULL;
-	pmap.pmTable = (CTabHandle) (sizeof(PixPat) + sizeof(PixMap) + bytecount);
-
-		/* add the PixPat header */
-	err = PtrToHand(&ppat, (Handle*) &the_pixpat, sizeof(ppat));
-	if (err != noErr) goto bail;
-	
-		/* ... then the PixMap */
-	err = PtrAndHand(&pmap, (Handle) the_pixpat, sizeof(PixMap));
-	if (err != noErr) goto bail;
-	
-		/* ... then the raster data */
-	err = PtrAndHand((*pix)->baseAddr, (Handle) the_pixpat, bytecount);
-	if (err != noErr) goto bail;
-	
-		/* ... and finally the colour table */
-	ctstate = HGetState((Handle) (*pix)->pmTable);
-	HLock((Handle) (*pix)->pmTable);
-	err = PtrAndHand(*((*pix)->pmTable), (Handle) the_pixpat, GetHandleSize((Handle) (*pix)->pmTable));
-	HSetState((Handle) (*pix)->pmTable, ctstate);
-	if (err != noErr) goto bail;
-	
-		/* done */
-	return the_pixpat;
-
-bail:
-	if (the_pixpat != NULL) DisposeHandle((Handle) the_pixpat);
-	return NULL;
-}
-
-
-CTabHandle CalcPixMapColours(PixMapHandle pix) {
-	CTabHandle clut;
-	OSErr err;
-	clut = NULL;
-	if ((*pix)->pixelSize <= 8) {
-		clut = (*pix)->pmTable;
-		if (HandToHand((Handle *) &clut) != noErr) clut = NULL;
-	} else {
-		PictInfo pictinfo;
-		memset(&pictinfo, 0, sizeof(pictinfo));
-		err = GetPixMapInfo(pix, &pictinfo,
-			returnColorTable+suppressBlackAndWhite,
-			254, medianMethod, 0);
-		if (err == noErr) clut = pictinfo.theColorTable;
-	}
-	return clut;
-}
-
-
-

Deleted: trunk/libpano/PixMap.h
===================================================================
--- trunk/libpano/PixMap.h	2009-02-01 17:37:06 UTC (rev 926)
+++ trunk/libpano/PixMap.h	2009-02-01 17:59:30 UTC (rev 927)
@@ -1,245 +0,0 @@
-/* File PixMap.h Copyright (C) 1997 by John R. Montbriand.  All Rights Reserved. */
-
-#ifndef __PIXMAP__
-#define __PIXMAP__
-
-/* File PixMap.h
-	PixMap manipulation routines, definitions.
-	Copyright (c) 1996, 1997 by John Montbriand.  All Rights Reserved.
-	Permission hereby granted for public use.
-    	Distribute freely in areas where the laws of copyright apply.
-	USE AT YOUR OWN RISK.
-	DO NOT DISTRIBUTE MODIFIED COPIES.
-	Comments/questions/postcards* to the author at the address:
-	  John Montbriand
-	  P.O. Box. 1133
-	  Saskatoon Saskatchewan Canada
-	  S7K 3N2
-	or by email at:
-	  tinyjohn@...
-	*if you mail a postcard, then I will provide you with technical support
-	regarding questions you may have about this file.
-
-*/
-
-//#include <Types.h> // commented by Kekus Digital
-//#include <QuickDraw.h> // commented by Kekus Digital
-#include <Carbon/Carbon.h> // added by Kekus Digital
-
-#ifdef __cplusplus
-extern "C" { 
-#endif
-
-
-/* version number for this interface (version 1) */
-
-#define kPixMapVersion 1
-
-
-/* MakePixMap creates a new pixmap handle with the requested
-	dimensions.  If there is not enough memory to allocate the pixmap,
-	MakePixMap will return NULL.  if clut is NULL, then the default
-	256 colour table (clut = 8) is used.  if clut is not NULL, then a
-	copy of it is used in the pixmap.  The number of colours in the clut
-	determines the pixel depth of the created pixmap as follows:
-		2 colours -> 1 pit per pixel,
-		3 to 4 colours -> 2 bits per pixel,
-		5 to 16 colours -> 4 bits per pixel,
-		17 to 256 colours -> 8 bits per pixel. */
-
-PixMapHandle MakePixMap(short width, short height, CTabHandle clut);
-
-
-/* Make16BitPixMap creates a new pixmap handle with the requested
-	dimensions.  If there is not enough memory to allocate the pixmap,
-	Make16BitPixMap will return NULL.  The created pixmap utilizes 16 bit
-	colour and allocates 16 bits per each pixel.  Make32BitPixMap is
-	identical however it allocates 32 bits per pixel.  */
-
-PixMapHandle Make16BitPixMap(short width, short height);
-PixMapHandle Make32BitPixMap(short width, short height);
-
-
-/* MakeScreenLikePixMap creates a pixmap mirroring the attributes of the
-	pixmap used to draw largest area of *globalRect on the screen */ 
-PixMapHandle MakeScreenLikePixMap(Rect *globalRect);
-
-
-/* KillPixMap disposes of a pixmap allocated by one of the
-	routines herein. */
-void KillPixMap(PixMapHandle pix);
-
-
-/* PixMapSize returns the number of bytes occupied by the pixmap. */
-long PixMapSize(PixMapHandle pix);
-
-
-/* SetPixMapPixel and GetPixMapPixel are for getting or setting
-	individual pixel values.  */
-
-void SetPixMapPixel(PixMapHandle pix, short h, short v, long value);
-long GetPixMapPixel(PixMapHandle pix, short h, short v);
-
-
-/* RotatePixRight creates a new pixmap containing the image
-	stored in the parameter pixmap rotated 90 degrees to the right.
-	The resulting pixmap is appropriately sized:  i.e. if the source
-	pixmap is 100 pixels wide and 200 pixels tall,  then the result
-	pixmap pointer will be 200 pixels wide and 100 pixels tall.  */
-	
-PixMapHandle RotatePixRight(PixMapHandle pix);
-
-
-/* RotatePixLeft creates a new pixmap containing the image stored in
-	the parameter bitmap pointer rotated 90 degrees to the left.  The
-	resulting pixmap is appropriately sized:  i.e. if the source pixmap
-	is 100 pixels wide and 200 pixels tall,  then the result pixmap
-	pointer will be 200 pixels wide and 100 pixels tall.   */
-	
-PixMapHandle RotatePixLeft(PixMapHandle pix);
-
-
-/* FlipPixVertical creates a new pixmap containing the image stored
-	in the parameter pixmap flipped upside down.  The resulting
-	pixmap will be the same size as the original image.  */
-	
-PixMapHandle FlipPixVertical(PixMapHandle pix);
-
-
-/* FlipPixHorizontal creates a new pixmap containing the image stored
-	in the parameter pixmap flipped horizontally. The resulting pixmap
-	will be the same size as the original image.  */
-	
-PixMapHandle FlipPixHorizontal(PixMapHandle pix);
-
-
-/* RotatePixMap creates a new pixmap containing the image from
-	the parameter pixmap rotated angle degrees about the center (cx, cy).
-	The resultant pixmap will have the same dimensions as the parameter
-	pixmap regardless of the angle specified. */
-	
-PixMapHandle RotatePixMap(PixMapHandle pix, short cx, short cy, float angle);
-
-
-/* DuplicatePixMap creates a copy of the pixmap parameter. */
-
-PixMapHandle DuplicatePixMap(PixMapHandle pix);
-
-
-/* PICTToBitMap creates a new pixmap the using the size information
-	provided in the QuickDraw picture pointer parameter and draws
-	the picture in the pixmap before returning the pixmap. */
-	
-PixMapHandle PICTToPixMap(PicHandle pic, CTabHandle clut);
-PixMapHandle PICTTo16BitPixMap(PicHandle pic);
-PixMapHandle PICTTo32BitPixMap(PicHandle pic);
-
-
-/* PixMapToPICT returns a QuickDraw picture that will draw the
-	image stored in the pixmap.  PixMapToPICT is the inverse
-	of PICTToPixMap. */
-	
-PicHandle PixMapToPICT(PixMapHandle pix);
-
-
-/* PixMapToCompressedPICT returns a QuickDraw picture that will draw the
-	image stored in the pixmap.  PixMapToCompressedPICT is the inverse
-	of PICTToPixMap. */
-	
-PicHandle PixMapToCompressedPICT(PixMapHandle pix);
-
-
-
-/* ROUTINES FOR DRAWING TO... */
-
-/* PixMapPort data structure managed by the routines NewBMP and
-	DisposeBMP.  You should never have to access the fields of this
-	record directly as it's all taken care of by NewBMP and DisposeBMP. */
-
-typedef struct {
-	//CGrafPort pport;		/* the grafport record for drawing into the pixmap */ // commented by Kekus Digital
-	CGrafPtr pport;		/* the grafport record for drawing into the pixmap */ // added by Kekus Digital
-	GDHandle pdevice;		/* gdevice for drawing into the pixmap */
-	GDHandle saved_device;	/* saved gdevice */
-	GrafPtr saved_port;		/* saved grafport for later restoration */
-	PixMapHandle pix;		/* the pixmap */
-} PixMapPort;
-
-
-/* NewBMP is called by the WithBitMap macro and you should never have to
-	call it directly yourself.  What it does is it locks the pixmap, saves the
-	original grafport, and creates a new grafport suitable for drawing into
-	the pixmap.  NewBMP should be followed by a call to DisposeBMP which
-	will restore the original grafport, unlock the pixmap, and dispose of the
-	new grafport. */
-	
-PixMapPort* NewPxMP(PixMapHandle pix);
-
-
-
-/* DisposePxMP unlocks the pixmap pointer passed to NewPxMP, deallocates
-	the grafport allocated for it, and restores the original grafport.
-	the macro WithBitMap calls this routine automatically and you will
-	not normally have to call it directly. */
-	
-void DisposePxMP(PixMapPort* px);
-
-
-
-/* WithPixMap is a macro facility that sets up the drawing environment
-	such that any drawing commands in the statement following the
-	macro instantiation will draw into the pixmap handle provided as
-	the first parameter.  The parameters are declared as follows:
-		PixMapHandle pix;
-		PixMapPort* pxmp; */
-	
-#define WithPixMap(pix, pxmp) \
-	for (pxmp = NewPxMP(pix); \
-		pxmp != NULL; \
-		DisposePxMP(pxmp), pxmp = NULL)
-
-
-
-
-/* ROUTINES FOR DRAWING FROM... */
-
-/* PlotPixMap provides a simple interface for drawing a pixmap in
-	the current grafport.  The pixmap is drawn with the top left corner
-	aligned with the point (h,v) using the indicated transfer mode. */
-
-void PlotPixMap(PixMapHandle pix, short h, short v, short mode);
-
-
-/* PixMapCopy copies bits from the pixmap to the current port
-	from the src rectangle to the destination using the indicated
-	copy mode. */
-
-void PixMapCopy(PixMapHandle pix, Rect *src, Rect *dst, short mode);
-
-
-/* PixMap2PixPat converts a pixmap to a pixel pattern resource.  The
-	pixmap's dimensions should be some power of two
-	(i.e. 8, 16, 32, 64, or 128). */
-
-PixPatHandle PixMap2PixPat(PixMapHandle pix, Pattern *the_pattern);
-
-
-/* CalcPixMapColours calculates a colour table for the colours
-	used in the pixmap.  For indexed images, CalcPixMapColours returns
-	a copy of the pixmap's colour table, otherwise, for direct
-	images, it calls GetPixMapInfo. */
-
-CTabHandle CalcPixMapColours(PixMapHandle pix);
-
-
-#ifdef __cplusplus
-};
-#endif
-
-#endif
-
-/* end of File PixMap.h */
-
-
-
-

Deleted: trunk/libpano/README.mac
===================================================================
--- trunk/libpano/README.mac	2009-02-01 17:37:06 UTC (rev 926)
+++ trunk/libpano/README.mac	2009-02-01 17:59:30 UTC (rev 927)
@@ -1,81 +0,0 @@
-Readme Sources
-
-This file describes how to build the library pano13.lib
-for the Macintosh operating system. This library is required
-for running the Panorama Tools plug-in and any of the
-Panorama Tools applications (PTStitcher, etc). 
-
-Legal Issues:
-
-This software is distributed under GNU-license, see the
-file COPYING for details. Some parts of the software
-are derived from other sources, which are distributed under
-different copyrights. These are:
-(1) The JPEG-library distributed by the Independent JPEG group.
-This package contains a precompiled binary of the JPEG
-library and the header files required for compilation
-in the folder Sources/libs/. The legal terms for using the
-JPEG library can be found in the file /copyright/README_JPEG.
-(2) The PNG-library written by G.E.Schalnat et al.
-This package contains a precompiled binary of the PNG
-library and the header files required for compilation
-in the folder Sources/libs/. The legal terms for using the
-PNG library can be found in the file Sources/libs/png.h
-(3) The TIFF-library by Sam Leffler/ Silicon Graphics Inc.
-This package contains a precompiled binary of the TIFF
-library and the header files required for compilation
-in the folder Sources/libs/. The legal terms for using the
-TIFF library can be found in the file /copyright/README_TIFF.
-(4) The ZLIB-library by Jean-loup Gailly and Mark Adler.
-This package contains a precompiled binary of the ZLIB
-library and the header files required for compilation
-in the folder Sources/libs/. The legal terms for using the
-ZLIB library can be found in the file zlib.h.
-(5) The public domain Levenberg-Marquardt solver 
-of the Argonne National Laboratories MINPACK mathematical library,
-C translation by Steve Moshier (file lmdif.c).
-(6) Fast fourier transformation, code by:
-RC Singleton, Stanford Research Institute, Sept. 1968
-Copyright MJ Olesen, Queen's University at Kingston, 1995-97.
-See the file fftn.c for details.
-(7) PixMap-manipulation routines by John Montbriand. See
-the file PixMap.h for the copyright notice.
-
-
-Requirements:
-
-A working MPW installation (Macintosh Programmers Workshop)
-is required to build  the library. MPW is free and can be
-downloaded from http://www.apple.com.
-
-The Java Development MRJ is required. It is also free
-and can be downloaded from http://www.apple.com.
-During the build of pano13.lib the java include
-files have to be accessed by the MRC-compiler.
-
-
-Building the Library:
-
-The source files of this distribution have to be unpacked.
-Open the Makefile (folder 'src') using MPW, and edit path settings
-for your system (eg the path to your MRJ-installation).
-In the directory 'src' issue the command 'Build pano13.lib'.
-There will be a couple of warning
-messages which are non-fatal and can be ignored.
-
-Limits and Modifications:
-
-This distribution of the sources limits processing
-of fisheye images to fields of view smaller than
-160 degrees. This limit is controlled by the constant
-MAX_FISHEYE_FOV in the file filter.h. There
-is some controversy regarding the legality of processing
-hemispherical images (ie images having 180 degree field
-of view) in connection with virtual reality panoramas.
-If your application of fisheye lenses is not prohibited
-by patents, you can build and use your own unlimited version 
-of the library by changing the source code.
-
-Helmut Dersch
-der@...
-

Deleted: trunk/libpano/makefile.mac
===================================================================
--- trunk/libpano/makefile.mac	2009-02-01 17:37:06 UTC (rev 926)
+++ trunk/libpano/makefile.mac	2009-02-01 17:59:30 UTC (rev 927)
@@ -1,100 +0,0 @@
-#   Panorama_Tools	-	Generate, Edit and Convert Panoramic Images
-#   Copyright (C) 1998,1999 - Helmut Dersch  der@...
-#   
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2, or (at your option)
-#   any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
-#
-# 
-
-#############################################################################
-
-#   All functional code and resources are located in pano13.lib
-#   The code in the filters only translates the 68k-code-resource call
-#   from GraphicConverter into a call to the ppc-entry function 
-#   "filter_main" with an appropriate selector value.
-
-#############################################################################
-
-#        --------------   Definitions  -------------------------
-
-Lib_Exports		=		pano13.x
-
-PPCInc			=		panorama.h filter.h fftn.h f2c.h PixMap.h pteditor.h  \xB6
-						ptutils.h sys_mac.h version.h
-
-PPCSrc			= 		filter.c parser.c queryfeature.c sys_mac.c  correct.c perspect.c \xB6
-                        adjust.c  remap.c lmdif.c  file.c \xB6
-						math.c pan.c PTDialogs.c fftn.c fourier.c resample.c \xB6
-						shell_mac.c optimize.c morpher.c Triangulate.c png.c	\xB6
-						seamer.c ptpicker.c pteditor.c seamer_.c	\xB6
-						tiff.c pict.c jpeg.c PixMap.c
-
-OtherSrc		=		filter.r Gimpmain.c bmp.c pano13.x libpano13.def ppm.c resource.h \xB6
-						sys_X11.c sys_X11.h sys_win.c sys_win.h sys_ansi.h sys_ansi.c \xB6
-						
-
-
-PPCObjs 		= 		filter.x.o parser.x.o queryfeature.x.o sys_mac.x.o  correct.x.o perspect.x.o \xB6
-                        adjust.x.o  remap.x.o lmdif.x.o  file.x.o \xB6
-						math.x.o pan.x.o PTDialogs.x.o fftn.x.o fourier.x.o resample.x.o \xB6
-						shell_mac.x.o optimize.x.o morpher.x.o Triangulate.x.o png.x.o	\xB6
-						seamer.x.o ptpicker.x.o pteditor.x.o tiff.x.o pict.x.o jpeg.x.o PixMap.x.o
-						
-FORMAT_LIBS 	= 		::jpeg-6:libjpeg.a				\xB6
-						::tiff-v3.4:libtiff:libtiff.o	\xB6
-						::libpng-0.89c:libpng.a			\xB6
-						"{SharedLibraries}"QuickTimeLib 
-
-
-						
-PPC_Libraries 	=	 	"{SharedLibraries}"InterfaceLib	\xB6
-						"{SharedLibraries}"StdCLib		\xB6
-						"{PPCLibraries}"StdCRuntime.o	\xB6
-						"{PPCLibraries}"PPCCRuntime.o	\xB6
-						"{SharedLibraries}"MathLib		\xB6
-						"{SharedLibraries}"ColorSyncLib \xB6
-						"{PPCLibraries}"MrCPlusLib.o	\xB6
-						"{SharedLibraries}"JNILib		\xB6
-						{FORMAT_LIBS}					
-
-				 
-##############################################################################
-
-#         --------------   Build Rules  -------------------------
-
-.x.o \xC4 .c
-	MrC -d Macintosh -align mac68k -i ::jpeg-6 -i ::tiff-v3.4:libtiff -i ::libpng-0.89c -i :: -i ::libpng-0.89c:zlib-1.0.4 {default}.c -o {default}.x.o 
-
-#	MrC -d Macintosh  {default}.c -o {default}.x.o 
-
-
-# This shared library contains all functional code and resources
-
-pano13.lib \xC4\xC4 {PPCObjs}  filter.r Makefile {Lib_Exports} {PPC_Libraries}
-	PPCLink -xm s -init __my_initialize -term __my_terminate \xB6
-	-export  `ConvertExportList {Lib_Exports}`	\xB6
-	{PPCObjs}	{PPC_Libraries}  -o {targ}					# Create library 
-	MergeFragment -n pano13.lib -c -t pwpc -x {targ}  	    # use MergeFragment to create a library cfrg
-	Rez  -d SystemSevenOrLater=1 -a filter.r -o {Targ}      # Stuff all resources into library
-	setfile -c '????' -t 'shlb' {Targ}
-
-
-Backup  \xC4
-	Duplicate -y Makefile {PPCInc}  {PPCSrc} {OtherSrc} :Backup:
-
-
-clean	\xC4
-	Delete {PPCObjs} pano13.lib
-
-

Deleted: trunk/libpano/pict.c
===================================================================
--- trunk/libpano/pict.c	2009-02-01 17:37:06 UTC (rev 926)
+++ trunk/libpano/pict.c	2009-02-01 17:59:30 UTC (rev 927)
@@ -1,490 +0,0 @@
-/*#include <Gestalt.h> //commented by Kekus Digital
-#include "filter.h"
-
-#include <FixMath.h>
-#include <ImageCompression.h>
-#include <Movies.h>
-#include <QuickTimeComponents.h>
-#include <StandardFile.h>
-#include <PictUtils.h>
-#include <Memory.h>
-#include <OSUtils.h>
-#include <ToolUtils.h>
-#include <Math.h>
-#include <Gestalt.h>
-#include <ImageCompression.h>*/ // till here
-#include "PixMap.h"
-#include <carbon/carbon.h> //added by Kekus Digital
-#include <QuickTime/QuickTimeComponents.h>
-#include <QuickTime/ImageCompression.h> // till here
-
-#include <String.h>
-#include "filter.h"
-#include <stdio.h>
-
-#include "jpeglib.h"
-
-
-static void 		FSpWritePicture (const FSSpec *spec, PicHandle pictData); 
-static 	PicHandle 	FSpReadPicture 	(const FSSpec *spec) ;
-static 	PicHandle 	ImageToPICT		(Image *im) ;
-static 	int 		PICTtoImage		( Image *im, PicHandle pic );
-static  int 		qtimporter( Image *im, fullPath *sfile );
-
-int writePICT			( Image *im, fullPath *sfile );
-int readPICT			( Image *im, fullPath *sfile );
-int readJPEG( Image *im, fullPath *sfile );
-int readTIFF( Image *im, fullPath *sfile );
-
-					
-
-int writePICT( Image *im, fullPath *sfile )
-{
-	PicHandle 		pic = NULL;
-
-	TwoToOneByte( im ); // Pict doesn't support 16bit channels
-	
-	pic = ImageToPICT( im );
-	if( pic == NULL )
-	{
-		PrintError("Could not create Picture");
-		return -1;
-	}
-	FSpWritePicture ( sfile, pic);
-	KillPicture(pic);
-	
-	return 0;
-}
-
-int readPICT ( Image *im, fullPath *sfile )
-{
-	PicHandle 		pic = NULL;
-	int result = 0;
-
-	pic = FSpReadPicture (sfile);
-	if( pic == NULL )
-	{
-		PrintError("Could not read Picture");
-		return -1;
-	}
-
-	if( PICTtoImage	( im, pic ) != 0)
-	{ 
-		PrintError("Could not convert Picture");
-		result = -1;
-	}
-
-	KillPicture(pic);
-	return result;
-}
-	
-
-
-static void FSpWritePicture (const FSSpec *spec, PicHandle pictData) 
-{
-	short fRefNum;
-	long zeroData = 0L, zeroDataLen, pictLength;
-	int i;
-	
-//	FSpCreate(spec, 'GKON', 'PICT', smSystemScript);
-	FSpOpenDF(spec, fsWrPerm, &fRefNum);
-	
-	zeroDataLen = sizeof(long);
-	for (i = 0; i < 512 / zeroDataLen; i++) 
-		FSWrite(fRefNum, &zeroDataLen, &zeroData);
-		
-	pictLength = GetHandleSize((Handle)pictData);
-	HLock((Handle)pictData);
-	FSWrite(fRefNum, &pictLength, *pictData);
-	HUnlock((Handle)pictData);
-	
-	FSClose(fRefNum);
-}
-
-
-
-static PicHandle FSpReadPicture (const FSSpec *spec) 
-{
-	PicHandle	pictData;
-	short		fRefNum;
-	long		fileSize, pictLength;
-
-	FSpOpenDF(spec, fsRdPerm, &fRefNum);
-	GetEOF(fRefNum, &fileSize);
-	SetFPos(fRefNum, fsFromStart, 512);
-	
-	pictLength = fileSize - 512;
-	pictData = (PicHandle)NewHandle(pictLength);
-	if( pictData != nil )
-	{
-		HLock((Handle)pictData);
-		FSRead(fRefNum, &pictLength, *pictData);
-		HUnlock((Handle)pictData);
-	}
-	FSClose(fRefNum);
-	
-	return(pictData);
-}
-
-static PicHandle ImageToPICT(Image *im) 
-{
-	GrafPtr saved;
-	//CGrafPort port;//commented by Kekus Digital
-	CGrafPtr port;//added by Kekus Digital
-	Rect bounds;
-	PixMapHandle 	pix = NULL;
-	PicHandle 	pic = NULL;
-	
-	long row_bytes;
-	Ptr raster_data;
-	long bytecount, response;
-	CTabHandle colours;
-	PixMapPtr pixptr;
-	unsigned char *rowptr;
-	unsigned long *pixelptr;
-	short y, x;
-
-		/* is it possible? */
-	if (Gestalt(gestaltQuickdrawVersion, &response) != noErr) response = 0;
-	if (response < gestalt32BitQD) return NULL;
-
-		/* set up initial values for locals */
-	row_bytes = ((32 * ((long) im->width) + 31) >> 5) << 2;
-	if( row_bytes != im->bytesPerLine )
-	{
-		PrintError("Alignment problem: Rowbytes != bytesPerLine");
-		return NULL;
-	}
-	bytecount 	= row_bytes * ((long) im->height);
-	colours 	= NULL;
-	raster_data = NULL;
-	
-		/* check for valid rowbytes */
-	if (row_bytes > 0x00003FFF) goto bail;
-
-		/* allocate the raster data */
-	raster_data = (Ptr)*(im->data);
-	rowptr = (unsigned char *) raster_data;
-	for (y=0; y< im->height; y++, rowptr += row_bytes)
-		for (pixelptr = (unsigned long *) rowptr, x=0; x<im->width; x++)
-			*pixelptr++ &= 0x00FFFFFF;
-
-		/* dummy colour table */
-	colours = (CTabHandle) NewHandleClear(8);
-	if (colours == NULL) goto bail;
-	(*colours)->ctSeed = 24;
-	(*colours)->ctSize = -1;
-
-		/* create the pixmap handle */
-	pix = (PixMapHandle) NewHandleClear(sizeof(PixMap));
-	if (pix == NULL) goto bail;
-	
-		/* set up the pixmap fields */
-	HLock((Handle) pix);
-	pixptr = *pix;
-	pixptr->baseAddr = raster_data;
-	pixptr->rowBytes = (row_bytes | 0x8000);
-	pixptr->bounds.right = im->width;
-	pixptr->bounds.bottom = im->height;
-	pixptr->hRes = 0x00480000; /* resolution = 72 dots per inch */
-	pixptr->vRes = 0x00480000;
-	pixptr->pixelSize = 32;
-	pixptr->pixelType = RGBDirect;
-	pixptr->cmpCount = 3;
-	pixptr->cmpSize = 8;
-	pixptr->pmTable = colours;
-
-	bounds = (*pix)->bounds;
-	GetPort(&saved);
-	//OpenCPort(&port);//commented by Kekus Digital
-        port = CreateNewPort();//added by Kekus Digital
-	pic = OpenPicture(&bounds);
-	ClipRect(&bounds);
-	PlotPixMap(pix, 0, 0, srcCopy);
-	ClosePicture();
-	SetPort(saved);
-	//ClosePort((GrafPtr) &port);//commented by Kekus Digital
-        DisposePort(port);//added by Kekus Digital
-	if (GetHandleSize((Handle) pic) == sizeof(Picture)) {
-		KillPicture(pic);
-		pic = NULL;
-	}
-bail:
-	if (pix != NULL) DisposeHandle((Handle) pix);
-	if (colours != NULL) DisposeHandle((Handle) colours);
-	return pic;
-}
-
-
-static int PICTtoImage( Image *im, PicHandle pic )
-{
-	Rect bounds;
-	PixMapHandle pix = NULL;
-	PixMapPort *pxmp;
-	PictInfo pInfo;
-
-	long row_bytes;
-	Ptr raster_data;
-	Handle hdl_raster_data = NULL;
-	long bytecount, response;
-	CTabHandle colours;
-	PixMapPtr pixptr;
-	unsigned char *rowptr;
-	unsigned long *pixelptr;
-	short y, x;
-
-
-	if( GetPictInfo( pic, &pInfo, recordComments, (short) 0,systemMethod,(short) 0 ) != noErr	)
-	{
-		PrintError("Could not get Pict-info");
-		return -1;
-	}
-
-	bounds = pInfo.sourceRect; //(*pic)->picFrame;
-	OffsetRect(&bounds, -bounds.left, -bounds.top);
-
-		/* is it possible? */
-	if (Gestalt(gestaltQuickdrawVersion, &response) != noErr) response = 0;
-	if (response < gestalt32BitQD) return -1;
-
-		/* set up initial values for locals */
-	row_bytes = ((32 * ((long) bounds.right) + 31) >> 5) << 2;
-	bytecount = row_bytes * ((long) bounds.bottom);
-	colours 	= NULL;
-	raster_data = NULL;
-	
-		/* check for valid rowbytes */
-	if (row_bytes > 0x00003FFF) return -1;
-
-		/* allocate the raster data */
-	hdl_raster_data=NewHandle(bytecount);
-	if (hdl_raster_data == NULL)
-	{
-		PrintError("Not enough memory to load picture");
-		return -1;
-	}
-	HLock(hdl_raster_data);
-
-	raster_data = *hdl_raster_data;
-	rowptr = (unsigned char *) raster_data;
-	for (y=0; y< bounds.bottom; y++, rowptr += row_bytes)
-		for (pixelptr = (unsigned long *) rowptr, x=0; x<bounds.right; x++)
-			*pixelptr++ = 0x00FFFFFF;
-
-		/* dummy colour table */
-	colours = (CTabHandle) NewHandleClear(8);
-	if( colours == NULL) return -1;
-
-	(*colours)->ctSeed = 24;
-	(*colours)->ctSize = -1;
-
-		/* create the pixmap handle */
-	pix = (PixMapHandle) NewHandleClear(sizeof(PixMap));
-	if (pix == NULL) return -1;
-	
-		/* set up the pixmap fields */
-	HLock((Handle)pix);
-	pixptr = *pix;
-	pixptr->baseAddr = raster_data;
-	pixptr->rowBytes = (row_bytes | 0x8000);
-	pixptr->bounds.right = bounds.right;
-	pixptr->bounds.bottom = bounds.bottom;
-	pixptr->hRes = pInfo.hRes; // 0x00480000; /* resolution = 72 dots per inch */
-	pixptr->vRes = pInfo.vRes; // 0x00480000;
-	pixptr->pixelSize = 32;
-	pixptr->pixelType = RGBDirect;
-	pixptr->cmpCount = 3;
-	pixptr->cmpSize = 8;
-	pixptr->pmTable = colours;
-
-
-	WithPixMap(pix, pxmp) 
-	{
-			DrawPicture(pic, &bounds);
-	}
-
-
-	SetImageDefaults( im );
-
-	
-	im->width 	= (*pix)->bounds.right;
-	im->height 	= (*pix)->bounds.bottom;
-	im->bitsPerPixel = 32;
-	im->bytesPerLine = ((32 * ((long) im->width) + 31) >> 5) << 2;
-	im->dataSize = im->bytesPerLine * im->height;
-	im->data = (unsigned char**) hdl_raster_data;
-	
-	// Set alpha channel
-	
-	LOOP_IMAGE( im, *idata = UCHAR_MAX );
-	
-	if ((*pix)->pmTable != NULL) 	DisposeHandle((Handle) (*pix)->pmTable);
-	HUnlock( (Handle)pix );
-	if (pix != NULL) 				DisposeHandle((Handle) pix);
-	
-	if( pInfo.thePalette != NULL ) 		DisposeHandle((Handle)  pInfo.thePalette);
-	if( pInfo.theColorTable != NULL ) 	DisposeHandle((Handle)  pInfo.theColorTable);
-	if( pInfo.commentHandle != NULL ) 	DisposeHandle((Handle)  pInfo.commentHandle);
-	if( pInfo.fontHandle != NULL ) 		DisposeHandle((Handle)  pInfo.fontHandle);
-	if( pInfo.fontNamesHandle != NULL ) DisposeHandle((Handle)  pInfo.fontNamesHandle);
-	
-	return 0;
-}
-
-
-
-
-
-#ifdef __DONOTCOMPILE__
-
-These functions should no longer be used.. ready to be deleted. see file.c
-
-int readImage( Image *im, fullPath *sfile )
-{
-	FileInfo fInfo;
-	char ext[5], *ex;
-	int i;
-
-	// Get file info	
-	FSpGetFInfo	(sfile, (FInfo*)&fInfo );
-	
-	// Get extension
-	ext[0] = 0;
-	p2cstr(sfile->name);
-	ex = strrchr( (char*)sfile->name, '.' );
-	if( ex != NULL && strlen(ex) < 6 )
-		strcpy( ext, ex+1 );
-	c2pstr((char*)sfile->name);
-	for(i=0; i<strlen(ext); i++)
-		ext[i] = tolower(ext[i]);
-
-	// read image depending on type
-
-	if		( fInfo.fileType == 'PICT' || strcmp( ext, "pict" ) == 0 )
-		return readPICT	( im, sfile );
-	else if	( fInfo.fileType == 'JPEG' || strcmp( ext, "jpg" ) == 0 )
-		 return readJPEG	( im, sfile );
-	else if	( fInfo.fileType == 'PNGf' || strcmp( ext, "png" ) == 0 )
-		 return readPNG	( im, sfile );
-	else if	( fInfo.fileType == 'TIFF' || strcmp( ext, "tif" ) == 0 || strcmp( ext, "tiff" ) == 0)
-		 return readTIFF( im, sfile );
-	else
-		return qtimporter	( im, sfile );
-
-	return -1;
-}
-
-static int qtimporter( Image *im, fullPath *sfile )
-{
-	GraphicsImportComponent		gImporter  = NULL;
-	OSErr						myErr 	   = noErr;
-	Rect						myRect;
-	GWorldPtr					myGWorld;
-	PixMapHandle				myPixMap;
-	
-	myErr = GetGraphicsImporterForFile( sfile, &gImporter);
-	
-	if(myErr != noErr)
-	{
-		PrintError("Could not get GraphicImporter for this file");
-		return -1;
-	}
-
-	myErr = GraphicsImportGetNaturalBounds(gImporter, &myRect);
-	if(myErr != noErr)
-	{
-		PrintError("Could not get GraphicImporter for this file");
-		return -1;
-	}
-
-	myErr = NewGWorld(&myGWorld, 0, &myRect, NULL, NULL, 0);
-	if (myErr != noErr) {
-		PrintError("Not enough Memory to read image");
-		return -1;
-	}
-	myErr = GraphicsImportSetGWorld(gImporter, (CGrafPtr)myGWorld, NULL);
-	if( myErr != noErr){
-		PrintError("Error setting GWorld");
-		return -1;
-	}
-	myErr = GraphicsImportDraw(gImporter);
-	if( myErr != noErr){
-		PrintError("Error Drawing to GWorld");
-		return -1;
-	}
-		
-	OffsetRect(&myRect, -myRect.left, -myRect.top);
-
-	SetImageDefaults( im );
-	
-	myPixMap = GetGWorldPixMap(myGWorld);
-	
-	LockPixels(myPixMap);
-	
-	if( (*myPixMap)->pixelSize != 32 ||
-		(*myPixMap)->pixelType != RGBDirect )
-	{
-		PrintError("Only 24bit rgb formats supported");
-		return -1;
-	}
-	
-	im->width 			= (*myPixMap)->bounds.right;
-	im->height 			= (*myPixMap)->bounds.bottom;
-	im->bitsPerPixel 	= 32;
-	
-	im->bytesPerLine 	= (*myPixMap)->rowBytes & 0x7FFF;
-	im->dataSize 		= im->bytesPerLine * im->height;
-	im->data 			= (unsigned char**)mymalloc( im->dataSize );
-	if( im->data 		== NULL )
-	{
-		PrintError("Not enough memory to load image");
-		return -1;
-	}
-	memcpy( *im->data, (*myPixMap)->baseAddr, im->dataSize );		
-	UnlockPixels( myPixMap);
-
-	if (gImporter != NULL)
-		CloseComponent(gImporter);
-		
-	DisposeGWorld( myGWorld );
-	
-	// Set alpha channel
-	
-	//LOOP_IMAGE( im, *idata = 0xff )
-	
-	return 0;
-}
-
-
-
-int writeImage( Image *im, fullPath *sfile )
-{
-	return writePICT( im, sfile );
-}
-
-
-int makeTempPath( fullPath *path )
-{
-	file_spec fnum;
-	static int try = 0;
-	int i;
-	
-	try++;
-	
-	for(i=0; i < MAX_TEMP_TRY; try++,i++)
-	{
-		
-		sprintf( (char*)path->name, "_PTStitcher_tmp_%6d", try );
-		c2pstr( (char*)path->name );
-		if( myopen( path, read_bin, fnum ))
-			break;
-		myclose( fnum );
-	}
-	if( try < MAX_TEMP_TRY )
-		return 0;
-	else
-		return -1;
-	
-}
-
-#endif


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

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

From: <brunopostle@us...> - 2009-02-01 21:18

Revision: 928
          http://panotools.svn.sourceforge.net/panotools/?rev=928&view=rev
Author:   brunopostle
Date:     2009-02-01 21:18:32 +0000 (Sun, 01 Feb 2009)

Log Message:
-----------
Don't ship .svn dirs in tarball bug #1861174 (Cyril Brulebois)

Modified Paths:
--------------
    trunk/libpano/configure.ac
    trunk/libpano/tests/simpleStitch/Makefile.am
    trunk/libpano/tests/simpleTiff16/Makefile.am

Added Paths:
-----------
    trunk/libpano/tests/simpleStitch/reference/Makefile.am
    trunk/libpano/tests/simpleTiff16/reference/Makefile.am

Modified: trunk/libpano/configure.ac
===================================================================
--- trunk/libpano/configure.ac	2009-02-01 17:59:30 UTC (rev 927)
+++ trunk/libpano/configure.ac	2009-02-01 21:18:32 UTC (rev 928)
@@ -142,7 +142,7 @@
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([floor memset pow setlocale sqrt strrchr])
 
-AC_CONFIG_FILES([Makefile build/Makefile build/win32/Makefile doc/Makefile m4/Makefile tools/Makefile tests/Makefile tests/simpleStitch/Makefile tests/simpleTiff16/Makefile])
+AC_CONFIG_FILES([Makefile build/Makefile build/win32/Makefile doc/Makefile m4/Makefile tools/Makefile tests/Makefile tests/simpleStitch/Makefile tests/simpleTiff16/Makefile tests/simpleStitch/reference/Makefile tests/simpleTiff16/reference/Makefile ])
 
 AC_SUBST(ac_aux_dir)
 

Modified: trunk/libpano/tests/simpleStitch/Makefile.am
===================================================================
--- trunk/libpano/tests/simpleStitch/Makefile.am	2009-02-01 17:59:30 UTC (rev 927)
+++ trunk/libpano/tests/simpleStitch/Makefile.am	2009-02-01 21:18:32 UTC (rev 928)
@@ -1,9 +1,11 @@
-EXTRA_DIST = reference 051221_6054_750.jpg 051221_6055_750.jpg \
+EXTRA_DIST = 051221_6054_750.jpg 051221_6055_750.jpg \
              ChangeLog README.txt simple.pto simple.txt
 
 MAINTAINERCLEANFILES = \
 	Makefile.in
 
+SUBDIRS = reference
+
 all:
 
 check: test

Added: trunk/libpano/tests/simpleStitch/reference/Makefile.am
===================================================================
--- trunk/libpano/tests/simpleStitch/reference/Makefile.am	                        (rev 0)
+++ trunk/libpano/tests/simpleStitch/reference/Makefile.am	2009-02-01 21:18:32 UTC (rev 928)
@@ -0,0 +1,12 @@
+EXTRA_DIST = jpeg.jpg psd_mask.psd psd_no_mask.psd psd.psd tiff_deflate.tif \
+	tiff_lzw.tif tiff_m0000.tif tiff_m0001.tif tiff_mask0000.tif tiff_mask0001.tif \
+	tiff_m_cropped0000.tif tiff_m_cropped0001.tif tiff_none.tif
+
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
+all:
+check: test
+test:
+verify:
+clean:

Modified: trunk/libpano/tests/simpleTiff16/Makefile.am
===================================================================
--- trunk/libpano/tests/simpleTiff16/Makefile.am	2009-02-01 17:59:30 UTC (rev 927)
+++ trunk/libpano/tests/simpleTiff16/Makefile.am	2009-02-01 21:18:32 UTC (rev 928)
@@ -1,6 +1,8 @@
-EXTRA_DIST = reference 060520_3398.TIF \
+EXTRA_DIST = 060520_3398.TIF \
              ChangeLog simple.txt
 
+SUBDIRS = reference
+
 MAINTAINERCLEANFILES = \
 	Makefile.in
 

Added: trunk/libpano/tests/simpleTiff16/reference/Makefile.am
===================================================================
--- trunk/libpano/tests/simpleTiff16/reference/Makefile.am	                        (rev 0)
+++ trunk/libpano/tests/simpleTiff16/reference/Makefile.am	2009-02-01 21:18:32 UTC (rev 928)
@@ -0,0 +1,12 @@
+EXTRA_DIST = jpeg.jpg psd_mask.psd psd_no_mask.psd psd.psd tiff_deflate.tif \
+	tiff_lzw.tif tiff_m0000.tif tiff_mask0000.tif tiff_m_cropped0000.tif \
+	tiff_none.tif
+
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
+all:
+check: test
+test:
+verify:
+clean:


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

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

From: <brunopostle@us...> - 2009-02-01 22:48

Revision: 929
          http://panotools.svn.sourceforge.net/panotools/?rev=929&view=rev
Author:   brunopostle
Date:     2009-02-01 22:48:03 +0000 (Sun, 01 Feb 2009)

Log Message:
-----------
add missing manpages bug #1877534 (Cyril Brulebois)

Modified Paths:
--------------
    trunk/libpano/Makefile.am
    trunk/libpano/configure.ac

Added Paths:
-----------
    trunk/libpano/man/
    trunk/libpano/man/Makefile.am
    trunk/libpano/man/PTblender.1
    trunk/libpano/man/PTblender.pod
    trunk/libpano/man/PTcrop.1
    trunk/libpano/man/PTcrop.pod
    trunk/libpano/man/PTinfo.1
    trunk/libpano/man/PTinfo.pod
    trunk/libpano/man/PTmasker.1
    trunk/libpano/man/PTmasker.pod
    trunk/libpano/man/PTmender.1
    trunk/libpano/man/PTmender.pod
    trunk/libpano/man/PToptimizer.1
    trunk/libpano/man/PToptimizer.pod
    trunk/libpano/man/PTroller.1
    trunk/libpano/man/PTroller.pod
    trunk/libpano/man/PTtiff2psd.1
    trunk/libpano/man/PTtiff2psd.pod
    trunk/libpano/man/PTtiffdump.1
    trunk/libpano/man/PTtiffdump.pod
    trunk/libpano/man/PTuncrop.1
    trunk/libpano/man/PTuncrop.pod
    trunk/libpano/man/panoinfo.1
    trunk/libpano/man/panoinfo.pod

Modified: trunk/libpano/Makefile.am
===================================================================
--- trunk/libpano/Makefile.am	2009-02-01 21:18:32 UTC (rev 928)
+++ trunk/libpano/Makefile.am	2009-02-01 22:48:03 UTC (rev 929)
@@ -94,7 +94,7 @@
 
 noinst_HEADERS = $(INTERNAL_HDR) $(SYS_HDR) $(MAC_HDR)
 
-SUBDIRS=m4 . tools doc build tests
+SUBDIRS=m4 . tools doc build tests man
 
 distdir=lib$(PACKAGE)-$(VERSION)
 

Modified: trunk/libpano/configure.ac
===================================================================
--- trunk/libpano/configure.ac	2009-02-01 21:18:32 UTC (rev 928)
+++ trunk/libpano/configure.ac	2009-02-01 22:48:03 UTC (rev 929)
@@ -142,7 +142,7 @@
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([floor memset pow setlocale sqrt strrchr])
 
-AC_CONFIG_FILES([Makefile build/Makefile build/win32/Makefile doc/Makefile m4/Makefile tools/Makefile tests/Makefile tests/simpleStitch/Makefile tests/simpleTiff16/Makefile tests/simpleStitch/reference/Makefile tests/simpleTiff16/reference/Makefile ])
+AC_CONFIG_FILES([Makefile build/Makefile build/win32/Makefile doc/Makefile m4/Makefile tools/Makefile tests/Makefile tests/simpleStitch/Makefile tests/simpleTiff16/Makefile tests/simpleStitch/reference/Makefile tests/simpleTiff16/reference/Makefile man/Makefile])
 
 AC_SUBST(ac_aux_dir)
 

Added: trunk/libpano/man/Makefile.am
===================================================================
--- trunk/libpano/man/Makefile.am	                        (rev 0)
+++ trunk/libpano/man/Makefile.am	2009-02-01 22:48:03 UTC (rev 929)
@@ -0,0 +1,14 @@
+man_MANS = panoinfo.1 PTblender.1 PTcrop.1 PTinfo.1 PTmasker.1 PTmender.1 PToptimizer.1 PTroller.1 PTtiff2psd.1 PTtiffdump.1 PTuncrop.1
+
+PACKAGE = 'LIBPANO13 TOOLS'
+
+EXTRA_DIST = panoinfo.pod PTblender.pod PTcrop.pod PTinfo.pod PTmasker.pod \
+	PTmender.pod PToptimizer.pod PTroller.pod PTtiff2psd.pod PTtiffdump.pod \
+	PTuncrop.pod $(man_MANS)
+
+%.1: %.pod
+	pod2man --center $(PACKAGE) --release $(PACKAGE_VERSION) $< $@
+
+install-data-local: install-man
+	for f in $(man_MANS); do chmod a+r $(DESTDIR)$(mandir)/*/$$f; done
+

Added: trunk/libpano/man/PTblender.1
===================================================================
--- trunk/libpano/man/PTblender.1	                        (rev 0)
+++ trunk/libpano/man/PTblender.1	2009-02-01 22:48:03 UTC (rev 929)
@@ -0,0 +1,184 @@
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.14
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sh \" Subsection heading
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  | will give a
+.\" real vertical bar.  \*(C+ will give a nicer C++.  Capital omega is used to
+.\" do unbreakable dashes and therefore won't be available.  \*(C` and \*(C'
+.\" expand to `' in nroff, nothing in troff, for use with C<>.
+.tr \(*W-|\(bv\*(Tr
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` ""
+.    ds C' ""
+'br\}
+.el\{\
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
+'br\}
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.if \nF \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
+..
+.    nr % 0
+.    rr F
+.\}
+.\"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.hy 0
+.if n .na
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+.    \" fudge factors for nroff and troff
+.if n \{\
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
+.\}
+.if t \{\
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
+.\}
+.    \" simple accents for nroff and troff
+.if n \{\
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
+.\}
+.if t \{\
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+.    \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.    \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.    \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "PTBLENDER 1"
+.TH PTBLENDER 1 "2008-01-22" "2.9.12" "LIBPANO13 TOOLS"
+.SH "NAME"
+PTblender \- Colour and brightness correction of panoramas
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+\&\fBPTblender\fR [options] \fItiff_file(s)\fR
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+\&\fBPTblender\fR is a command-line tool that only implements the colour
+and brightness correction functionality of \fBPTmender\fR.
+.SH "OPTIONS"
+.IX Header "OPTIONS"
+.IP "\fB\-p\fR \fIprefix\fR" 4
+.IX Item "-p prefix"
+Prefix for output filename. Defaults to \fIblended%4d\fR.
+.IP "\fB\-k\fR \fIindex\fR" 4
+.IX Item "-k index"
+Index of the image to use as a reference (0\-based, defaults to 0).
+.IP "\fB\-t\fR \fI[0,1,2]\fR" 4
+.IX Item "-t [0,1,2]"
+Type of colour correction: 0 full (default), 1 brightness only, 2
+colour only.
+.IP "\fB\-c\fR" 4
+.IX Item "-c"
+Output curves smooth (output one per each corrected file).
+.IP "\fB\-m\fR" 4
+.IX Item "-m"
+Output curves arbitrary map (output one per each corrected file).
+.IP "\fB\-f\fR" 4
+.IX Item "-f"
+Force processing (ignore warnings).
+.IP "\fB\-x\fR" 4
+.IX Item "-x"
+Delete source files (use with care).
+.IP "\fB\-q\fR" 4
+.IX Item "-q"
+Quiet run.
+.IP "\fB\-h\fR" 4
+.IX Item "-h"
+Output help summary.
+.SH "SEE ALSO"
+.IX Header "SEE ALSO"
+<http://wiki.panotools.org/PTblender>, \fIPTmender\fR\|(1)
+.SH "AUTHORS"
+.IX Header "AUTHORS"
+Panorama Tools was originally created by Professor Helmut Dersch, it's
+now maintained by Bruno Postle <bruno@...>.
+.PP
+PTblender was written by Daniel M German <dmgerman@...>.
+.PP
+This manpage was written by Cyril Brulebois
+<cyril.brulebois@...> and is licensed under the same
+terms as the libpano13 package itself.

Added: trunk/libpano/man/PTblender.pod
===================================================================
--- trunk/libpano/man/PTblender.pod	                        (rev 0)
+++ trunk/libpano/man/PTblender.pod	2009-02-01 22:48:03 UTC (rev 929)
@@ -0,0 +1,75 @@
+=head1 NAME
+
+PTblender - Colour and brightness correction of panoramas
+
+
+=head1 SYNOPSIS
+
+B<PTblender> [options] I<tiff_file(s)>
+
+
+=head1 DESCRIPTION
+
+B<PTblender> is a command-line tool that only implements the colour
+and brightness correction functionality of B<PTmender>.
+
+
+=head1 OPTIONS
+
+=over
+
+=item B<-p> I<prefix>
+
+Prefix for output filename. Defaults to I<blended%4d>.
+
+=item B<-k> I<index>
+
+Index of the image to use as a reference (0-based, defaults to 0).
+
+=item B<-t> I<[0,1,2]>
+
+Type of colour correction: 0 full (default), 1 brightness only, 2
+colour only.
+
+=item B<-c>
+
+Output curves smooth (output one per each corrected file).
+
+=item B<-m>
+
+Output curves arbitrary map (output one per each corrected file).
+
+=item B<-f>
+
+Force processing (ignore warnings).
+
+=item B<-x>
+
+Delete source files (use with care).
+
+=item B<-q>
+
+Quiet run.
+
+=item B<-h>
+
+Output help summary.
+
+=back
+
+
+=head1 SEE ALSO
+
+L<http://wiki.panotools.org/PTblender>, L<PTmender(1)>
+
+
+=head1 AUTHORS
+
+Panorama Tools was originally created by Professor Helmut Dersch, it's
+now maintained by Bruno Postle <bruno@...>.
+
+PTblender was written by Daniel M German <dmgerman@...>.
+
+This manpage was written by Cyril Brulebois
+<cyril.brulebois@...> and is licensed under the same
+terms as the libpano13 package itself.

Added: trunk/libpano/man/PTcrop.1
===================================================================
--- trunk/libpano/man/PTcrop.1	                        (rev 0)
+++ trunk/libpano/man/PTcrop.1	2009-02-01 22:48:03 UTC (rev 929)
@@ -0,0 +1,172 @@
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.14
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sh \" Subsection heading
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  | will give a
+.\" real vertical bar.  \*(C+ will give a nicer C++.  Capital omega is used to
+.\" do unbreakable dashes and therefore won't be available.  \*(C` and \*(C'
+.\" expand to `' in nroff, nothing in troff, for use with C<>.
+.tr \(*W-|\(bv\*(Tr
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` ""
+.    ds C' ""
+'br\}
+.el\{\
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
+'br\}
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.if \nF \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
+..
+.    nr % 0
+.    rr F
+.\}
+.\"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.hy 0
+.if n .na
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+.    \" fudge factors for nroff and troff
+.if n \{\
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
+.\}
+.if t \{\
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
+.\}
+.    \" simple accents for nroff and troff
+.if n \{\
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
+.\}
+.if t \{\
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+.    \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.    \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.    \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "PTCROP 1"
+.TH PTCROP 1 "2008-01-22" "2.9.12" "LIBPANO13 TOOLS"
+.SH "NAME"
+PTcrop \- Crop TIFF images
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+\&\fBPTcrop\fR [options] \fItiff_file(s)\fR
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+\&\fBPTcrop\fR is a command-line tool that crops a \s-1TIFF\s0 image to its
+bounding rectangle, preserving its original dimensions.
+.SH "OPTIONS"
+.IX Header "OPTIONS"
+.IP "\fB\-p\fR \fIprefix\fR" 4
+.IX Item "-p prefix"
+Prefix for output files (defaults to \fIcropped%4d\fR).
+.IP "\fB\-f\fR" 4
+.IX Item "-f"
+Force processing: Overwrite output files if they exists (use with
+care).
+.IP "\fB\-x\fR" 4
+.IX Item "-x"
+Delete source files (use with care).
+.IP "\fB\-q\fR" 4
+.IX Item "-q"
+Quiet run
+.IP "\fB\-h\fR" 4
+.IX Item "-h"
+Output help summary.
+.SH "SEE ALSO"
+.IX Header "SEE ALSO"
+\&\fIPTuncrop\fR\|(1)
+.SH "AUTHORS"
+.IX Header "AUTHORS"
+Panorama Tools was originally created by Professor Helmut Dersch, it's
+now maintained by Bruno Postle <bruno@...>.
+.PP
+PTcrop was written by Daniel M German <dmgerman@...>.
+.PP
+This manpage was written by Cyril Brulebois
+<cyril.brulebois@...> and is licensed under the same
+terms as the libpano13 package itself.

Added: trunk/libpano/man/PTcrop.pod
===================================================================
--- trunk/libpano/man/PTcrop.pod	                        (rev 0)
+++ trunk/libpano/man/PTcrop.pod	2009-02-01 22:48:03 UTC (rev 929)
@@ -0,0 +1,59 @@
+=head1 NAME
+
+PTcrop - Crop TIFF images
+
+
+=head1 SYNOPSIS
+
+B<PTcrop> [options] I<tiff_file(s)>
+
+
+=head1 DESCRIPTION
+
+B<PTcrop> is a command-line tool that crops a TIFF image to its
+bounding rectangle, preserving its original dimensions.
+
+
+=head1 OPTIONS
+
+=over
+
+=item B<-p> I<prefix>
+
+Prefix for output files (defaults to I<cropped%4d>).
+
+=item B<-f>
+
+Force processing: Overwrite output files if they exists (use with
+care).
+
+=item B<-x>
+
+Delete source files (use with care).
+
+=item B<-q>
+
+Quiet run
+
+=item B<-h>
+
+Output help summary.
+
+=back
+
+
+=head1 SEE ALSO
+
+L<PTuncrop(1)>
+
+
+=head1 AUTHORS
+
+Panorama Tools was originally created by Professor Helmut Dersch, it's
+now maintained by Bruno Postle <bruno@...>.
+
+PTcrop was written by Daniel M German <dmgerman@...>.
+
+This manpage was written by Cyril Brulebois
+<cyril.brulebois@...> and is licensed under the same
+terms as the libpano13 package itself.

Added: trunk/libpano/man/PTinfo.1
===================================================================
--- trunk/libpano/man/PTinfo.1	                        (rev 0)
+++ trunk/libpano/man/PTinfo.1	2009-02-01 22:48:03 UTC (rev 929)
@@ -0,0 +1,155 @@
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.14
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sh \" Subsection heading
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  | will give a
+.\" real vertical bar.  \*(C+ will give a nicer C++.  Capital omega is used to
+.\" do unbreakable dashes and therefore won't be available.  \*(C` and \*(C'
+.\" expand to `' in nroff, nothing in troff, for use with C<>.
+.tr \(*W-|\(bv\*(Tr
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` ""
+.    ds C' ""
+'br\}
+.el\{\
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
+'br\}
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.if \nF \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
+..
+.    nr % 0
+.    rr F
+.\}
+.\"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.hy 0
+.if n .na
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+.    \" fudge factors for nroff and troff
+.if n \{\
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
+.\}
+.if t \{\
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
+.\}
+.    \" simple accents for nroff and troff
+.if n \{\
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
+.\}
+.if t \{\
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+.    \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.    \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.    \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "PTINFO 1"
+.TH PTINFO 1 "2008-01-22" "2.9.12" "LIBPANO13 TOOLS"
+.SH "NAME"
+PTinfo \- Display information about a panotools\-generated image
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+\&\fBPTinfo\fR [options] \fItiff_file(s)\fR
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+\&\fBPTinfo\fR displays information about an image created with panotools.
+.SH "OPTIONS"
+.IX Header "OPTIONS"
+.IP "\fB\-h\fR" 4
+.IX Item "-h"
+Output help summary.
+.SH "AUTHORS"
+.IX Header "AUTHORS"
+Panorama Tools was originally created by Professor Helmut Dersch, it's
+now maintained by Bruno Postle <bruno@...>.
+.PP
+PTinfo was written by Daniel M German <dmgerman@...>.
+.PP
+This manpage was written by Cyril Brulebois
+<cyril.brulebois@...> and is licensed under the same
+terms as the libpano13 package itself.

Added: trunk/libpano/man/PTinfo.pod
===================================================================
--- trunk/libpano/man/PTinfo.pod	                        (rev 0)
+++ trunk/libpano/man/PTinfo.pod	2009-02-01 22:48:03 UTC (rev 929)
@@ -0,0 +1,36 @@
+=head1 NAME
+
+PTinfo - Display information about a panotools-generated image
+
+
+=head1 SYNOPSIS
+
+B<PTinfo> [options] I<tiff_file(s)>
+
+
+=head1 DESCRIPTION
+
+B<PTinfo> displays information about an image created with panotools.
+
+
+=head1 OPTIONS
+
+=over
+
+=item B<-h>
+
+Output help summary.
+
+=back
+
+
+=head1 AUTHORS
+
+Panorama Tools was originally created by Professor Helmut Dersch, it's
+now maintained by Bruno Postle <bruno@...>.
+
+PTinfo was written by Daniel M German <dmgerman@...>.
+
+This manpage was written by Cyril Brulebois
+<cyril.brulebois@...> and is licensed under the same
+terms as the libpano13 package itself.

Added: trunk/libpano/man/PTmasker.1
===================================================================
--- trunk/libpano/man/PTmasker.1	                        (rev 0)
+++ trunk/libpano/man/PTmasker.1	2009-02-01 22:48:03 UTC (rev 929)
@@ -0,0 +1,210 @@
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.14
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sh \" Subsection heading
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  | will give a
+.\" real vertical bar.  \*(C+ will give a nicer C++.  Capital omega is used to
+.\" do unbreakable dashes and therefore won't be available.  \*(C` and \*(C'
+.\" expand to `' in nroff, nothing in troff, for use with C<>.
+.tr \(*W-|\(bv\*(Tr
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` ""
+.    ds C' ""
+'br\}
+.el\{\
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
+'br\}
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.if \nF \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
+..
+.    nr % 0
+.    rr F
+.\}
+.\"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.hy 0
+.if n .na
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+.    \" fudge factors for nroff and troff
+.if n \{\
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
+.\}
+.if t \{\
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
+.\}
+.    \" simple accents for nroff and troff
+.if n \{\
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
+.\}
+.if t \{\
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+.    \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.    \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.    \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "PTMASKER 1"
+.TH PTMASKER 1 "2008-01-22" "2.9.12" "LIBPANO13 TOOLS"
+.SH "NAME"
+PTmasker \- Compute stitching masks
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+\&\fBPTmasker\fR [options] \fItiff_file(s)\fR
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+\&\fBPTmasker\fR computes stitching masks. It implements the ability to
+increase depth-of-field by stacking images.
+.SH "OPTIONS"
+.IX Header "OPTIONS"
+.IP "\fB\-p\fR \fIprefix\fR" 4
+.IX Item "-p prefix"
+Prefix for output files (defaults to \fImasked%4d\fR).
+.IP "\fB\-e\fR \fIfeather\fR" 4
+.IX Item "-e feather"
+Size of the feather (defaults to zero).
+.IP "\fB\-f\fR" 4
+.IX Item "-f"
+Force processing (do not stop on warnings).
+.IP "\fB\-x\fR" 4
+.IX Item "-x"
+Delete source files (use with care).
+.IP "\fB\-q\fR" 4
+.IX Item "-q"
+Quiet run.
+.IP "\fB\-h\fR" 4
+.IX Item "-h"
+Output help summary.
+.IP "\fB\-z\fR" 4
+.IX Item "-z"
+Enable Extended depth of field.
+.IP "\fB\-m\fR" 4
+.IX Item "-m"
+Focus estimation mask type.
+.RS 4
+.IP "0 hard-edged masks, mutually exclusive" 4
+.IX Item "0 hard-edged masks, mutually exclusive"
+.PD 0
+.IP "1 hard-edged masks, stack of nested masks" 4
+.IX Item "1 hard-edged masks, stack of nested masks"
+.IP "2 blended masks, stack of nested masks" 4
+.IX Item "2 blended masks, stack of nested masks"
+.RE
+.RS 4
+.PD
+.Sp
+2 is default and strongly recommended: This option includes a
+smoothing computation that seems to help a lot.
+.RE
+.IP "\fB\-w\fR \fIinteger\fR" 4
+.IX Item "-w integer"
+Focus estimation window size. Only available if \-z.
+.Sp
+Recommended value is 0.51001114526f image width, e.g. 4 pixels for an
+800\-pixel image.
+.Sp
+Computation cost for focus estimation increases proportional to N^2.
+Defaults to w4.
+.IP "\fB\-s\fR \fIinteger\fR" 4
+.IX Item "-s integer"
+Smoothing window size. Only available if \-z.
+.Sp
+Recommended value is 0.50f image width, e.g. 4 pixels for an 800\-pixel
+image.
+.Sp
+Computation cost for focus estimation increases proportional to N^2.
+Defaults to w4.
+.SH "AUTHORS"
+.IX Header "AUTHORS"
+Panorama Tools was originally created by Professor Helmut Dersch, it's
+now maintained by Bruno Postle <bruno@...>.
+.Sp
+PTmasker was written by Daniel M German <dmgerman@...>.
+.Sp
+This manpage was written by Cyril Brulebois
+<cyril.brulebois@...> and is licensed under the same
+terms as the libpano13 package itself.

Added: trunk/libpano/man/PTmasker.pod
===================================================================
--- trunk/libpano/man/PTmasker.pod	                        (rev 0)
+++ trunk/libpano/man/PTmasker.pod	2009-02-01 22:48:03 UTC (rev 929)
@@ -0,0 +1,97 @@
+=head1 NAME
+
+PTmasker - Compute stitching masks
+
+
+=head1 SYNOPSIS
+
+B<PTmasker> [options] I<tiff_file(s)>
+
+
+=head1 DESCRIPTION
+
+B<PTmasker> computes stitching masks. It implements the ability to
+increase depth-of-field by stacking images.
+
+
+=head1 OPTIONS
+
+=over
+
+=item B<-p> I<prefix>
+
+Prefix for output files (defaults to I<masked%4d>).
+
+=item B<-e> I<feather>
+
+Size of the feather (defaults to zero).
+
+=item B<-f>
+
+Force processing (do not stop on warnings).
+
+=item B<-x>
+
+Delete source files (use with care).
+
+=item B<-q>
+
+Quiet run.
+
+=item B<-h>
+
+Output help summary.
+
+=item B<-z>
+
+Enable Extended depth of field.
+
+=item B<-m>
+
+Focus estimation mask type.
+
+=over
+
+=item 0 hard-edged masks, mutually exclusive
+
+=item 1 hard-edged masks, stack of nested masks
+
+=item 2 blended masks, stack of nested masks
+
+=back
+
+2 is default and strongly recommended: This option includes a
+smoothing computation that seems to help a lot.
+
+=item B<-w> I<integer>
+
+Focus estimation window size. Only available if -z.
+
+
+Recommended value is 0.51001114526f image width, e.g. 4 pixels for an
+800-pixel image.
+
+Computation cost for focus estimation increases proportional to N^2.
+Defaults to w4.
+
+=item B<-s> I<integer>
+
+Smoothing window size. Only available if -z.
+
+Recommended value is 0.50f image width, e.g. 4 pixels for an 800-pixel
+image.
+
+Computation cost for focus estimation increases proportional to N^2.
+Defaults to w4.
+
+
+=head1 AUTHORS
+
+Panorama Tools was originally created by Professor Helmut Dersch, it's
+now maintained by Bruno Postle <bruno@...>.
+
+PTmasker was written by Daniel M German <dmgerman@...>.
+
+This manpage was written by Cyril Brulebois
+<cyril.brulebois@...> and is licensed under the same
+terms as the libpano13 package itself.

Added: trunk/libpano/man/PTmender.1
===================================================================
--- trunk/libpano/man/PTmender.1	                        (rev 0)
+++ trunk/libpano/man/PTmender.1	2009-02-01 22:48:03 UTC (rev 929)
@@ -0,0 +1,195 @@
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.14
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sh \" Subsection heading
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  | will give a
+.\" real vertical bar.  \*(C+ will give a nicer C++.  Capital omega is used to
+.\" do unbreakable dashes and therefore won't be available.  \*(C` and \*(C'
+.\" expand to `' in nroff, nothing in troff, for use with C<>.
+.tr \(*W-|\(bv\*(Tr
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` ""
+.    ds C' ""
+'br\}
+.el\{\
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
+'br\}
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.if \nF \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
+..
+.    nr % 0
+.    rr F
+.\}
+.\"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.hy 0
+.if n .na
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+.    \" fudge factors for nroff and troff
+.if n \{\
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
+.\}
+.if t \{\
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
+.\}
+.    \" simple accents for nroff and troff
+.if n \{\
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
+.\}
+.if t \{\
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+.    \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.    \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.    \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "PTMENDER 1"
+.TH PTMENDER 1 "2008-01-22" "2.9.12" "LIBPANO13 TOOLS"
+.SH "NAME"
+PTmender \- Replacement for PTStitcher
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+\&\fBPTmender\fR [options] \fIscript_filename\fR \fIimages\fR
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+\&\fBPTmender\fR is a replacement for Professor Helmut Dersch's PTStitcher.
+Most useful features of PTStitcher have already been implemented,
+particularly:
+.IP "\(bu" 4
+Compatibility with existing command line and script usage
+.IP "\(bu" 4
+Colour and brightness correction
+.IP "\(bu" 4
+Multiple \s-1TIFF\s0 output
+.IP "\(bu" 4
+\&\s-1PSD\s0 output with layer masks
+.IP "\(bu" 4
+Flattened \s-1TIFF\s0, \s-1JPEG\s0 and \s-1PNG\s0 output
+.PP
+There is also new useful features not available in PTStitcher:
+.IP "\(bu" 4
+Cropped \s-1TIFF\s0 output
+.IP "\(bu" 4
+\&\s-1LZW\s0 compression of \s-1TIFF\s0 output
+.PP
+Features that haven't been implemented:
+.IP "\(bu" 4
+Support for \s-1VRML\s0, \s-1PICT\s0, \s-1QTVR\s0, \s-1IVR\s0
+.IP "\(bu" 4
+Support for other-than-rectilinear lenses such as fisheyes
+.IP "\(bu" 4
+Probably lots of other stuff
+.SH "OPTIONS"
+.IX Header "OPTIONS"
+.IP "\fB\-o\fR \fIprefix\fR" 4
+.IX Item "-o prefix"
+Prefix for output filename, defaults to \fIpano\fR.
+.IP "\fB\-q\fR" 4
+.IX Item "-q"
+Quiet run
+.IP "\fB\-h\fR" 4
+.IX Item "-h"
+Output help summary.
+.IP "\fB\-s\fR" 4
+.IX Item "-s"
+Sort the filenames provided on the command line in lexicographical
+order (and only on the command line)
+.PP
+If no images are specified on the command line, then the \f(CW\*(C`i\*(C'\fR lines
+are used. If \f(CW\*(C`i\*(C'\fR lines do not contain a valid filename then the \f(CW\*(C`o\*(C'\fR
+lines are used.
+.SH "AUTHORS"
+.IX Header "AUTHORS"
+Panorama Tools was originally created by Professor Helmut Dersch, it's
+now maintained by Bruno Postle <bruno@...>.
+.PP
+PTmender was written by Daniel M German <dmgerman@...>.
+.PP
+This manpage was written by Cyril Brulebois
+<cyril.brulebois@...> and is licensed under the same
+terms as the libpano13 package itself.

Added: trunk/libpano/man/PTmender.pod
===================================================================
--- trunk/libpano/man/PTmender.pod	                        (rev 0)
+++ trunk/libpano/man/PTmender.pod	2009-02-01 22:48:03 UTC (rev 929)
@@ -0,0 +1,113 @@
+=head1 NAME
+
+PTmender - Replacement for PTStitcher
+
+
+=head1 SYNOPSIS
+
+B<PTmender> [options] I<script_filename> I<images>
+
+
+=head1 DESCRIPTION
+
+B<PTmender> is a replacement for Professor Helmut Dersch's PTStitcher.
+Most useful features of PTStitcher have already been implemented,
+particularly:
+
+=over
+
+=item *
+
+Compatibility with existing command line and script usage
+
+=item *
+
+Colour and brightness correction
+
+=item *
+
+Multiple TIFF output
+
+=item *
+
+PSD output with layer masks
+
+=item *
+
+Flattened TIFF, JPEG and PNG output
+
+=back
+
+
+There is also new useful features not available in PTStitcher:
+
+=over
+
+=item *
+
+Cropped TIFF output
+
+=item *
+
+LZW compression of TIFF output
+
+=back
+
+
+Features that haven't been implemented:
+
+=over
+
+=item *
+
+Support for VRML, PICT, QTVR, IVR
+
+=item *
+
+Support for other-than-rectilinear lenses such as fisheyes
+
+=item *
+
+Probably lots of other stuff
+
+=back
+
+
+=head1 OPTIONS
+
+=over
+
+=item B<-o> I<prefix>
+
+Prefix for output filename, defaults to I<pano>.
+
+=item B<-q>
+
+Quiet run
+
+=item B<-h>
+
+Output help summary.
+
+=item B<-s>
+
+Sort the filenames provided on the command line in lexicographical
+order (and only on the command line)
+
+=back
+
+If no images are specified on the command line, then the C<i> lines
+are used. If C<i> lines do not contain a valid filename then the C<o>
+lines are used.
+
+
+=head1 AUTHORS
+
+Panorama Tools was originally created by Professor Helmut Dersch, it's
+now maintained by Bruno Postle <bruno@...>.
+
+PTmender was written by Daniel M German <dmgerman@...>.
+
+This manpage was written by Cyril Brulebois
+<cyril.brulebois@...> and is licensed under the same
+terms as the libpano13 package itself.

Added: trunk/libpano/man/PToptimizer.1
===================================================================
--- trunk/libpano/man/PToptimizer.1	                        (rev 0)
+++ trunk/libpano/man/PToptimizer.1	2009-02-01 22:48:03 UTC (rev 929)
@@ -0,0 +1,152 @@
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.14
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sh \" Subsection heading
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  | will give a
+.\" real vertical bar.  \*(C+ will give a nicer C++.  Capital omega is used to
+.\" do unbreakable dashes and therefore won't be available.  \*(C` and \*(C'
+.\" expand to `' in nroff, nothing in troff, for use with C<>.
+.tr \(*W-|\(bv\*(Tr
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` ""
+.    ds C' ""
+'br\}
+.el\{\
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
+'br\}
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.if \nF \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
+..
+.    nr % 0
+.    rr F
+.\}
+.\"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.hy 0
+.if n .na
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+.    \" fudge factors for nroff and troff
+.if n \{\
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
+.\}
+.if t \{\
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
+.\}
+.    \" simple accents for nroff and troff
+.if n \{\
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
+.\}
+.if t \{\
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+.    \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.    \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.    \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "PTOPTIMIZER 1"
+.TH PTOPTIMIZER 1 "2008-01-22" "2.9.12" "LIBPANO13 TOOLS"
+.SH "NAME"
+PToptimizer \- Wrapper around control point optimization routines
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+\&\fBPToptimizer\fR \fIscript_file\fR
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+\&\fBPToptimizer\fR is a simple wrapper around control point optimization
+routines available in libpano13.
+.SH "SEE ALSO"
+.IX Header "SEE ALSO"
+<http://www.panotools.info/mediawiki/index.php?title=PTOptimizer>
+.SH "AUTHORS"
+.IX Header "AUTHORS"
+Panorama Tools was originally created by Professor Helmut Dersch, it's
+now maintained by Bruno Postle <bruno@...>.
+.PP
+This manpage was written by Cyril Brulebois
+<cyril.brulebois@...> and is licensed under the same
+terms as the libpano13 package itself.

Added: trunk/libpano/man/PToptimizer.pod
===================================================================
--- trunk/libpano/man/PToptimizer.pod	                        (rev 0)
+++ trunk/libpano/man/PToptimizer.pod	2009-02-01 22:48:03 UTC (rev 929)
@@ -0,0 +1,29 @@
+=head1 NAME
+
+PToptimizer - Wrapper around control point optimization routines
+
+
+=head1 SYNOPSIS
+
+B<PToptimizer> I<script_file>
+
+
+=head1 DESCRIPTION
+
+B<PToptimizer> is a simple wrapper around control point optimization
+routines available in libpano13.
+
+
+=head1 SEE ALSO
+
+L<http://www.panotools.info/mediawiki/index.php?title=PTOptimizer>
+
+
+=head1 AUTHORS
+
+Panorama Tools was originally created by Professor Helmut Dersch, it's
+now maintained by Bruno Postle <bruno@...>.
+
+This manpage was written by Cyril Brulebois
+<cyril.brulebois@...> and is licensed under the same
+terms as the libpano13 package itself.

Added: trunk/libpano/man/PTroller.1
===================================================================
--- trunk/libpano/man/PTroller.1	                        (rev 0)
+++ trunk/libpano/man/PTroller.1	2009-02-01 22:48:03 UTC (rev 929)
@@ -0,0 +1,167 @@
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.14
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sh \" Subsection heading
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  | will give a
+.\" real vertical bar.  \*(C+ will give a nicer C++.  Capital omega is used to
+.\" do unbreakable dashes and therefore won't be available.  \*(C` and \*(C'
+.\" expand to `' in nroff, nothing in troff, for use with C<>.
+.tr \(*W-|\(bv\*(Tr
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` ""
+.    ds C' ""
+'br\}
+.el\{\
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
+'br\}
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.if \nF \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
+..
+.    nr % 0
+.    rr F
+.\}
+.\"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.hy 0
+.if n .na
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+.    \" fudge factors for nroff and troff
+.if n \{\
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
+.\}
+.if t \{\
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
+.\}
+.    \" simple accents for nroff and troff
+.if n \{\
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
+.\}
+.if t \{\
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+.    \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.    \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.    \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "PTROLLER 1"
+.TH PTROLLER 1 "2008-01-22" "2.9.12" "LIBPANO13 TOOLS"
+.SH "NAME"
+PTroller \- Merge several images into a single one
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+\&\fBPTroller\fR [options] \fItiff_file(s)\fR
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+\&\fBPTroller\fR takes a set of images and merges them into a single one.
+.SH "OPTIONS"
+.IX Header "OPTIONS"
+.IP "\fB\-o\fR \fIfilename\fR" 4
+.IX Item "-o filename"
+Output filename (defaults to \fImerged.tif\fR).
+.IP "\fB\-f\fR" 4
+.IX Item "-f"
+Force processing (do not stop on warnings).
+.IP "\fB\-x\fR" 4
+.IX Item "-x"
+Delete source files (use with care).
+.IP "\fB\-q\fR" 4
+.IX Item "-q"
+Quiet run
+.IP "\fB\-h\fR" 4
+.IX Item "-h"
+Show this message
+.SH "AUTHORS"
+.IX Header "AUTHORS"
+Panorama Tools was originally created by Professor Helmut Dersch, it's
+now maintained by Bruno Postle <bruno@...>.
+.PP
+PTroller was written by Daniel M German <dmgerman@...>.
+.PP
+This manpage was written by Cyril Brulebois
+<cyril.brulebois@...> and is licensed under the same
+terms as the libpano13 package itself.

Added: trunk/libpano/man/PTroller.pod
===================================================================
--- trunk/libpano/man/PTroller.pod	                        (rev 0)
+++ trunk/libpano/man/PTroller.pod	2009-02-01 22:48:03 UTC (rev 929)
@@ -0,0 +1,52 @@
+=head1 NAME
+
+PTroller - Merge several images into a single one
+
+
+=head1 SYNOPSIS
+
+B<PTroller> [options] I<tiff_file(s)>
+
+
+=head1 DESCRIPTION
+
+B<PTroller> takes a set of images and merges them into a single one.
+
+
+=head1 OPTIONS
+
+=over
+
+=item B<-o> I<filename>
+
+Output filename (defaults to I<merged.tif>).
+
+=item B<-f>
+
+Force processing (do not stop on warnings).
+
+=item B<-x>
+
+Delete source files (use with care).
+
+=item B<-q>
+
+Quiet run
+
+=item B<-h>
+
+Show this message
+
+=back
+
+
+=head1 AUTHORS
+
+Panorama Tools was originally created by Professor Helmut Dersch, it's
+now maintained by Bruno Postle <bruno@...>.
+
+PTroller was written by Daniel M German <dmgerman@...>.
+
+This manpage was written by Cyril Brulebois
+<cyril.brulebois@...> and is licensed under the same
+terms as the libpano13 package itself.

Added: trunk/libpano/man/PTtiff2psd.1
===================================================================
--- trunk/libpano/man/PTtiff2psd.1	                        (rev 0)
+++ trunk/libpano/man/PTtiff2psd.1	2009-02-01 22:48:03 UTC (rev 929)
@@ -0,0 +1,218 @@
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.14
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sh \" Subsection heading
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  | will give a
+.\" real vertical bar.  \*(C+ will give a nicer C++.  Capital omega is used to
+.\" do unbreakable dashes and therefore won't be available.  \*(C` and \*(C'
+.\" expand to `' in nroff, nothing in troff, for use with C<>.
+.tr \(*W-|\(bv\*(Tr
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` ""
+.    ds C' ""
+'br\}
+.el\{\
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
+'br\}
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.if \nF \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
+..
+.    nr % 0
+.    rr F
+.\}
+.\"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.hy 0
+.if n .na
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+.    \" fudge factors for nroff and troff
+.if n \{\
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
+.\}
+.if t \{\
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
+.\}
+.    \" simple accents for nroff and troff
+.if n \{\
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
+.\}
+.if t \{\
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+.    \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.    \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.    \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "PTTIFF2PSD 1"
+.TH PTTIFF2PSD 1 "2008-01-22" "2.9.12" "LIBPANO13 TOOLS"
+.SH "NAME"
+PTtiff2psd \- Convert a set of TIFF files into a Photoshop PSD file
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+\&\fBPTtiff2psd\fR [options] \fItiff_file(s)\fR
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+\&\fBPTtiff2psd\fR is a command-line tool that crops a \s-1TIFF\s0 image to its
+bounding rectangle, preserving its original dimensions.
+.SH "OPTIONS"
+.IX Header "OPTIONS"
+.IP "\fB\-o\fR \fIfilename\fR" 4
+.IX Item "-o filename"
+Output filename (defaults to \fImerged.psd\fR).
+.IP "\fB\-b\fR \fIblendingmode\fR" 4
+.IX Item "-b blendingmode"
+Specify blending mode for layers (use \fB\-h\fR to display them).
+.IP "\fB\-s\fR" 4
+.IX Item "-s"
+Stack them.
+.IP "\fB\-r\fR" 4
+.IX Item "-r"
+Reverse layers.
+.IP "\fB\-f\fR" 4
+.IX Item "-f"
+Force processing (do no stop on warning).
+.IP "\fB\-q\fR" 4
+.IX Item "-q"
+Quiet run
+.IP "\fB\-h\fR" 4
+.IX Item "-h"
+Output help summary.
+.PP
+Valid blending modes:
+.IP "\fB0\fR" 4
+.IX Item "0"
+Normal
+.IP "\fB1\fR" 4
+.IX Item "1"
+Color
+.IP "\fB2\fR" 4
+.IX Item "2"
+Darken
+.IP "\fB3\fR" 4
+.IX Item "3"
+Difference
+.IP "\fB4\fR" 4
+.IX Item "4"
+Dissolve
+.IP "\fB5\fR" 4
+.IX Item "5"
+Hard
+.IP "\fB6\fR" 4
+.IX Item "6"
+Hue
+.IP "\fB7\fR" 4
+.IX Item "7"
+Lighten
+.IP "\fB8\fR" 4
+.IX Item "8"
+Luminosity
+.IP "\fB9\fR" 4
+.IX Item "9"
+Multiply
+.IP "\fB10\fR" 4
+.IX Item "10"
+Overlay
+.IP "\fB11\fR" 4
+.IX Item "11"
+Sof
+.IP "\fB12\fR" 4
+.IX Item "12"
+Saturation
+.IP "\fB13\fR" 4
+.IX Item "13"
+Screen
+.SH "AUTHORS"
+.IX Header "AUTHORS"
+Panorama Tools was originally created by Professor Helmut Dersch, it's
+now maintained by Bruno Postle <bruno@...>.
+.PP
+PTtiff2psd was written by Daniel M German <dmgerman@...>.
+.PP
+This manpage was written by Cyril Brulebois
+<cyril.brulebois@...> and is licensed under the same
+terms as the libpano13 package itself.

Added: trunk/libpano/man/PTtiff2psd.pod
===================================================================
--- trunk/libpano/man/PTtiff2psd.pod	                        (rev 0)
+++ trunk/libpano/man/PTtiff2psd.pod	2009-02-01 22:48:03 UTC (rev 929)
@@ -0,0 +1,124 @@
+=head1 NAME
+
+PTtiff2psd - Convert a set of TIFF files into a Photoshop PSD file
+
+
+=head1 SYNOPSIS
+
+B<PTtiff2psd> [options] I<tiff_file(s)>
+
+
+=head1 DESCRIPTION
+
+B<PTtiff2psd> is a command-line tool that crops a TIFF image to its
+bounding rectangle, preserving its original dimensions.
+
+
+=head1 OPTIONS
+
+=over
+
+=item B<-o> I<filename>
+
+Output filename (defaults to I<merged.psd>).
+
+=item B<-b> I<blendingmode>
+
+Specify blending mode for layers (use B<-h> to display them).
+
+=item B<-s>
+
+Stack them.
+
+=item B<-r>
+
+Reverse layers.
+
+=item B<-f>
+
+Force processing (do no stop on warning).
+
+=item B<-q>
+
+Quiet run
+
+=item B<-h>
+
+Output help summary.
+
+=back
+
+
+Valid blending modes:
+
+=over
+
+=item B<0>
+
+Normal
+
+=item B<1>
+
+Color
+
+=item B<2>
+
+Darken
+
+=item B<3>
+
+Difference
+
+=item B<4>
+
+Dissolve
+
+=item B<5>
+
+Hard
+
+=item B<6>
+
+Hue
+
+=item B<7>
+
+Lighten
+
+=item B<8>
+
+Luminosity
+
+=item B<9>
+
+Multiply
+
+=item B<10>
+
+Overlay
+
+=item B<11>
+
+Sof
+
+=item B<12>
+
+Saturation
+
+=item B<13>
+
+Screen
+
+=back
+
+
+=head1 AUTHORS
+
+Panorama Tools was originally created by Professor Helmut Dersch, it's
+now maintained by Bruno Postle <bruno@...>.
+
+PTtiff2psd was written by Daniel M German <dmgerman@...>.
+
+This manpage was written by Cyril Brulebois
+<cyril.brulebois@...> and is licensed under the same
+terms as the libpano13 package itself.

Added: trunk/libpano/man/PTtiffdump.1
===================================================================
--- trunk/libpano/man/PTtiffdump.1	                        (rev 0)
+++ trunk/libpano/man/PTtiffdump.1	2009-02-01 22:48:03 UTC (rev 929)
@@ -0,0 +1,162 @@
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.14
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sh \" Subsection heading
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  | will give a
+.\" real vertical bar.  \*(C+ will give a nicer C++.  Capital omega is used to
+.\" do unbreakable dashes and therefore won't be available.  \*(C` and \*(C'
+.\" expand to `' in nroff, nothing in troff, for use with C<>.
+.tr \(*W-|\(bv\*(Tr
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` ""
+.    ds C' ""
+'br\}
+.el\{\
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
+'br\}
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.if \nF \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
+..
+.    nr % 0
+.    rr F
+.\}
+.\"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.hy 0
+.if n .na
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+.    \" fudge factors for nroff and troff
+.if n \{\
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
+.\}
+.if t \{\
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
+.\}
+.    \" simple accents for nroff and troff
+.if n \{\
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
+.\}
+.if t \{\
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+.    \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.    \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.    \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "PTTIFFDUMP 1"
+.TH PTTIFFDUMP 1 "2008-01-22" "2.9.12" "LIBPANO13 TOOLS"
+.SH "NAME"
+PTtiffdump \- Compare two TIFF images
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+\&\fBPTtiffdump\fR [options] \fItiff_file1\fR \fItiff_file2\fR
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+\&\fBPTtiffdump\fR compares the contents of 2 different tiff files. If the
+byte is different, it gets output.
+.SH "OPTIONS"
+.IX Header "OPTIONS"
+.IP "\fB\-o\fR" 4
+.IX Item "-o"
+Overwrite output file if it exists.
+.IP "\fB\-q\fR" 4
+.IX Item "-q"
+Quiet run
+.IP "\fB\-h\fR" 4
+.IX Item "-h"
+Output help summary.
+.SH "AUTHORS"
+.IX Header "AUTHORS"
+Panorama Tools was originally created by Professor Helmut Dersch, it's
+now maintained by Bruno Postle <bruno@...>.
+.PP
+PTtiffdump was written by Daniel M German <dmgerman@...>.
+.PP
+This manpage was written by Cyril Brulebois
+<cyril.brulebois@...> and is licensed under the same
+terms as the libpano13 package itself.

Added: trunk/libpano/man/PTtiffdump.pod
===================================================================
--- trunk/libpano/man/PTtiffdump.pod	                        (rev 0)
+++ trunk/libpano/man/PTtiffdump.pod	2009-02-01 22:48:03 UTC (rev 929)
@@ -0,0 +1,46 @@
+=head1 NAME
+
+PTtiffdump - Compare two TIFF images
+
+
+=head1 SYNOPSIS
+
+B<PTtiffdump> [options] I<tiff_file1> I<tiff_file2>
+
+
+=head1 DESCRIPTION
+
+B<PTtiffdump> compares the contents of 2 different tiff files. If the
+byte is different, it gets output.
+
+
+
+=head1 OPTIONS
+
+=over
+
+=item B<-o>
+
+Overwrite output file if it exists.
+
+=item B<-q>
+
+Quiet run
+
+=item B<-h>
+
+Output help summary.
+
+=back
+
+
+=head1 AUTHORS
+
+Panorama Tools was originally created by Professor Helmut Dersch, it's
+now maintained by Bruno Postle <bruno@...>.
+
+PTtiffdump was written by Daniel M German <dmgerman@...>.
+
+This manpage was written by Cyril Brulebois
+<cyril.brulebois@...> and is licensed under the same
+terms as the libpano13 package itself.

Added: trunk/libpano/man/PTuncrop.1
===================================================================
--- trunk/libpano/man/PTuncrop.1	                        (rev 0)
+++ trunk/libpano/man/PTuncrop.1	2009-02-01 22:48:03 UTC (rev 929)
@@ -0,0 +1,171 @@
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.14
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sh \" Subsection heading
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  | will give a
+.\" real vertical bar.  \*(C+ will give a nicer C++.  Capital omega is used to
+.\" do unbreakable dashes and therefore won't be available.  \*(C` and \*(C'
+.\" expand to `' in nroff, nothing in troff, for use with C<>.
+.tr \(*W-|\(bv\*(Tr
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` ""
+.    ds C' ""
+'br\}
+.el\{\
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
+'br\}
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.if \nF \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
+..
+.    nr % 0
+.    rr F
+.\}
+.\"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.hy 0
+.if n .na
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+.    \" fudge factors for nroff and troff
+.if n \{\
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
+.\}
+.if t \{\
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
+.\}
+.    \" simple accents for nroff and troff
+.if n \{\
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
+.\}
+.if t \{\
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+.    \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.    \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.    \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "PTUNCROP 1"
+.TH PTUNCROP 1 "2008-01-22" "2.9.12" "LIBPANO13 TOOLS"
+.SH "NAME"
+PTuncrop \- Uncrop TIFF images
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+\&\fBPTuncrop\fR [options] \fIinput_file\fR \fIoutput_file\fR
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+\&\fBPTuncrop\fR does the opposite of \fBPTcrop\fR: it takes a cropped file
+and creates an uncropped one.
+.SH "OPTIONS"
+.IX Header "OPTIONS"
+.IP "\fB\-p\fR \fIprefix\fR" 4
+.IX Item "-p prefix"
+Prefix for output files (defaults to \fIuncropped%4d\fR).
+.IP "\fB\-f\fR" 4
+.IX Item "-f"
+Force processing: Overwrite output file if it exists.
+.IP "\fB\-x\fR" 4
+.IX Item "-x"
+Delete source files (use with care).
+.IP "\fB\-q\fR" 4
+.IX Item "-q"
+Quiet run.
+.IP "\fB\-q\fR" 4
+.IX Item "-q"
+Output help summary.
+.SH "SEE ALSO"
+.IX Header "SEE ALSO"
+\&\fIPTcrop\fR\|(1)
+.SH "AUTHORS"
+.IX Header "AUTHORS"
+Panorama Tools was originally created by Professor Helmut Dersch, it's
+now maintained by Bruno Postle <bruno@...>.
+.PP
+PTuncrop was written by Daniel M German <dmgerman@...>.
+.PP
+This manpage was written by Cyril Brulebois
+<cyril.brulebois@...> and is licensed under the same
+terms as the libpano13 package itself.

Added: trunk/libpano/man/PTuncrop.pod
===================================================================
--- trunk/libpano/man/PTuncrop.pod	                        (rev 0)
+++ trunk/libpano/man/PTuncrop.pod	2009-02-01 22:48:03 UTC (rev 929)
@@ -0,0 +1,58 @@
+=head1 NAME
+
+PTuncrop - Uncrop TIFF images
+
+
+=head1 SYNOPSIS
+
+B<PTuncrop> [options] I<input_file> I<output_file>
+
+
+=head1 DESCRIPTION
+
+B<PTuncrop> does the opposite of B<PTcrop>: it takes a cropped file
+and creates an uncropped one.
+
+
+=head1 OPTIONS
+
+=over
+
+=item B<-p> I<prefix>
+
+Prefix for output files (defaults to I<uncropped%4d>).
+
+=item B<-f>
+
+Force processing: Overwrite output file if it exists.
+
+=item B<-x>
+
+Delete source files (use with care).
+
+=item B<-q>
+
+Quiet run.
+
+=item B<-q>
+
+Output help summary.
+
+=back
+
+
+=head1 SEE ALSO
+
+L<PTcrop(1)>
+
+
+=head1 AUTHORS
+
+Panorama Tools was originally created by Professor Helmut Dersch, it's
+now maintained by Bruno Postle <bruno@...>.
+
+PTuncrop was written by Daniel M German <dmgerman@...>.
+
+This manpage was written by Cyril Brulebois
+<cyril.brulebois@...> and is licensed under the same
+terms as the libpano13 package itself.

Added: trunk/libpano/man/panoinfo.1
===================================================================
--- trunk/libpano/man/panoinfo.1	                        (rev 0)
+++ trunk/libpano/man/panoinfo.1	2009-02-01 22:48:03 UTC (rev 929)
@@ -0,0 +1,152 @@
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.14
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sh \" Subsection heading
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  | will give a
+.\" real vertical bar.  \*(C+ will give a nicer C++.  Capital omega is used to
+.\" do unbreakable dashes and therefore won't be available.  \*(C` and \*(C'
+.\" expand to `' in nroff, nothing in troff, for use with C<>.
+.tr \(*W-|\(bv\*(Tr
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` ""
+.    ds C' ""
+'br\}
+.el\{\
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
+'br\}
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.if \nF \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
+..
+.    nr % 0
+.    rr F
+.\}
+.\"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.hy 0
+.if n .na
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+.    \" fudge factors for nroff and troff
+.if n \{\
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
+.\}
+.if t \{\
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
+.\}
+.    \" simple accents for nroff and troff
+.if n \{\
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
+.\}
+.if t \{\
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+.    \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.    \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.    \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "PANOINFO 1"
+.TH PANOINFO 1 "2008-01-22" "2.9.12" "LIBPANO13 TOOLS"
+.SH "NAME"
+panoinfo \- List details about the libpano13 library
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+\&\fBpanoinfo\fR
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+\&\fBpanoinfo\fR is a simple utility built alongside the libpano13 library
+that outputs a list of details about the currently installed version
+of this library. It is particularly useful for debugging.
+.SH "AUTHORS"
+.IX Header "AUTHORS"
+Panorama Tools was originally created by Professor Helmut Dersch, it's
+now maintained by Bruno Postle <bruno@...>.
+.PP
+panoinfo was written by Daniel M German <dmgerman@...>.
+.PP
+This manpage was written by Cyril Brulebois
+<cyril.brulebois@...> and is licensed under the same
+terms as the libpano13 package itself.

Added: trunk/libpano/man/panoinfo.pod
===================================================================
--- trunk/libpano/man/panoinfo.pod	                        (rev 0)
+++ trunk/libpano/man/panoinfo.pod	2009-02-01 22:48:03 UTC (rev 929)
@@ -0,0 +1,27 @@
+=head1 NAME
+
+panoinfo - List details about the libpano13 library
+
+
+=head1 SYNOPSIS
+
+B<panoinfo>
+
+
+=head1 DESCRIPTION
+
+B<panoinfo> is a simple utility built alongside the libpano13 library
+that outputs a list of details about the currently installed version
+of this library. It is particularly useful for debugging.
+
+
+=head1 AUTHORS
+
+Panorama Tools was originally created by Professor Helmut Dersch, it's
+now maintained by Bruno Postle <bruno@...>.
+
+panoinfo was written by Daniel M German <dmgerman@...>.
+
+This manpage was written by Cyril Brulebois
+<cyril.brulebois@...> and is licensed under the same
+terms as the libpano13 package itself.


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

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

From: <brunopostle@us...> - 2009-02-01 23:15

Revision: 930
          http://panotools.svn.sourceforge.net/panotools/?rev=930&view=rev
Author:   brunopostle
Date:     2009-02-01 23:15:33 +0000 (Sun, 01 Feb 2009)

Log Message:
-----------
Fix vague licensing, bug #1877526 (Cyril Brulebois)

Modified Paths:
--------------
    trunk/libpano/f2c.h
    trunk/libpano/jpegicc.c
    trunk/libpano/jpegicc.h
    trunk/libpano/rgbe.c
    trunk/libpano/rgbe.h

Modified: trunk/libpano/f2c.h
===================================================================
--- trunk/libpano/f2c.h	2009-02-01 22:48:03 UTC (rev 929)
+++ trunk/libpano/f2c.h	2009-02-01 23:15:33 UTC (rev 930)
@@ -1,5 +1,25 @@
 /* f2c.h  --  Standard Fortran to C header file */
 
+/* Copyright: (c) 1990-1995 AT&T Bell Laboratories and Bellcore
+Permission to use, copy, modify, and distribute this software
+and its documentation for any purpose and without fee is hereby
+granted, provided that the above copyright notice appear in all
+copies and that both that the copyright notice and this
+permission notice and warranty disclaimer appear in supporting
+documentation, and that the names of AT&T Bell Laboratories or
+Bellcore or any of their entities not be used in advertising or
+publicity pertaining to distribution of the software without
+specific, written prior permission.
+
+AT&T and Bellcore disclaim all warranties with regard to this
+software, including all implied warranties of merchantability
+and fitness.  In no event shall AT&T or Bellcore be liable for
+any special, indirect or consequential damages or any damages
+whatsoever resulting from loss of use, data or profits, whether
+in an action of contract, negligence or other tortious action,
+arising out of or in connection with the use or performance of
+this software. */
+
 /**  barf  [ba:rf]  2.  "He suggested using FORTRAN, and everybody barfed."
 
 	- From The Shogakukan DICTIONARY OF NEW ENGLISH (Second edition) */

Modified: trunk/libpano/jpegicc.c
===================================================================
--- trunk/libpano/jpegicc.c	2009-02-01 22:48:03 UTC (rev 929)
+++ trunk/libpano/jpegicc.c	2009-02-01 23:15:33 UTC (rev 930)
@@ -5,9 +5,7 @@
  *  Marti for permission to change its license from MIT to GPL (Aug 4,
  *  2006). Daniel German
  * 
- *  Copyright Tom Lane and Marti Maria
- *  
- *  Dec 2006
+ *  Copyright (C) 1998-2006 Tom Lane and Marti Maria
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public

Modified: trunk/libpano/jpegicc.h
===================================================================
--- trunk/libpano/jpegicc.h	2009-02-01 22:48:03 UTC (rev 929)
+++ trunk/libpano/jpegicc.h	2009-02-01 23:15:33 UTC (rev 930)
@@ -5,9 +5,7 @@
  *  Marti for permission to change its license from MIT to GPL (Aug 4,
  *  2006). Daniel German
  * 
- *  Copyright Tom Lane and Marti Maria
- *  
- *  Dec 2006
+ *  Copyright (C) 1998-2006 Tom Lane and Marti Maria
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public

Modified: trunk/libpano/rgbe.c
===================================================================
--- trunk/libpano/rgbe.c	2009-02-01 22:48:03 UTC (rev 929)
+++ trunk/libpano/rgbe.c	2009-02-01 23:15:33 UTC (rev 930)
@@ -2,6 +2,10 @@
  * WHILE THE AUTHORS HAVE TRIED TO ENSURE THE PROGRAM WORKS CORRECTLY,
  * IT IS STRICTLY USE AT YOUR OWN RISK.  */
 
+/* Copyright (c) 1995 Bruce Walter <bjw@...>
+   The license of these files has been clarified by Bruce Walter during
+   a private email conversation.  These files are public domain. */
+
 #include "rgbe.h"
 #include <math.h>
 #include <stdlib.h>

Modified: trunk/libpano/rgbe.h
===================================================================
--- trunk/libpano/rgbe.h	2009-02-01 22:48:03 UTC (rev 929)
+++ trunk/libpano/rgbe.h	2009-02-01 23:15:33 UTC (rev 930)
@@ -4,6 +4,10 @@
  * WHILE THE AUTHORS HAVE TRIED TO ENSURE THE PROGRAM WORKS CORRECTLY,
  * IT IS STRICTLY USE AT YOUR OWN RISK.  */
 
+/* Copyright (c) 1995 Bruce Walter <bjw@...>
+   The license of these files has been clarified by Bruce Walter during
+   a private email conversation.  These files are public domain. */
+
 /* utility for reading and writing Ward's rgbe image format.
    See rgbe.txt file for more details.
 */


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

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

From: <brunopostle@us...> - 2009-02-01 23:25

Revision: 931
          http://panotools.svn.sourceforge.net/panotools/?rev=931&view=rev
Author:   brunopostle
Date:     2009-02-01 23:24:58 +0000 (Sun, 01 Feb 2009)

Log Message:
-----------
autotools cross-compile support, bug #2491104 (Diego E. Petteno)

Modified Paths:
--------------
    trunk/libpano/configure.ac
    trunk/libpano/m4/ax_check_java.m4

Modified: trunk/libpano/configure.ac
===================================================================
--- trunk/libpano/configure.ac	2009-02-01 23:15:33 UTC (rev 930)
+++ trunk/libpano/configure.ac	2009-02-01 23:24:58 UTC (rev 931)
@@ -6,7 +6,7 @@
 AC_CONFIG_SRCDIR([PTDialogs.c])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_HEADER([config.h])
-AC_CANONICAL_TARGET
+AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE([no-define dist-bzip2 dist-zip])
 AC_DISABLE_STATIC
 
@@ -21,11 +21,11 @@
 dnl
 dnl  Check the operating system
 dnl
-case "${target_os}" in
+case "${host_os}" in
   "")
     PANO_WIN32_RESOURCE=
     HSYS=unknown
-    HCPU="${target_cpu}"
+    HCPU="${host_cpu}"
 	;;
   linux*)
     PANO_WIN32_RESOURCE=
@@ -33,7 +33,7 @@
     dnl
 	dnl Check the cpu to allow lib/lib64 decisions
 	dnl
-	case "${target_cpu}" in
+	case "${host_cpu}" in
 	  "")
 		HCPU=unknown
 		;;
@@ -41,19 +41,19 @@
 		HCPU=amd64
 		;;
 	  *)
-		HCPU="${target_cpu}"
+		HCPU="${host_cpu}"
 		;;
 	esac
 	;;
   *darwin*)
     PANO_WIN32_RESOURCE=
     HSYS=darwin
-    HCPU="${target_cpu}"
+    HCPU="${host_cpu}"
     ;;
   *mingw32*)
     PANO_WIN32_RESOURCE=pano13.lo
     HSYS=mingw32
-    HCPU="${target_cpu}"
+    HCPU="${host_cpu}"
     ;;
   *cygwin*)
     PANO_WIN32_RESOURCE=pano13.lo
@@ -62,12 +62,12 @@
     CXXFLAGS="-mno-cygwin $CXXFLAGS"
     LDFLAGS="-mno-cygwin $LDFLAGS"
     HSYS=cygwin
-    HCPU="${target_cpu}"
+    HCPU="${host_cpu}"
     ;;
   *)
     PANO_WIN32_RESOURCE=
-    HSYS="${target_os}"
-    HCPU="${target_cpu}"
+    HSYS="${host_os}"
+    HCPU="${host_cpu}"
     ;;
 esac
 
@@ -153,7 +153,6 @@
 echo "matches your expectations."
 echo ""
 echo "Host system type : $host"
-echo "Target os : $target_os"
 echo ""
 echo "                  Option                        Value"
 echo "-------------------------------------------------------------------------"

Modified: trunk/libpano/m4/ax_check_java.m4
===================================================================
--- trunk/libpano/m4/ax_check_java.m4	2009-02-01 23:15:33 UTC (rev 930)
+++ trunk/libpano/m4/ax_check_java.m4	2009-02-01 23:24:58 UTC (rev 931)
@@ -75,7 +75,7 @@
   failed=0;
   passed=0;
   JAVA_OLD_CPPFLAGS=$CPPFLAGS
-  case "${target_os}" in
+  case "${host_os}" in
     linux*)
       java_extra_inc=linux
       ;;


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

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

From: <brunopostle@us...> - 2009-02-02 20:39

Revision: 933
          http://panotools.svn.sourceforge.net/panotools/?rev=933&view=rev
Author:   brunopostle
Date:     2009-02-02 20:39:35 +0000 (Mon, 02 Feb 2009)

Log Message:
-----------
housekeeping

Modified Paths:
--------------
    trunk/libpano/ChangeLog
    trunk/libpano/tools/.cvsignore

Added Paths:
-----------
    trunk/libpano/man/.cvsignore
    trunk/libpano/tests/simpleStitch/reference/.cvsignore
    trunk/libpano/tests/simpleTiff16/.cvsignore
    trunk/libpano/tests/simpleTiff16/reference/.cvsignore

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2009-02-01 23:34:31 UTC (rev 932)
+++ trunk/libpano/ChangeLog	2009-02-02 20:39:35 UTC (rev 933)
@@ -1,40 +1,118 @@
-2009-01-17 Thomas Modes
+2009-02-01 23:34  brunopostle
 
-	* match.c: fix reverse calculation for pannini
+	* tools/PTmasker.c: fix for invalid format specification, bug
+	  #2163676 (Stanislav Brabec)
 
-2009-01-02  dmg  <dmg@...>
+2009-02-01 23:24  brunopostle
 
-	* * adjust.c, filter.h, math.c, panorama.h, parser.c &
-	queryfeateature.c:
+	* configure.ac, m4/ax_check_java.m4: autotools cross-compile
+	  support, bug #2491104 (Diego E. Petteno)
 
-	Fixed the panini (or should we call it pannini) and renamed
-	previous projection as equirectangular panini. It might have to
-	change its name
-	
+2009-02-01 23:15  brunopostle
 
-2008-01-26 Jim Watters <jwatters@...>
+	* f2c.h, jpegicc.c, jpegicc.h, rgbe.c, rgbe.h: Fix vague licensing,
+	  bug #1877526 (Cyril Brulebois)
 
-	* adjust.c, filter.h, math.c, panorama.h, parser.c & queryfeateature.c
-	added mirror, equisolid, orthographic, and stereographic as input image formats
-	added equisolid, orthographic, stereographic as output panorama formats
+2009-02-01 22:48  brunopostle
 
+	* Makefile.am, configure.ac, man, man/Makefile.am, man/PTblender.1,
+	  man/PTblender.pod, man/PTcrop.1, man/PTcrop.pod, man/PTinfo.1,
+	  man/PTinfo.pod, man/PTmasker.1, man/PTmasker.pod, man/PTmender.1,
+	  man/PTmender.pod, man/PToptimizer.1, man/PToptimizer.pod,
+	  man/PTroller.1, man/PTroller.pod, man/PTtiff2psd.1,
+	  man/PTtiff2psd.pod, man/PTtiffdump.1, man/PTtiffdump.pod,
+	  man/PTuncrop.1, man/PTuncrop.pod, man/panoinfo.1,
+	  man/panoinfo.pod: add missing manpages bug #1877534 (Cyril
+	  Brulebois)
 
-2008-12-29  dmg  <dmg@...>
+2009-02-01 21:18  brunopostle
 
-	* panorama.h, math.c, adjust.c, queryfeature.c, filter.h: Finally
-	added the architectural.
+	* configure.ac, tests/simpleStitch/Makefile.am,
+	  tests/simpleStitch/reference/Makefile.am,
+	  tests/simpleTiff16/Makefile.am,
+	  tests/simpleTiff16/reference/Makefile.am: Don't ship .svn dirs in
+	  tarball bug #1861174 (Cyril Brulebois)
 
-	* queryfeature.c (panoProjectionFeaturesQuery): Added querying
-	features for panini; this will allow Hugin to use it.
+2009-02-01 17:59  brunopostle
 
-2008-12-29  dmg  <dmg@...>
+	* Makefile.am, PixMap.c, PixMap.h, README.mac, makefile.mac,
+	  pict.c: Remove GPL incompatible files (bug #1861841), this
+	  removes mac classic support
+	  and hopefully doesn't break anything in OS X.
 
-	* panorama.h, math.c, adjust.c, queryfeature.c, filter.h,
-	parser.c: Added panini projection. the credit goes to Thomas
-	Sharpless who rediscovered it, and to Bruno Postle, who did the
-	original math.
+2009-02-01 17:37  brunopostle
 
+	* bootstrap: support libtool-2.0 bug #2011492
 
+2009-01-17 22:35  brunopostle
+
+	* ChangeLog, math.c: fix reverse calculation for pannini (Thomas
+	  Modes)
+
+2009-01-08 23:47  brunopostle
+
+	* queryfeature.c: maximum field of view for pannini should be
+	  equivalent to related projections
+
+2009-01-03 07:22  dmg
+
+	* ChangeLog, adjust.c, filter.h, math.c, panorama.h, parser.c,
+	  queryfeature.c: 2009-01-02 dmg <dmg@...>
+	  
+	  * * adjust.c, filter.h, math.c, panorama.h, parser.c &
+	  queryfeateature.c:
+	  
+	  Fixed the panini (or should we call it pannini) and renamed
+	  previous projection as equirectangular panini. It might have to
+	  change its name
+
+2008-12-31 16:12  jim0watters
+
+	* queryfeature.c: Add missing projections for
+	  panoProjectionFeaturesQuery c/o Yuv
+
+2008-12-31 05:59  jim0watters
+
+	* ., ChangeLog, adjust.c, doc/Optimize.txt, doc/stitch.txt,
+	  filter.h, math.c, panorama.h, parser.c, queryfeature.c: adjust.c,
+	  filter.h, math.c, panorama.h, parser.c & queryfeateature.c
+	  added mirror, equisolid, orthographic, and stereographic as input
+	  image formats
+	  added equisolid, orthographic, stereographic as output panorama
+	  formats
+	  add some more defines to panorama.h to help image and pano
+	  formats
+
+2008-12-31 05:25  jim0watters
+
+	* PTcommon.c, correct.c, filter.c, morpher.c, pt_stdint.h,
+	  pteditor.c, ptpicker.c: Initialize TrformStr structure before use
+
+2008-12-29 23:05  dmg
+
+	* ChangeLog, adjust.c, filter.h, math.c, panorama.h, parser.c,
+	  queryfeature.c: 2008-12-29 dmg <dmg@...>
+	  
+	  * panorama.h, math.c, adjust.c, queryfeature.c, filter.h: Finally
+	  added the architectural.
+
+2008-12-29 21:37  dmg
+
+	* ChangeLog, queryfeature.c: 2008-12-29 dmg <dmg@...>
+	  
+	  * queryfeature.c (panoProjectionFeaturesQuery): Added querying
+	  features for panini; this will allow Hugin to use it
+
+2008-12-29 12:07  dmg
+
+	* ChangeLog, adjust.c, filter.h, math.c, panorama.h, parser.c,
+	  queryfeature.c: 2008-12-29 dmg <dmg@...>
+	  
+	  * panorama.h, math.c, adjust.c, queryfeature.c, filter.h,
+	  parser.c: Added panini projection. the credit goes to Thomas
+	  Sharpless who rediscovered it, and to Bruno Postle, who did the
+	  original math.
+
 2008-08-11  dmg  <dmg@...>
 
 	* bootstrap (have_libtool): Added support for 2.2.* version of

Added: trunk/libpano/man/.cvsignore
===================================================================
--- trunk/libpano/man/.cvsignore	                        (rev 0)
+++ trunk/libpano/man/.cvsignore	2009-02-02 20:39:35 UTC (rev 933)
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile

Added: trunk/libpano/tests/simpleStitch/reference/.cvsignore
===================================================================
--- trunk/libpano/tests/simpleStitch/reference/.cvsignore	                        (rev 0)
+++ trunk/libpano/tests/simpleStitch/reference/.cvsignore	2009-02-02 20:39:35 UTC (rev 933)
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile

Added: trunk/libpano/tests/simpleTiff16/.cvsignore
===================================================================
--- trunk/libpano/tests/simpleTiff16/.cvsignore	                        (rev 0)
+++ trunk/libpano/tests/simpleTiff16/.cvsignore	2009-02-02 20:39:35 UTC (rev 933)
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile

Added: trunk/libpano/tests/simpleTiff16/reference/.cvsignore
===================================================================
--- trunk/libpano/tests/simpleTiff16/reference/.cvsignore	                        (rev 0)
+++ trunk/libpano/tests/simpleTiff16/reference/.cvsignore	2009-02-02 20:39:35 UTC (rev 933)
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile

Modified: trunk/libpano/tools/.cvsignore
===================================================================
--- trunk/libpano/tools/.cvsignore	2009-02-01 23:34:31 UTC (rev 932)
+++ trunk/libpano/tools/.cvsignore	2009-02-02 20:39:35 UTC (rev 933)
@@ -10,3 +10,10 @@
 PTtiff2psd
 panoinfo
 PTuncrop
+PTroller
+PToptimizer
+PTmasker
+PTcrop
+PTtiffdump
+PTAInterpolate
+PTinfo


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

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

From: <dangelo@us...> - 2009-02-02 21:29

Revision: 934
          http://panotools.svn.sourceforge.net/panotools/?rev=934&view=rev
Author:   dangelo
Date:     2009-02-02 21:29:28 +0000 (Mon, 02 Feb 2009)

Log Message:
-----------
equirect -> rectilinear transform: reject points behind the camera
applied patch with biplane and triplane projections.

Modified Paths:
--------------
    trunk/libpano/ChangeLog
    trunk/libpano/math.c

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2009-02-02 20:39:35 UTC (rev 933)
+++ trunk/libpano/ChangeLog	2009-02-02 21:29:28 UTC (rev 934)
@@ -1,3 +1,10 @@
+2009-02-02 22:24  dangelo
+
+	* math.c: rect_erect: equirect -> rectilinear projection: reject
+	points behind the camera (fixes some problems with hugins fast
+	preview). Applied dualplane and triplane projection patch (by unknown
+	author).
+
 2009-02-01 23:34  brunopostle
 
 	* tools/PTmasker.c: fix for invalid format specification, bug

Modified: trunk/libpano/math.c
===================================================================
--- trunk/libpano/math.c	2009-02-02 20:39:35 UTC (rev 933)
+++ trunk/libpano/math.c	2009-02-02 21:29:28 UTC (rev 934)
@@ -575,7 +575,19 @@
 	*x_src = distanceparam * tan(phi);
 	*y_src = distanceparam / (tan( theta ) * cos(phi));
 #endif
-    return 1;
+        // normalize phi to be in the -PI, PI range
+        while(phi <= -PI)
+            phi += 2*PI;
+        while(phi > PI)
+            phi -= 2*PI;
+
+        // check if the point is "in front" of the camera
+        if (phi < -PI/2.0 || phi > PI/2.0) {
+            // behind, transform considered invalid
+            return 0;
+        } else
+            return 1;
+
 }
 // This is the cylindrical projection
 int pano_erect( double x_dest,double  y_dest, double* x_src, double* y_src, void* params)
@@ -1545,7 +1557,150 @@
     return 1;
 }
 
+/** convert from erect to biplane */
+int biplane_erect		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params )
+{
+	double x,offset;
+	if (fabs(x_dest / mp->distance) > mp->pn->precomputedValue[0]+DEG_TO_RAD(89))
+	{
+		*x_src = 0;
+		*y_src = 0;
+		return 0;
+	}
+	if(x_dest<0)
+	{
+		x = x_dest + mp->pn->precomputedValue[0] * mp->distance;
+		offset = -mp->pn->precomputedValue[1];
+	}
+	else
+	{
+		x = x_dest - mp->pn->precomputedValue[0] * mp->distance;
+		offset = mp->pn->precomputedValue[1];
+	}
+	rect_erect(x,y_dest,x_src,y_src,&mp->distance);
+	*x_src += offset;
+	return 1;
+}
 
+/** convert from biplane to erect */
+int erect_biplane		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params )
+{
+	double x, offset;
+	if(fabs(x_dest)>mp->pn->precomputedValue[1]+mp->distance*57)  // 57 = tan(89)
+	{
+		*x_src = 0;
+		*y_src = 0;
+		return 0;
+	}
+	if(x_dest<0)
+	{
+		x=x_dest + mp->pn->precomputedValue[1];
+		offset = - mp->pn->precomputedValue[0];
+	}
+	else
+	{
+		x=x_dest - mp->pn->precomputedValue[1];
+		offset = mp->pn->precomputedValue[0]; 
+	} 
+	erect_rect(x,y_dest,x_src,y_src,&mp->distance);
+	*x_src += offset * mp->distance;
+	return 1;
+}
+
+
+int biplane_distance ( double width, double b, void* params )
+{
+	if(mp->pn->formatParamCount==0)
+	{
+		mp->pn->formatParamCount = 1;
+		mp->pn->formatParam[0] = 45;
+	};
+	mp->pn->formatParam[0]= max( min(mp->pn->formatParam[0], 179), 1);
+
+	mp->pn->precomputedCount = 2;
+	mp->pn->precomputedValue[0] = DEG_TO_RAD(mp->pn->formatParam[0]) / 2;  // angle in rad
+	mp->distance = (double) width / (2.0 * (tan(mp->pn->precomputedValue[0])+tan(b/2.0 - mp->pn->precomputedValue[0])));
+	mp->pn->precomputedValue[1]=mp->distance*tan(mp->pn->precomputedValue[0]);  // offset
+	return 1;
+}
+
+int triplane_erect		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params )
+{
+	double x,offset;
+	if(fabs(x_dest / mp->distance)> mp->pn->precomputedValue[0] + DEG_TO_RAD(89))
+	{
+		*x_src = 0;
+		*y_src = 0;
+		return 0;
+	};
+	if(x_dest < -mp->pn->precomputedValue[0] / 2)
+	{
+		x=x_dest -mp->pn->precomputedValue[0] * mp->distance;
+		offset = mp->pn->precomputedValue[1];
+	}
+	else if (x_dest < mp->pn->precomputedValue[0] / 2)
+	{
+		x=x_dest;
+		offset=0;
+	}
+	else
+	{
+		x=x_dest + mp->pn->precomputedValue[0] * mp->distance;
+		offset = - mp->pn->precomputedValue[1];
+	}
+	rect_erect(x,y_dest,x_src,y_src,&mp->distance);
+	*x_src += offset;
+	return 1;
+}
+
+int erect_triplane		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params )
+{
+	double x, offset;
+	if(fabs(x_dest) > 2* mp->pn->precomputedValue[1] + 57 * mp->distance )
+	{
+		*x_src = 0;
+		*y_src = 0;
+		return 0;
+	};
+	if(x_dest < -mp->pn->precomputedValue[1])
+	{
+		x=x_dest + 2 * mp->pn->precomputedValue[1];
+		offset = - mp->pn->precomputedValue[0];
+	}
+	else if (x_dest < mp->pn->precomputedValue[1])
+	{
+		x=x_dest;
+		offset=0;
+	}
+	else
+	{
+		x=x_dest - 2 * mp->pn->precomputedValue[1];
+		offset = + mp->pn->precomputedValue[0];
+	}
+	erect_rect(x,y_dest,x_src ,y_src,&mp->distance);
+	*x_src += offset * mp->distance;
+	return 1;
+}
+
+int triplane_distance ( double width, double b, void* params )
+{
+	if(mp->pn->formatParamCount==0)
+	{
+		mp->pn->formatParamCount = 1;
+		mp->pn->formatParam[0] = 45;
+	};
+	mp->pn->formatParam[0] = max( min(mp->pn->formatParam[0], 120), 1);
+
+	mp->pn->precomputedCount = 2;
+	mp->pn->precomputedValue[0] = DEG_TO_RAD(mp->pn->formatParam[0]);  // angle in rad
+	mp->distance = (double) width / (4.0 * tan(mp->pn->precomputedValue[0]/2.0) + 2 * tan(b/2.0 - mp->pn->precomputedValue[0]));
+	mp->pn->precomputedValue[1]=mp->distance*tan(mp->pn->precomputedValue[0]/2.0);  // offset
+	return 1;
+}
+
+
+
+
 int erect_sphere_tp( double x_dest,double  y_dest, double* x_src, double* y_src, void* params)
 {
 	// params: double distanceparam


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

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

From: <dangelo@us...> - 2009-02-02 22:31

Revision: 936
          http://panotools.svn.sourceforge.net/panotools/?rev=936&view=rev
Author:   dangelo
Date:     2009-02-02 21:55:32 +0000 (Mon, 02 Feb 2009)

Log Message:
-----------
forgot to add some more files touched by the bi/triplane projection

Modified Paths:
--------------
    trunk/libpano/adjust.c
    trunk/libpano/filter.h
    trunk/libpano/panorama.h
    trunk/libpano/parser.c
    trunk/libpano/queryfeature.c

Modified: trunk/libpano/adjust.c
===================================================================
--- trunk/libpano/adjust.c	2009-02-02 21:51:29 UTC (rev 935)
+++ trunk/libpano/adjust.c	2009-02-02 21:55:32 UTC (rev 936)
@@ -730,7 +730,13 @@
       break;
     case _orthographic:
       mp->distance  = (double) pn->width / (2.0 * sin(b/2.0));
-      break;
+       break;
+	case _biplane:
+	  biplane_distance(pn->width,b,mp);
+	  break;
+	case _triplane:
+	  triplane_distance(pn->width,b,mp);
+	  break;
     default:
       // unknown
       PrintError ("SetMakeParams: Unsupported panorama projection");
@@ -878,6 +884,14 @@
     {
       SetDesc(stack[i],   erect_albersequalareaconic,     mp  ); i++; // Convert albersequalareaconic to equirect
     }
+	else if(pn->format == _biplane)
+	{
+	  SetDesc(stack[i], erect_biplane, mp ); i++;  // Convert biplane to equirect
+	}
+	else if(pn->format == _triplane)
+	{
+      SetDesc(stack[i], erect_triplane, mp ); i++;  // Convert triplane to equirect
+	}
     else if(pn->format == _equirectangular) 
     {
       // no conversion needed     
@@ -1063,7 +1077,12 @@
     case _orthographic:
       mp->distance  = (double) pn->width / (2.0 * sin(b/2.0));
       break;
-    default:
+	case _biplane:
+	  biplane_distance(pn->width,b,mp);
+	  break;
+	case _triplane:
+	  triplane_distance(pn->width,b,mp);
+	  break;    default:
       // unknown
       PrintError ("SetInvMakeParams: Unsupported panorama projection");
       // no way to report an error back to the caller...
@@ -1262,8 +1281,15 @@
     SetDesc(stack[i], sphere_tp_erect,    &(mp->distance) ); i++; // Convert equirectangular to spherical
     SetDesc(stack[i], orthographic_sphere_tp,    &(mp->distance) ); i++; // Convert spherical to orthographic
   }
-  else if(pn->format == _equirectangular) 
+  else if(pn->format == _biplane)
   {
+    SetDesc(stack[i], biplane_erect, mp ); i++;  // Convert equirectangular to biplane
+  }
+  else if(pn->format == _triplane)
+  {
+    SetDesc(stack[i], triplane_erect, mp ); i++;  // Convert equirectangular to biplane
+  }  else if(pn->format == _equirectangular) 
+  {
     // no conversion needed   
   }
   else 

Modified: trunk/libpano/filter.h
===================================================================
--- trunk/libpano/filter.h	2009-02-02 21:51:29 UTC (rev 935)
+++ trunk/libpano/filter.h	2009-02-02 21:55:32 UTC (rev 936)
@@ -857,6 +857,12 @@
 int arch_erect		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );
 int erect_arch		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );
 
+int biplane_erect		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );
+int erect_biplane		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );
+int biplane_distance ( double width, double b, void* params );
+int triplane_erect		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );
+int erect_triplane		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );
+int triplane_distance ( double width, double b, void* params );
 
 int mirror_sphere_cp	( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );	
 int mirror_pano		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );	

Modified: trunk/libpano/panorama.h
===================================================================
--- trunk/libpano/panorama.h	2009-02-02 21:51:29 UTC (rev 935)
+++ trunk/libpano/panorama.h	2009-02-02 21:55:32 UTC (rev 936)
@@ -262,6 +262,8 @@
     _architectural = 20,
     _equisolid   = 21,          // fisheye-equisolid  FOV (equisolid fisheye) = 4 * arcsin (frame size/(focal length * 4))
     _equipanini = 22,
+    _biplane = 23,
+	_triplane = 24,
 };
 
 enum
@@ -283,9 +285,11 @@
     PANO_FORMAT_ORTHOGRAPHIC = 14,
     PANO_FORMAT_EQUISOLID = 15,
     PANO_FORMAT_EQUI_PANINI = 16,
+	PANO_FORMAT_BIPLANE = 17,
+	PANO_FORMAT_TRIPLANE = 18,
 };
 
-#define PANO_FORMAT_COUNT 17
+#define PANO_FORMAT_COUNT 19
 
 enum
 {                               // Enumerates external number of image f<index>

Modified: trunk/libpano/parser.c
===================================================================
--- trunk/libpano/parser.c	2009-02-02 21:51:29 UTC (rev 935)
+++ trunk/libpano/parser.c	2009-02-02 21:55:32 UTC (rev 936)
@@ -504,6 +504,12 @@
                         case PANO_FORMAT_ARCHITECTURAL:
                             gl->pano.format = _architectural;
                             break;
+						case PANO_FORMAT_BIPLANE:
+							gl->pano.format = _biplane;
+							break;
+						case PANO_FORMAT_TRIPLANE:
+							gl->pano.format = _triplane;
+							break;
                         default:
                             PrintError( "Unknown panorama projection: %d", gl->pano.format );
                             return -1;
@@ -668,6 +674,8 @@
         case _architectural:          format = PANO_FORMAT_ARCHITECTURAL; break;
         case _orthographic:           format = PANO_FORMAT_ORTHOGRAPHIC; break;
         case _equisolid:              format = PANO_FORMAT_EQUISOLID; break;
+		case _biplane:                format = PANO_FORMAT_BIPLANE; break;
+		case _triplane:               format = PANO_FORMAT_TRIPLANE; break;
         default:                      format = -1; break;
     }
         
@@ -1031,6 +1039,12 @@
         case PANO_FORMAT_EQUISOLID:
           p->pano.format = _equisolid;
           break;
+		case PANO_FORMAT_BIPLANE:
+          p->pano.format = _biplane;
+          break;
+		case PANO_FORMAT_TRIPLANE:
+	      p->pano.format = _triplane;
+          break;
         default:
           PrintError( "Unknown panorama projection: %d", p->pano.format );
           return -1;

Modified: trunk/libpano/queryfeature.c
===================================================================
--- trunk/libpano/queryfeature.c	2009-02-02 21:51:29 UTC (rev 935)
+++ trunk/libpano/queryfeature.c	2009-02-02 21:55:32 UTC (rev 936)
@@ -94,6 +94,8 @@
   {"PanoType14","Orthographic"},
   {"PanoType15","Equisolid"},
   {"PanoType16","Equirectangular Panini"},
+  {"PanoType17","Biplane"},
+  {"PanoType18","Triplane"},
 
   // Filter Types
 
@@ -338,6 +340,8 @@
     "Orthographic",
     "Equisolid",
     "Equirectangular Panini",
+	"Biplane",
+	"Triplane",
 };
 
 static int panoFormatID[PANO_FORMAT_COUNT] = {
@@ -358,6 +362,8 @@
     _orthographic,
     _equisolid,
     _equipanini,
+	_biplane,
+	_triplane,
     };
 
 
@@ -441,6 +447,22 @@
 	    features->parm[i].maxValue = +90;
 	}
 	break;
+	case PANO_FORMAT_BIPLANE:
+        features->maxVFOV = 179;
+        features->maxHFOV = 359;
+		features->numberOfParameters = 1;
+		features->parm[0].name = "alpha";
+		features->parm[0].minValue=1;
+		features->parm[0].maxValue=179;
+		break;
+	case PANO_FORMAT_TRIPLANE:
+	    features->maxVFOV = 179;
+        features->maxHFOV = 359;
+        features->numberOfParameters = 1;
+		features->parm[0].name = "alpha";
+		features->parm[0].minValue=1;
+		features->parm[0].maxValue=120;
+		break;
     default:
 	assert(0); // A projection is missing!
 	return 0;


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

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

From: <brunopostle@us...> - 2009-02-04 23:49

Revision: 939
          http://panotools.svn.sourceforge.net/panotools/?rev=939&view=rev
Author:   brunopostle
Date:     2009-02-04 23:49:05 +0000 (Wed, 04 Feb 2009)

Log Message:
-----------
Fix of invalid write() calls, which don't appear to be used anyway. patch #2163669 (Stanislav Brabec)

Modified Paths:
--------------
    trunk/libpano/filter.c
    trunk/libpano/filter.h

Modified: trunk/libpano/filter.c
===================================================================
--- trunk/libpano/filter.c	2009-02-04 23:02:13 UTC (rev 938)
+++ trunk/libpano/filter.c	2009-02-04 23:49:05 UTC (rev 939)
@@ -1285,22 +1285,22 @@
 }
 
 /* ENDIAN aware file i/o funtions.  Used for reading and writing photoshop files */
-Boolean panoWriteUCHAR(file_spec fnum, UCHAR theChar )
+Boolean panoWriteUCHAR(nfile_spec fnum, UCHAR theChar )
 { 
-    return write( fnum, 1, &theChar ) == 1;
+    return write( fnum, &theChar, 1 ) == 1;
 }
 
-Boolean panoWriteSHORT(file_spec fnum, USHORT theShort )
+Boolean panoWriteSHORT(nfile_spec fnum, USHORT theShort )
 {
     char data[2], *d;
     d = data;
     
     assert(sizeof(USHORT) == 2);
     SHORTNUMBER( theShort, d );
-    return write( fnum, 2, data ) == 2;
+    return write( fnum, data, 2 ) == 2;
 }
 
-Boolean panoWriteINT32(file_spec fnum, ULONG theLong )
+Boolean panoWriteINT32(nfile_spec fnum, ULONG theLong )
 {
     size_t count = 4;
     char data[4], *d;
@@ -1310,19 +1310,19 @@
     
     LONGNUMBER( theLong, d );
     
-    return write( fnum, 4, data ) == 4;
+    return write( fnum, data, 4 ) == 4;
 }
 
-Boolean panoReadUCHAR(file_spec fnum, UCHAR *pChar )
+Boolean panoReadUCHAR(nfile_spec fnum, UCHAR *pChar )
 {
-    return read( fnum, 1, pChar )== 1;
+    return read( fnum, pChar, 1 )== 1;
 }
 
-Boolean panoReadSHORT(file_spec fnum, USHORT *pShort )
+Boolean panoReadSHORT(nfile_spec fnum, USHORT *pShort )
 {
     char data[2];
     char *d;
-    if (read( fnum, 2, data ) != 2) {
+    if (read( fnum, data, 2 ) != 2) {
         return FALSE;
     }
 
@@ -1333,10 +1333,10 @@
     return TRUE;
 }
 
-Boolean panoReadINT32(file_spec fnum, ULONG *pLong )
+Boolean panoReadINT32(nfile_spec fnum, ULONG *pLong )
 {
     char data[4], *d;
-    if (read( fnum, 4, data )!= 4) {
+    if (read( fnum, data, 4 )!= 4) {
         return FALSE;
     }
     d = data;

Modified: trunk/libpano/filter.h
===================================================================
--- trunk/libpano/filter.h	2009-02-04 23:02:13 UTC (rev 938)
+++ trunk/libpano/filter.h	2009-02-04 23:49:05 UTC (rev 939)
@@ -968,6 +968,7 @@
 	#include "sys_mac.h"
 	
 	#define			file_spec							short
+	#define			nfile_spec							short
 	#define			myopen( path, perm, fspec )			( FSpOpenDF( path, perm, &fspec ) != noErr )
 	#define			mywrite( fspec, count, data )		FSWrite	(fspec, &count, data) 
 	#define 		myread(  fspec, count, data )		FSRead  (fspec, &count, data) 
@@ -983,6 +984,7 @@
 			
 #else // __Mac__, use ANSI-filefunctions
 	#define		file_spec			FILE*
+	#define		nfile_spec			int
 	#define		myopen( path, perm, fspec )	( (fspec = fopen( (path)->name, perm )) == NULL)
 	#define		mywrite( fspec, count, data )	count = fwrite( data, 1, count, fspec)
 	#define 	myread( fspec, count, data )	count = fread( data, 1, count, fspec ) 
@@ -1009,12 +1011,12 @@
 #endif
 
 /* ENDIAN aware file i/o funtions.  Used for reading and writing photoshop files */
-Boolean panoWriteUCHAR(file_spec fnum, UCHAR   theChar );
-Boolean panoWriteSHORT(file_spec fnum, USHORT  theShort );
-Boolean panoWriteINT32(file_spec fnum, ULONG   theLong );
-Boolean panoReadUCHAR (file_spec fnum, UCHAR  *pChar );
-Boolean panoReadSHORT (file_spec fnum, USHORT *pShort );
-Boolean panoReadINT32 (file_spec fnum, ULONG  *pLong );
+Boolean panoWriteUCHAR(nfile_spec fnum, UCHAR   theChar );
+Boolean panoWriteSHORT(nfile_spec fnum, USHORT  theShort );
+Boolean panoWriteINT32(nfile_spec fnum, ULONG   theLong );
+Boolean panoReadUCHAR (nfile_spec fnum, UCHAR  *pChar );
+Boolean panoReadSHORT (nfile_spec fnum, USHORT *pShort );
+Boolean panoReadINT32 (nfile_spec fnum, ULONG  *pLong );
     
 
 #define PANO_DEFAULT_PIXELS_PER_RESOLUTION  150.0


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

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

From: <brunopostle@us...> - 2009-02-05 00:06

Revision: 940
          http://panotools.svn.sourceforge.net/panotools/?rev=940&view=rev
Author:   brunopostle
Date:     2009-02-05 00:06:31 +0000 (Thu, 05 Feb 2009)

Log Message:
-----------
patch fixes implicit declaration warnings, which may lead to
crashes. patch #2163691 (Stanislav Brabec)

Modified Paths:
--------------
    trunk/libpano/ColourBrightness.c
    trunk/libpano/filter.c
    trunk/libpano/pttiff.h

Modified: trunk/libpano/ColourBrightness.c
===================================================================
--- trunk/libpano/ColourBrightness.c	2009-02-04 23:49:05 UTC (rev 939)
+++ trunk/libpano/ColourBrightness.c	2009-02-05 00:06:31 UTC (rev 940)
@@ -34,6 +34,7 @@
 
 #include "tiffio.h"
 #include <assert.h>
+#include <math.h>
 
 #include "pttiff.h"
 

Modified: trunk/libpano/filter.c
===================================================================
--- trunk/libpano/filter.c	2009-02-04 23:49:05 UTC (rev 939)
+++ trunk/libpano/filter.c	2009-02-05 00:06:31 UTC (rev 940)
@@ -29,6 +29,7 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include <math.h>
 #include <tiff.h>
 #include <assert.h>

Modified: trunk/libpano/pttiff.h
===================================================================
--- trunk/libpano/pttiff.h	2009-02-04 23:49:05 UTC (rev 939)
+++ trunk/libpano/pttiff.h	2009-02-05 00:06:31 UTC (rev 940)
@@ -85,6 +85,7 @@
 void panoTiffSetErrorHandler(void);
 int panoTiffVerifyAreCompatible(fullPath * tiffFiles, int numberImages,
 				int optionalCheck);
+int panoTiffDisplayInfo(char *fileName);
 
 void panoImageDispose(Image *im) ;
 


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

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

From: <brunopostle@us...> - 2009-02-05 00:22

Revision: 941
          http://panotools.svn.sourceforge.net/panotools/?rev=941&view=rev
Author:   brunopostle
Date:     2009-02-05 00:22:11 +0000 (Thu, 05 Feb 2009)

Log Message:
-----------
Remove unmaintained makefile.linux

Modified Paths:
--------------
    trunk/libpano/Makefile.am
    trunk/libpano/README.linux

Removed Paths:
-------------
    trunk/libpano/makefile.linux

Modified: trunk/libpano/Makefile.am
===================================================================
--- trunk/libpano/Makefile.am	2009-02-05 00:06:31 UTC (rev 940)
+++ trunk/libpano/Makefile.am	2009-02-05 00:22:11 UTC (rev 941)
@@ -103,7 +103,7 @@
 	rm -rf `find $(distdir) -name .cvsignore`
 
 EXTRA_DIST =  gpl.txt README.linux README.windows \
-	      makefile.linux makefile.win32 \
+	      makefile.win32 \
 	      bootstrap filter.r libpano13.def pano13.rc \
 	      seamer_.c sys_X11.c sys_win.c bmp.c shell_mac.c \
 	      sys_mac.c ppm.c sys_ansi.c ppm.c ZComb.h adjust.h \

Modified: trunk/libpano/README.linux
===================================================================
--- trunk/libpano/README.linux	2009-02-05 00:06:31 UTC (rev 940)
+++ trunk/libpano/README.linux	2009-02-05 00:22:11 UTC (rev 941)
@@ -58,32 +58,6 @@
 
 ./bootstrap
 
-
-DEPRECATED BUILD INSTRUCTIONS
-
-Building the Library:
-
-The Java Development Kit  is required.
-It can be downloaded from http://www.javasoft.com,
-or may be contained on your Linux CD.
-
-Create a directory 'pano13', move the
-file 'panosrc.tar.gz' into this directory,
-and unpack the file using the commands
-
- gzip -d panosrc.tar.gz
-
-and
-
- tar xf panosrc.tar
-
-Then build the library using the command
-
- make -f makefile.linux libpano13.so
-
-
-Limits and Modifications:
-
 This distribution of the sources limits processing
 of fisheye images to fields of view smaller than
 160 degrees. This limit is controlled by the constant

Deleted: trunk/libpano/makefile.linux
===================================================================
--- trunk/libpano/makefile.linux	2009-02-05 00:06:31 UTC (rev 940)
+++ trunk/libpano/makefile.linux	2009-02-05 00:22:11 UTC (rev 941)
@@ -1,39 +0,0 @@
-# Makefile for libpano13.so
-
-sources = panorama.h filter.h fftn.h f2c.h pteditor.h  \
-          ptutils.h sys_win.h version.h \
-          filter.c parser.c queryfeature.c sys_win.c  correct.c perspect.c \
-          adjust.c  remap.c lmdif.c  file.c \
-	  math.c pan.c PTDialogs.c fftn.c fourier.c resample.c \
-          optimize.c morpher.c Triangulate.c \
-	  seamer.c ptpicker.c pteditor.c seamer_.c \
-          tiff.c bmp.c jpeg.c png.c  multilayer.c \
-          Makefile pano13.rc libpano13.def sys_ansi.c ppm.c
-
-objects = filter.o parser.o  queryfeature.o correct.o perspect.o \
-          adjust.o  remap.o lmdif.o  file.o math.o pan.o \
-          PTDialogs.o fftn.o fourier.o resample.o optimize.o \
-          morpher.o Triangulate.o seamer.o ptpicker.o pteditor.o \
-          tiff.o jpeg.o png.o multilayer.o 
-
-winobj =  sys_win.o bmp.o pano13rc.o
-
-ansobj =  sys_ansi.o ppm.o
-
-CC = gcc
-
-
-
-CFLAGS = -O -I /usr/lib/java/include/ -I /usr/lib/java/include/genunix -I /usr/lib/java/include/linux -I /usr/lib/java/include/linux -D__Ansi__=1
-
-
-libpano13.so  : $(objects) $(ansobj)
-	$(CC) -lm -ljpeg -ltiff -lpng -shared -o libpano13.so $(objects) $(ansobj)	
-
-	
-panosrc.tar.gz	: $(sources) Makefile
-	tar cf panosrc.tar $(sources) Makefile
-	gzip panosrc.tar
-
-install : libpano13.so
-	mv libpano13.so /usr/lib/


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

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

From: <brunopostle@us...> - 2009-02-05 00:38

Revision: 943
          http://panotools.svn.sourceforge.net/panotools/?rev=943&view=rev
Author:   brunopostle
Date:     2009-02-05 00:38:41 +0000 (Thu, 05 Feb 2009)

Log Message:
-----------
bump version to 2.9.14, sources conflicted as to whether previous version was 2.9.12 or 2.9.13

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

Modified: trunk/libpano/configure.ac
===================================================================
--- trunk/libpano/configure.ac	2009-02-05 00:30:18 UTC (rev 942)
+++ trunk/libpano/configure.ac	2009-02-05 00:38:41 UTC (rev 943)
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.5)
-AC_INIT([pano13], [2.9.12], BUG-REPORT-ADDRESS)
+AC_INIT([pano13], [2.9.14], BUG-REPORT-ADDRESS)
 AC_CONFIG_SRCDIR([PTDialogs.c])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_HEADER([config.h])

Modified: trunk/libpano/version.h
===================================================================
--- trunk/libpano/version.h	2009-02-05 00:30:18 UTC (rev 942)
+++ trunk/libpano/version.h	2009-02-05 00:38:41 UTC (rev 943)
@@ -24,13 +24,13 @@
 #define VERS2 0x00
 
 //version of preferences file, used to verify data
-#define PREF_VERSION "2.9.13 "
+#define PREF_VERSION "2.9.14 "
 
 // String style of global version
-#define VERSION "2.9.13 "
+#define VERSION "2.9.14 "
 
 // Numeric style of global version, same as VERSION with more precision
-#define PTVERSION_FILEVERSIONNUMBER 2,9,13,0
+#define PTVERSION_FILEVERSIONNUMBER 2,9,14,0
 #define PTVERSION_NAME_LONG "LongVersion"
 #define LONGVERSION VERSION ", Copyright (c) 1998-2006, H. Dersch, der@..."
 


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

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

From: <brunopostle@us...> - 2009-02-23 23:22

Revision: 952
          http://panotools.svn.sourceforge.net/panotools/?rev=952&view=rev
Author:   brunopostle
Date:     2009-02-23 22:11:03 +0000 (Mon, 23 Feb 2009)

Log Message:
-----------
reset MAX_FISHEYE_FOV to 179 degrees (was 720)

Modified Paths:
--------------
    trunk/libpano/README.linux
    trunk/libpano/README.windows
    trunk/libpano/filter.h

Modified: trunk/libpano/README.linux
===================================================================
--- trunk/libpano/README.linux	2009-02-17 23:48:47 UTC (rev 951)
+++ trunk/libpano/README.linux	2009-02-23 22:11:03 UTC (rev 952)
@@ -60,7 +60,7 @@
 
 This distribution of the sources limits processing
 of fisheye images to fields of view smaller than
-160 degrees. This limit is controlled by the constant
+179 degrees. This limit is controlled by the constant
 MAX_FISHEYE_FOV in the file filter.h. There
 is some controversy regarding the legality of processing
 hemispherical images (ie images having 180 degree field
@@ -69,5 +69,3 @@
 by patents, you can build and use your own unlimited version 
 of the library by changing the soure code.
 
-Helmut Dersch
-der@...

Modified: trunk/libpano/README.windows
===================================================================
--- trunk/libpano/README.windows	2009-02-17 23:48:47 UTC (rev 951)
+++ trunk/libpano/README.windows	2009-02-23 22:11:03 UTC (rev 952)
@@ -78,7 +78,7 @@
 
 This distribution of the sources limits processing
 of fisheye images to fields of view smaller than
-160 degrees. This limit is controlled by the constant
+179 degrees. This limit is controlled by the constant
 MAX_FISHEYE_FOV in the file filter.h. There
 is some controversy regarding the legality of processing
 hemispherical images (ie images having 180 degree field
@@ -87,5 +87,3 @@
 by patents, you can build and use your own unlimited version 
 of the library by changing the soure code.
 
-Helmut Dersch
-der@...

Modified: trunk/libpano/filter.h
===================================================================
--- trunk/libpano/filter.h	2009-02-17 23:48:47 UTC (rev 951)
+++ trunk/libpano/filter.h	2009-02-23 22:11:03 UTC (rev 952)
@@ -97,7 +97,7 @@
 								else c=(float)(x);
 
 
-#define MAX_FISHEYE_FOV		720.0
+#define MAX_FISHEYE_FOV		179.0
 
 extern int JavaUI; // Flag to indicate use of java dialogs
 void JPrintError( char* text );


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

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

From: <brunopostle@us...> - 2009-02-23 23:23

Revision: 953
          http://panotools.svn.sourceforge.net/panotools/?rev=953&view=rev
Author:   brunopostle
Date:     2009-02-23 22:18:56 +0000 (Mon, 23 Feb 2009)

Log Message:
-----------
Apply MAX_FISHEYE_FOV only if both hfov and vfov match

Modified Paths:
--------------
    trunk/libpano/adjust.c
    trunk/libpano/remap.c

Modified: trunk/libpano/adjust.c
===================================================================
--- trunk/libpano/adjust.c	2009-02-23 22:11:03 UTC (rev 952)
+++ trunk/libpano/adjust.c	2009-02-23 22:18:56 UTC (rev 953)
@@ -2727,6 +2727,8 @@
 
 static int		CheckMakeParams( aPrefs *aP)
 {
+	double im_vfov;
+	im_vfov = aP->im.hfov / aP->im.width * aP->im.height;
 	
 	if( (aP->pano.format == _rectilinear) && (aP->pano.hfov >= 180.0) )
 	{
@@ -2740,7 +2742,7 @@
 	}
 	if( (aP->mode & 7) == _insert ){
 		if( (aP->im.format == _fisheye_circ || 	aP->im.format == _fisheye_ff) &&
-		    (aP->im.hfov > MAX_FISHEYE_FOV) ){
+		    (aP->im.hfov > MAX_FISHEYE_FOV && im_vfov > MAX_FISHEYE_FOV) ){
 				PrintError("Fisheye lens processing limited to fov <= %lg", MAX_FISHEYE_FOV);
 				return -1;
 		}

Modified: trunk/libpano/remap.c
===================================================================
--- trunk/libpano/remap.c	2009-02-23 22:11:03 UTC (rev 952)
+++ trunk/libpano/remap.c	2009-02-23 22:18:56 UTC (rev 953)
@@ -184,7 +184,7 @@
       }
       break;
     case _spherical_cp:
-      if( r_prefs->hfov > MAX_FISHEYE_FOV ){
+      if( r_prefs->hfov > MAX_FISHEYE_FOV && r_prefs->vfov > MAX_FISHEYE_FOV ){
         TrPtr->success = 0;
         PrintError("Fisheye lens processing limited to fov <= %lg", MAX_FISHEYE_FOV);
         return;
@@ -233,7 +233,7 @@
       }
       break;
     case _spherical_tp:
-      if( r_prefs->hfov > MAX_FISHEYE_FOV ){
+      if( r_prefs->hfov > MAX_FISHEYE_FOV && r_prefs->vfov > MAX_FISHEYE_FOV ){
         TrPtr->success = 0;
         PrintError("Fisheye lens processing limited to fov <= %lg", MAX_FISHEYE_FOV);
         return;


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

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

From: <dmg@us...> - 2009-08-01 09:16

Revision: 1017
          http://panotools.svn.sourceforge.net/panotools/?rev=1017&view=rev
Author:   dmg
Date:     2009-08-01 09:16:46 +0000 (Sat, 01 Aug 2009)

Log Message:
-----------
2009-08-01    <dmg@...>

* parser.c: on discussion with Tom Modes I made sure that parser
saves and restores the locale.

Modified Paths:
--------------
    trunk/libpano/ChangeLog
    trunk/libpano/parser.c

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2009-08-01 02:48:16 UTC (rev 1016)
+++ trunk/libpano/ChangeLog	2009-08-01 09:16:46 UTC (rev 1017)
@@ -1,3 +1,8 @@
+2009-08-01    <dmg@...>
+
+	* parser.c: on discussion with Tom Modes I made sure that parser
+	saves and restores the locale.
+
 2009-05-01 21:01  brunopostle
 
 	* man/Makefile.am, man/PTAInterpolate.pod, man/PToptimizer.1,

Modified: trunk/libpano/parser.c
===================================================================
--- trunk/libpano/parser.c	2009-08-01 02:48:16 UTC (rev 1016)
+++ trunk/libpano/parser.c	2009-08-01 09:16:46 UTC (rev 1017)
@@ -93,6 +93,22 @@
 #define LINE_LENGTH         65536
 
                                             
+static char *oldLocale = NULL;
+
+void panoLocaleSave(void)
+{
+    char *p;
+    p=setlocale(LC_ALL, NULL);
+    oldLocale=strdup(p);
+    setlocale(LC_ALL, "C");
+}
+void panoLocaleRestore(void)
+{
+    setlocale(LC_ALL,oldLocale);
+    free(oldLocale);    
+}
+
+
 // Optimizer Script parser; fill global info structure
 
 int ParseScript( char* script, AlignInfo *gl )
@@ -111,7 +127,7 @@
     int                 n=0; // Number of parameters to optimize
     int                 numIm,numPts,nt;
 
-    setlocale(LC_ALL, "C");
+    panoLocaleSave();
 
     gl->im  = NULL;
     gl->opt = NULL;
@@ -139,7 +155,7 @@
     if( gl->im == NULL || gl->opt == NULL || gl->cpt == NULL || gl->t == NULL || gl->cim == NULL )
     {
         PrintError("Not enough memory");
-        return -1;
+        goto fail;
     }
     
     // Rik's mask-from-focus hacking
@@ -243,7 +259,7 @@
                                           case IMAGE_FORMAT_FISHEYE_STEREOGRAPHIC:      im->format = _stereographic; break;
                                           case IMAGE_FORMAT_FISHEYE_EQUISOLID:          im->format = _equisolid; break;
                                           default:  PrintError("Syntax error in script: Line %d", lineNum);
-                                                        return -1;
+                                                        goto fail;
                                                         break;
                                         }
                                         break;
@@ -389,7 +405,7 @@
                     if(  ReadControlPoint( &(gl->cpt[numPts]), &(line[1]) ) != 0 )
                     {
                         PrintError("Syntax error in script in control point 'c': Line %d", lineNum);
-                        return -1;
+                        goto fail;
                     }
                     numPts++;
                     break;
@@ -398,7 +414,7 @@
                     if( ReadModeDescription( &gl->sP, &(line[1]) ) != 0 )
                     {
                         PrintError( "Syntax error in script in mode description 'm': line %d" , lineNum);
-                        return -1;
+                        goto fail;
                     }
                     break;
                                 
@@ -456,7 +472,7 @@
                     if( ReadPanoramaDescription( &(gl->pano), &(gl->st), &(line[1]) ) != 0 )
                     {
                         PrintError( "Syntax error in panorama description p line: %d (%s)" , lineNum,line);
-                        return -1;
+                        goto fail;
                     }
                     switch (gl->pano.format) {
                         case PANO_FORMAT_RECTILINEAR:
@@ -518,12 +534,12 @@
 							break;
                         default:
                             PrintError( "Unknown panorama projection: %d", gl->pano.format );
-                            return -1;
+                            goto fail;
                     }
                     if( (gl->pano.format == _rectilinear || gl->pano.format == _trans_mercator) && gl->pano.hfov >= 180.0 )
                     {
                         PrintError( "Destination image must have HFOV < 180" );
-                        return -1;
+                        goto fail;
                     }
                     break;
 
@@ -628,7 +644,12 @@
     }
 
 
+    panoLocaleRestore();
     return 0;
+
+ fail:
+    panoLocaleRestore();
+    return -1;
 }
 
 
@@ -642,13 +663,13 @@
     int         format;
     int i;
 
-    setlocale(LC_ALL, "C");
-        
+    panoLocaleSave();
+
     hres = (char**) mymalloc( strlen(script) + g->numIm * 600 + g->numPts * 200 + 10000 ); // Do we ever need more?
     if( hres == NULL )
     {
         PrintError("Not enough memory to create resultfile");
-        return;
+        goto fail;
     }
     line = res = *hres;
     line += sprintf( line, "%s", script );
@@ -870,7 +891,13 @@
         PrintError("Could not write results to scriptfile");
     }
     if( hres ) myfree( (void**)hres );
+
+    panoLocaleRestore();
     return;
+
+ fail:
+    panoLocaleRestore();
+
 }
 
 
@@ -889,7 +916,7 @@
     int                 seti;
     
     
-    setlocale(LC_ALL, "C");
+    panoLocaleSave();
     
     
     // Set prefs and sBuf to defaults
@@ -901,7 +928,7 @@
     
     script = LoadScript( sfile );
     if( script == NULL )
-	return -1;
+	goto fail;
     
     
     // Parse script 
@@ -932,8 +959,7 @@
 	    if (!seto  && !seti) {
 		if( ReadImageDescription( &(p->im), &(p->sBuf), &(line[1]) ) != 0 ) {
 		    PrintError("Syntax error in i-line %d (%s)", lineNum, line);
-		    free(script);
-		    return -1;
+		    goto fail;
 		}
 		seti = TRUE;
         
@@ -944,8 +970,7 @@
 		// 'o' has priority over 'i' lines
 		if( ReadImageDescription( &(p->im), &(p->sBuf), &(line[1]) ) != 0 ) {
 		    PrintError( "Syntax error parsing o-line %d (%s)" , lineNum, line);
-		    free( script );
-		    return -1;
+		    goto fail;
 		}
 		seto = TRUE;
 	    }
@@ -954,8 +979,7 @@
 	    if( ReadModeDescription( sP, &(line[1]) ) != 0 )
 		{
 		    PrintError( "Syntax error in m-line %d (%s)" , lineNum, line);
-		    free( script );
-		    return -1;
+		    goto fail;
 		}
 	    break;
 	case 'p':       // panorama 
@@ -964,8 +988,7 @@
 	    if( ReadPanoramaDescription( &(p->pano), &(p->sBuf), &(line[1]) ) != 0 )
 		{
 		    PrintError( "Syntax error in line %d" , lineNum);
-		    free( script );
-		    return -1;
+		    goto fail;
 		}
       switch (p->pano.format) {
         case PANO_FORMAT_RECTILINEAR:
@@ -1027,11 +1050,11 @@
           break;
         default:
           PrintError( "Unknown panorama projection: %d", p->pano.format );
-          return -1;
+          goto fail;
         }
 	    if( (p->pano.format == _rectilinear || p->pano.format == _trans_mercator) && p->pano.hfov >= 180.0 ) {
 		PrintError( "Destination image must have HFOV < 180" );
-		return -1;
+		goto fail;
 	    }
 	    break;
         
@@ -1044,8 +1067,7 @@
     
     if( ! (seto || seti) ) {
     PrintError( "Syntax error in scriptfile (readAdjust). It contains no 'o' line");
-    free( script );
-    return -1;
+    goto fail;
     }
     
     // Create and Write changed scriptfile if inserting
@@ -1113,13 +1135,23 @@
     
     if( WriteScript( script, sfile, 0 ) != 0 )      {
         PrintError("Could not write scriptfile");
-        free( script );
-        return -1;
+        goto fail;
     }
     }
     
     free( script);
+    panoLocaleRestore();
     return 0;
+    
+ fail:
+    if (script != NULL)
+        free(script);
+    panoLocaleRestore();
+
+    return -1;
+
+
+
 }
 
 
@@ -1135,7 +1167,7 @@
     int                 numPts;
 
 
-    setlocale(LC_ALL, "C");
+    panoLocaleSave();
 
     defCn.num[0]    =   defCn.num[1] = -1;
     defCn.type      =   0;
@@ -1659,7 +1691,8 @@
     double sigma = 0;
     int n;
 
-    setlocale(LC_ALL, "C");
+    panoLocaleSave();
+
     memcpy( &theSprefs,     sP,  sizeof(sPrefs) );
 
     // set some default values
@@ -1671,7 +1704,7 @@
         {
             case 'g':   READ_VAR( "%lf", &theSprefs.gamma );
                         if( theSprefs.gamma <= 0.0 )
-                            return -1;
+                            goto fail;
                         break;
             case 'i':   READ_VAR( "%d", &theSprefs.interpolator );
                         if( theSprefs.interpolator < 0 ||  theSprefs.interpolator > 23)
@@ -1700,7 +1733,13 @@
     // appears ok
     
     memcpy( sP,  &theSprefs,    sizeof(sPrefs) );
+    panoLocaleRestore();
     return 0;
+
+ fail:
+    panoLocaleRestore();
+    return -1;
+
 }
 
 // Parse a string desscribing VRPanoOptions
@@ -1711,7 +1750,8 @@
     char            buf[LINE_LENGTH];
     VRPanoOptions   VRopt;
 
-    setlocale(LC_ALL, "C");
+    panoLocaleSave();
+
     memcpy( &VRopt, v, sizeof( VRPanoOptions ) );
         
     while( *ch != 0)
@@ -1739,6 +1779,8 @@
         }
     }
     memcpy( v, &VRopt, sizeof( VRPanoOptions ) );
+    panoLocaleRestore();
+
     return 0;
 }
 
@@ -1755,7 +1797,8 @@
     int                 nr=0,np=0;
 
 
-    setlocale(LC_ALL, "C");
+    panoLocaleSave();
+
     // Determine number of images and control points
 
 
@@ -1796,20 +1839,29 @@
                     if( ReadCoordinates( &tP->p[np++], &(line[1]) ) != 0 )
                     {
                         PrintError( "Syntax error in line %d" , lineNum);
-                        return -1;
+                        goto fail;
                     }
                     break;
         case 'R':   // Coordinate values requested
                     if( ReadCoordinates( &tP->r[nr++], &(line[1]) ) != 0 )
                     {
                         PrintError( "Syntax error in line %d" , lineNum);
-                        return -1;
+                        goto fail;
                     }
                     break;
          default: break;
         }
     }
+    panoLocaleRestore();
+
     return 0;
+
+ fail:
+    panoLocaleRestore();
+
+    return -1;
+    
+
 }
 
 
@@ -1863,14 +1915,14 @@
     void                *tmp;
 
 
-    setlocale(LC_ALL, "C");
+    panoLocaleSave();
     
     // Determine number of morph control points
 
 
     gl->numPts  = numLines( script, 'C' );
     if( gl->numPts == 0 )
-        return 0;
+        goto success;
 
     // Allocate Space for Pointers to images, preferences and control points
     
@@ -1879,7 +1931,7 @@
     if( gl->cpt == NULL )
     {
         PrintError("Not enough memory");
-        return -1;
+        goto fail;
     }
 
 
@@ -1906,7 +1958,7 @@
                     if(  ReadControlPoint( &cp, &(line[1]) ) != 0 )
                     {
                         PrintError( "Syntax error in line %d" , lineNum);
-                        return -1;
+                        goto fail;
                     }
                     if( cp.num[0] == nIm )
                     {
@@ -1921,10 +1973,16 @@
     
 
     tmp =  realloc( gl->cpt, np * sizeof( controlPoint ) );
-    if( tmp == NULL )   return -1;
+    if( tmp == NULL )   goto fail;
     gl->numPts=np; gl->cpt = (controlPoint*)tmp; 
 
+ success:
+    panoLocaleRestore();
+
     return np;
+ fail:
+    panoLocaleRestore();
+    return -1;
 
 }
 


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

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

From: <dmg@us...> - 2009-08-14 06:15

Revision: 1031
          http://panotools.svn.sourceforge.net/panotools/?rev=1031&view=rev
Author:   dmg
Date:     2009-08-14 06:14:58 +0000 (Fri, 14 Aug 2009)

Log Message:
-----------
2009-08-13    <dmg@...>

	* PTcommon.c (panoCreatePanorama):  Added support for uncropped
	TIFF_m, but only when it is not circular fisheye

	* tests/panoAutomateTest.pl (Compare_Images): Added support for
	uncropped and cropped images.

	* Updated tests 

Modified Paths:
--------------
    trunk/libpano/ChangeLog
    trunk/libpano/PTcommon.c
    trunk/libpano/tests/panoAutomateTest.pl
    trunk/libpano/tests/simpleStitch/reference/tiff_m_uncropped0000.tif
    trunk/libpano/tests/simpleStitch/reference/tiff_m_uncropped0001.tif
    trunk/libpano/tests/simpleTiff16/reference/tiff_m0000.tif
    trunk/libpano/tests/simpleTiff16/temp.txt

Added Paths:
-----------
    trunk/libpano/tests/simpleTiff16/reference/tiff_m_uncropped0000.tif

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2009-08-14 06:05:12 UTC (rev 1030)
+++ trunk/libpano/ChangeLog	2009-08-14 06:14:58 UTC (rev 1031)
@@ -1,3 +1,13 @@
+2009-08-13    <dmg@...>
+
+	* PTcommon.c (panoCreatePanorama):  Added support for uncropped
+	TIFF_m, but only when it is not circular fisheye
+
+	* tests/panoAutomateTest.pl (Compare_Images): Added support for
+	uncropped and cropped images.
+
+	* Updated tests 
+
 2009-08-01    <dmg@...>
 
 	* parser.c: on discussion with Tom Modes I made sure that parser

Modified: trunk/libpano/PTcommon.c
===================================================================
--- trunk/libpano/PTcommon.c	2009-08-14 06:05:12 UTC (rev 1030)
+++ trunk/libpano/PTcommon.c	2009-08-14 06:14:58 UTC (rev 1031)
@@ -731,14 +731,7 @@
         //to ever disable this feature, other than for testing/debugging purposes.
 
 
-	// By default we do cropped TIFF,
-	// but at this point we cannot properly calculate the ROI for fisheyes, so just
-	// process them uncropped.
 
-	if (prefs->im.format == _fisheye_circ) {
-	    croppedTIFFIntermediate = 0;
-	} 
-
         colourCorrection = prefs->sBuf.colcorrect;
         // This is a strange value:
         // colourCorrection == (i & 3) + (i+1)*4;
@@ -777,7 +770,24 @@
         --tempString;           /* nextWord does ++ before testing anything, this guarantess proper execution */
         nextWord(output_file_format, &tempString);
         
-	if (loopCounter == 0 && strcmp(output_file_format, "TIFF_m") != 0) {
+	if (strcmp(output_file_format, "TIFF_m") == 0 ) {
+            // CHeck if we are suppose to do cropped or uncropped
+            croppedTIFFIntermediate = 1;
+            nextWord(output_file_format, &tempString);
+            if (strcmp(output_file_format, "") == 0 || 
+                strcmp(output_file_format, "r:CROP") == 0
+                ) {
+                // DO uncropped by default unless we are fisheye
+                if (prefs->im.format == _fisheye_circ) {
+                    PrintError("Cropped output is unsupported for circular fisheye lenses. Ignored");
+                    croppedTIFFIntermediate = 0;
+                } 
+            } else if (strcmp(output_file_format, "r:UNCROP") == 0) {
+                croppedTIFFIntermediate = 0;
+            } else {
+                PrintError("Unsupported option in TIFF_m output (%s). Ignored", output_file_format);
+            }
+        } else {
 	    PrintError("No support for this ouput image format (%s). Output will be TIFF_m", output_file_format);
 	}
 

Modified: trunk/libpano/tests/panoAutomateTest.pl
===================================================================
--- trunk/libpano/tests/panoAutomateTest.pl	2009-08-14 06:05:12 UTC (rev 1030)
+++ trunk/libpano/tests/panoAutomateTest.pl	2009-08-14 06:14:58 UTC (rev 1031)
@@ -73,9 +73,10 @@
 #    'tiff_none' => "TIFF c:NONE",          # simple tiff output
 #    'tiff_lzw' => "TIFF c:LZW",          # simple tiff output
 #    'tiff_deflate' => "TIFF c:DEFLATE",          # simple tiff output
-#    'tiff_m' => "TIFF_m",        #  
+    'tiff_m' => "TIFF_m",        #  
 #    'tiff_mask' => "TIFF_mask",
     'tiff_m_cropped'   => "TIFF_m r:CROP",
+    'tiff_m_uncropped'   => "TIFF_m r:UNCROP",
 #    'psd' => "PSD",
 #    'psd_nomask' => "PSD_nomask",
 #    'psd_mask' => "PSD_mask",
@@ -149,48 +150,20 @@
     if (! $onlyTest) {
       Create_Script($type, $pre, $post, $outputFormat);
       
-      if ($type =~ "tiff_m") {
-	Remove_Images("output", "tif", $images, $destination, $type);
-      } else {
-	`rm -f $destination/$savedFile{$type}`;
-      }
+      Remove_Images("output", "tif", $images, $destination, $type);
       
-      
       print "Creating panorama.. please wait\n";
       system ($stitcher, '-o', 'output' , 'temp.txt');
       
       
-      if ($type =~ "tiff_m") {
-	Move_Images("output", "tif", $images, $destination, $type);
-      } else {
-	`mv -f $outputFile{$type} $destination/$savedFile{$type}`;
-      }
+      Move_Images("output", "tif", $images, $destination, $type);
       
     }
     if (! $createNewReferences) {
 	
 	my $output = "";
 
-	if ($type =~ "tiff_m") {
-	    $output = Compare_Images("tif", $images, "tests", "reference", $type);
-	} else {
-	    
-	  defined $savedFile{$type} || die "\$savedFile{$type} is not defined";
-	  
-	  if (! -f "reference/$savedFile{$type}") {
-	    printf("Reference file 'reference/$savedFile{$type}' does not exist\n");
-	    $output = "fail";
-	  } elsif (! -f "tests/$savedFile{$type}") {
-	    printf("Output file tests/$savedFile{$type} was not created\n");
-	    $output = "fail";
-	  } else {	    
-	      if ($savedFile{$type} =~ /\.tif/) {
-		  $output = `tiffcmp reference/$savedFile{$type} tests/ | grep -v 'Created by Panotools'`;	      
-	      } else {
-		  $output = `diff reference/$savedFile{$type} tests/`;	      
-	      }
-	  }
-	}
+        $output = Compare_Images("tif", $images, "tests", "reference", $type);
 	
 	if ($output eq "") {
 	  printf "\nTest $type................................. passed\n\n";
@@ -291,3 +264,12 @@
     
     close OUT;
 }
+
+
+sub execute
+{
+    my ($c) = @_;
+    `$c`;
+    my $status = ($? >> 8);
+    die "execution of program [$c] failed: status [$status]" if ($status != 0);
+}

Modified: trunk/libpano/tests/simpleStitch/reference/tiff_m_uncropped0000.tif
===================================================================
(Binary files differ)

Modified: trunk/libpano/tests/simpleStitch/reference/tiff_m_uncropped0001.tif
===================================================================
(Binary files differ)

Modified: trunk/libpano/tests/simpleTiff16/reference/tiff_m0000.tif
===================================================================
(Binary files differ)

Added: trunk/libpano/tests/simpleTiff16/reference/tiff_m_uncropped0000.tif
===================================================================
(Binary files differ)


Property changes on: trunk/libpano/tests/simpleTiff16/reference/tiff_m_uncropped0000.tif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/libpano/tests/simpleTiff16/temp.txt
===================================================================
--- trunk/libpano/tests/simpleTiff16/temp.txt	2009-08-14 06:05:12 UTC (rev 1030)
+++ trunk/libpano/tests/simpleTiff16/temp.txt	2009-08-14 06:14:58 UTC (rev 1031)
@@ -1,6 +1,6 @@
 # PTStitcher script, written by hugin
 
-p f0 w60 h297 v22   n"TIFF_m r:CROP"
+p f0 w60 h297 v22   n"TIFF_m r:UNCROP"
 m g1 i7 f0
 
 # output image lines


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

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

From: <dmg@us...> - 2009-08-14 18:36

Revision: 1033
          http://panotools.svn.sourceforge.net/panotools/?rev=1033&view=rev
Author:   dmg
Date:     2009-08-14 18:36:07 +0000 (Fri, 14 Aug 2009)

Log Message:
-----------
2009-08-14    <dmg@...>

* Updated tests cases to reflect the slight change in the
boundaries of the ROI.

* adjust.c, math.c, filter.h: The inverse of shear was broken. I
have added a shearInv function that takes care of this bug.

* PTcommon.c (getROI): Improved its computation of its edges to
make it err on the outside rather than on the inside of the actual
area. I have also added code to test the inverse computations for
any particular function.

Modified Paths:
--------------
    trunk/libpano/ChangeLog
    trunk/libpano/PTcommon.c
    trunk/libpano/adjust.c
    trunk/libpano/filter.h
    trunk/libpano/math.c
    trunk/libpano/tests/simpleStitch/reference/tiff_m0000.tif
    trunk/libpano/tests/simpleStitch/reference/tiff_m_cropped0000.tif
    trunk/libpano/tests/simpleStitch/reference/tiff_m_cropped0001.tif
    trunk/libpano/tests/simpleTiff16/reference/tiff_m0000.tif
    trunk/libpano/tests/simpleTiff16/reference/tiff_m_cropped0000.tif

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2009-08-14 17:44:44 UTC (rev 1032)
+++ trunk/libpano/ChangeLog	2009-08-14 18:36:07 UTC (rev 1033)
@@ -1,3 +1,17 @@
+2009-08-14    <dmg@...>
+
+	* Updated tests cases to reflect the slight change in the
+	boundaries of the ROI.
+	
+	* adjust.c, math.c, filter.h: The inverse of shear was broken. I
+	have added a shearInv function that takes care of this bug.
+
+	* PTcommon.c (getROI): Improved its computation of its edges to
+	make it err on the outside rather than on the inside of the actual
+	area. I have also added code to test the inverse computations for
+	any particular function.
+	
+
 2009-08-13    <dmg@...>
 
 	* PTcommon.c (panoCreatePanorama):  Added support for uncropped

Modified: trunk/libpano/PTcommon.c
===================================================================
--- trunk/libpano/PTcommon.c	2009-08-14 17:44:44 UTC (rev 1032)
+++ trunk/libpano/PTcommon.c	2009-08-14 18:36:07 UTC (rev 1033)
@@ -30,7 +30,6 @@
 #include "filter.h"
 #include "PTcommon.h"
 #include "ColourBrightness.h"
-
 #include "pttiff.h"
 #include "file.h"
 #include "PTcommon.h"
@@ -38,6 +37,7 @@
 
 #include <assert.h>
 #include <float.h>
+#include <math.h>
 
 //#include <stdio.h>
 //#include <stdlib.h>
@@ -465,11 +465,16 @@
 {
     struct MakeParams mpinv;
     fDesc invstack[15], finvD;
+#ifndef NDEBUG                        
+    struct MakeParams mp;
+    fDesc stack[15], fD;
+#endif
     int color = 0;
 
     int x, y, x_jump;
     double x_d, y_d;            // Cartesian Coordinates of point in source (i.e. input) image
     double Dx, Dy;              // Coordinates of corresponding point in destination (i.e. output) image
+    double Dx2, Dy2;              // Coordinates of corresponding point in destination (i.e. output) image
 
     double w2 = (double) TrPtr->dest->width / 2.0 - 0.5;        //half destination image width
     double h2 = (double) TrPtr->dest->height / 2.0 - 0.5;       //half destination image height
@@ -482,10 +487,14 @@
     ROIRect->top = TrPtr->dest->height - 1;
     ROIRect->bottom = 0;
 
-    //The "forward" transform (although not used here) allows us to map pixel
+#ifndef NDEBUG                        
+    //The "forward" transform allows us to map pixel
     //coordinates in the output image to their location in the source image.
-    //SetMakeParams( stack, &mp, &(aP->im) , &(aP->pano), color );
-    //fD.func = execute_stack; fD.param = stack;
+    // We use it to test the inverse functions of libpano
+    SetMakeParams( stack, &mp, &(aP->im) , &(aP->pano), color );
+    fD.func = execute_stack_new; 
+    fD.param = stack;
+#endif
 
     //The "inverse" transform allows us to map pixel coordinates in each source image
     //to their location in the output image.
@@ -501,45 +510,73 @@
     //needed here, but for now include some representative interior points as well.
     for (y = 0; y <= TrPtr->src->height; y += 1) {
         
-                x_jump = (y==0 || y==TrPtr->src->height || abs(y - TrPtr->src->height/2)<=5) ? 1 : TrPtr->src->width/2; 
-                
+        x_jump = (y==0 || y==TrPtr->src->height || abs(y - TrPtr->src->height/2)<=5) ? 1 : TrPtr->src->width/2; 
+
                 for (x = 0; x <= TrPtr->src->width; x += x_jump) {
                         //convert source coordinates to cartesian coordinates (i.e. origin at center of image)
                         x_d = (double) x - sw2 ;
                         y_d = (double) y - sh2 ;
-                        
+
                         //Map the source image cartesian coordinate to the destination image cartesian coordinate
                         finvD.func( x_d, y_d, &Dx, &Dy, finvD.param);
                         
+#ifndef NDEBUG                        
+                        fD.func( Dx, Dy, &Dx2, &Dy2, fD.param);
+                        {
+                            int newX, newY;
+                            if (!isnan(Dx2) && !isnan(Dy2)) {
+
+                                newX = (int)(Dx2 + 0.5 + sw2);
+                                newY = (int)(Dy2 + 0.5 + sh2);
+
+                                if (newX != x || newY != y) {
+                                    printf("  IN1: %f,%f (%d,%d) -> OUT: %f, %f inv -> %f %f    (%d, %d)\n", x_d, y_d, 
+                                           x,y,
+                                           Dx, Dy, Dx2, Dy2, 
+                                           newX, newY
+                                           );
+                                }
+                                // If this assertion fails, there is an error. The question is, how big? See the values above.
+                                // it is possible that the error is so small that it does not matter.
+                                assert(fabs(newX-x) <= 1.0);
+                                assert(fabs(newY-y) <= 1.0);
+                            }
+
+                        }
+                          //printf("  IN1: %f,%f -> OUT: %f, %f inv -> %f %f    (%d, %d)\n", x_d, y_d, Dx, Dy, Dx2, Dy2, (int)(Dx +0.5), (int)(Dy+0.5));
+                          //printf("  IN3: %d,%d -> OUT: %f, %f   (%d, %d)\n", x, y, Dx, Dy, (int)(Dx +0.5), (int)(Dy+0.5));
+#endif
+                        
                         //Convert destination cartesian coordinate back to destination "screen" coordinates (i.e. origin at top left of image)
                         Dx += w2;
                         Dy += h2;
-                        
-                        //printf("  IN: %d,%d -> OUT: %f, %f   (%d, %d)\n", x, y, Dx, Dy, (int)Dx, (int)Dy);
-                        
+
                         //Expand ROI if necessary
                         //I've observed that in some cases, the mapping function returns
                         //a value of "-1.#IND00".  This is not a number, and probably indicates
                         //a divide by zero error somewhere in the mapping function.  This should
                         //be solved, but, for now, discard this value and keep going
                         if (!isnan(Dx)) {
-                                if ((int)Dx < ROIRect->left) ROIRect->left = (int)Dx;
-                                if ((int)Dx > ROIRect->right) ROIRect->right = (int)Dx;
+                            if ((int)Dx < ROIRect->left) ROIRect->left = (int)(Dx + 0.5);
+                            if ((int)Dx > ROIRect->right) ROIRect->right = (int)(Dx + 0.5);
                         }
                         if (!isnan(Dy)){                
-                                if ((int)Dy < ROIRect->top) ROIRect->top = (int)Dy;
-                                if ((int)Dy > ROIRect->bottom) ROIRect->bottom = (int)Dy;
+                            if ((int)Dy < ROIRect->top) ROIRect->top = (int)(Dy + 0.5);
+                            if ((int)Dy > ROIRect->bottom) ROIRect->bottom = (int)(Dy + 0.5);
                         }
                 }
         }
         
+    // printf("ROI1: %ld,%ld - %ld, %ld\n", ROIRect->left, ROIRect->top, ROIRect->right, ROIRect->bottom);
+
+
         //Reduce ROI if it extends beyond boundaries of final panorama region
         if (ROIRect->left    < 0) ROIRect->left =0;
         if (ROIRect->top     < 0) ROIRect->top  =0;
         if (ROIRect->right   > (TrPtr->dest->width-1))  ROIRect->right    = TrPtr->dest->width-1;  
         if (ROIRect->bottom  > (TrPtr->dest->height-1)) ROIRect->bottom   = TrPtr->dest->height-1;
         
-        //printf("ROI: %d,%d - %d, %d\n", ROIRect->left, ROIRect->top, ROIRect->right, ROIRect->bottom);
+        printf("ROI2: %ld,%ld - %ld, %ld\n", ROIRect->left, ROIRect->top, ROIRect->right, ROIRect->bottom);
 }
 
 
@@ -1706,7 +1743,7 @@
     strcpy(outputPrefix, defaultPrefix);
     bzero(&croppingParms, sizeof(croppingParms));
     
-    printf(version);
+    printf("%s", version);
     
     //Need enough space for a message to be returned if something goes wrong
   
@@ -1735,7 +1772,7 @@
             ptQuietFlag = 1;
             break;
         case 'h':
-            printf(usage);
+            printf("%s",usage);
             exit(0);
         default:
             break;
@@ -1745,7 +1782,7 @@
 
     if (filesCount < 1) {
         PrintError("No files specified in the command line");
-        printf(usage);
+        printf("%s",usage);
         exit(0);
     }
     // Allocate memory for filenames

Modified: trunk/libpano/adjust.c
===================================================================
--- trunk/libpano/adjust.c	2009-08-14 17:44:44 UTC (rev 1032)
+++ trunk/libpano/adjust.c	2009-08-14 18:36:07 UTC (rev 1033)
@@ -793,8 +793,9 @@
     printf("rot[0] %f\n", mp->rot[0]);
     printf("rot[1] %f\n", mp->rot[1]);
     printf("scale[0] %f\n", mp->rot[0]);
+    printf("mp->horizontal %f\n", mp->horizontal);
+    printf("mp->vertical %f\n", mp->vertical);
     */
-
     mp->perspect[0] = (void*)(mp->mt);
     mp->perspect[1] = (void*)&(mp->distance);
             
@@ -1124,8 +1125,8 @@
   }
   mp->scale[1]    = mp->scale[0];
 
-  mp->shear[0]  = -im->cP.shear_x / im->height;
-  mp->shear[1]  = -im->cP.shear_y / im->width;
+  mp->shear[0]  = im->cP.shear_x / im->height;
+  mp->shear[1]  = im->cP.shear_y / im->width;
   
   mp->scale[0] = 1.0 / mp->scale[0];
   mp->scale[1]  = mp->scale[0];
@@ -1147,14 +1148,22 @@
 
   mp->perspect[0] = (void*)(mp->mt);
   mp->perspect[1] = (void*)&(mp->distance);
-
-
+  /*
+    printf("Image format %d\n", im->format);
+    printf("shear[0] %f\n", mp->shear[0]);
+    printf("shear[1] %f\n", mp->shear[1]);
+    printf("rot[0] %f\n", mp->rot[0]);
+    printf("rot[1] %f\n", mp->rot[1]);
+    printf("scale[0] %f\n", mp->rot[0]);
+    printf("mp->horizontal %f\n", mp->horizontal);
+    printf("mp->vertical %f\n", mp->vertical);
+    */
   i = 0;  // Stack counter
     
     // Perform radial correction
   if( im->cP.shear )
   {
-    SetDesc( stack[i],shear,      mp->shear   ); i++;
+    SetDesc( stack[i],shearInv,      mp->shear   ); i++;
   }
     
   if ( im->cP.horizontal )

Modified: trunk/libpano/filter.h
===================================================================
--- trunk/libpano/filter.h	2009-08-14 17:44:44 UTC (rev 1032)
+++ trunk/libpano/filter.h	2009-08-14 18:36:07 UTC (rev 1033)
@@ -808,6 +808,7 @@
 
 int resize				( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );		
 int shear				( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );	
+int shearInv				( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );	
 int horiz				( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );	
 int vert				( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );	
 int radial				( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );	

Modified: trunk/libpano/math.c
===================================================================
--- trunk/libpano/math.c	2009-08-14 17:44:44 UTC (rev 1032)
+++ trunk/libpano/math.c	2009-08-14 18:36:07 UTC (rev 1033)
@@ -379,6 +379,15 @@
     return 1;
 }
 
+int shearInv( double x_dest, double y_dest, double* x_src, double* y_src, void* params)
+{
+	// params: double shear_horizontal, double shear_vertical;
+
+    *y_src  = (y_dest - var1 * x_dest) / (1 - var1 * var0);
+    *x_src  = (x_dest - var0 * *y_src);
+    return 1;
+}
+
 int horiz( double x_dest, double y_dest, double* x_src, double* y_src, void* params)
 {
 	// params: double horizontal shift

Modified: trunk/libpano/tests/simpleStitch/reference/tiff_m0000.tif
===================================================================
(Binary files differ)

Modified: trunk/libpano/tests/simpleStitch/reference/tiff_m_cropped0000.tif
===================================================================
--- trunk/libpano/tests/simpleStitch/reference/tiff_m_cropped0000.tif	2009-08-14 17:44:44 UTC (rev 1032)
+++ trunk/libpano/tests/simpleStitch/reference/tiff_m_cropped0000.tif	2009-08-14 18:36:07 UTC (rev 1033)
@@ -1,96 +1,96 @@
-II*

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

From: <brunopostle@us...> - 2009-09-03 14:08

Revision: 1039
          http://panotools.svn.sourceforge.net/panotools/?rev=1039&view=rev
Author:   brunopostle
Date:     2009-09-03 14:08:33 +0000 (Thu, 03 Sep 2009)

Log Message:
-----------
Add a pkgconfig support with a libpano13.pc file (Andreas Metzler)

Modified Paths:
--------------
    trunk/libpano/Makefile.am
    trunk/libpano/configure.ac

Added Paths:
-----------
    trunk/libpano/libpano13.pc.in

Modified: trunk/libpano/Makefile.am
===================================================================
--- trunk/libpano/Makefile.am	2009-08-24 15:57:25 UTC (rev 1038)
+++ trunk/libpano/Makefile.am	2009-09-03 14:08:33 UTC (rev 1039)
@@ -94,6 +94,11 @@
 
 noinst_HEADERS = $(INTERNAL_HDR) $(SYS_HDR) $(MAC_HDR)
 
+# Pkg-config script.
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libpano13.pc
+DISTCLEANFILES = $(pkgconfig_DATA)
+
 SUBDIRS=m4 . tools doc build tests man
 
 distdir=lib$(PACKAGE)-$(VERSION)

Modified: trunk/libpano/configure.ac
===================================================================
--- trunk/libpano/configure.ac	2009-08-24 15:57:25 UTC (rev 1038)
+++ trunk/libpano/configure.ac	2009-09-03 14:08:33 UTC (rev 1039)
@@ -142,7 +142,7 @@
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([floor memset pow setlocale sqrt strrchr])
 
-AC_CONFIG_FILES([Makefile build/Makefile build/win32/Makefile doc/Makefile m4/Makefile tools/Makefile tests/Makefile tests/simpleStitch/Makefile tests/simpleTiff16/Makefile tests/simpleStitch/reference/Makefile tests/simpleTiff16/reference/Makefile man/Makefile])
+AC_CONFIG_FILES([Makefile build/Makefile build/win32/Makefile doc/Makefile m4/Makefile tools/Makefile tests/Makefile tests/simpleStitch/Makefile tests/simpleTiff16/Makefile tests/simpleStitch/reference/Makefile tests/simpleTiff16/reference/Makefile man/Makefile libpano13.pc])
 
 AC_SUBST(ac_aux_dir)
 

Added: trunk/libpano/libpano13.pc.in
===================================================================
--- trunk/libpano/libpano13.pc.in	                        (rev 0)
+++ trunk/libpano/libpano13.pc.in	2009-09-03 14:08:33 UTC (rev 1039)
@@ -0,0 +1,23 @@
+# Process this file with autoconf to produce a pkg-config metadata file.
+# Copyright (C) 2009 Andreas Metzler
+ 
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+# 
+# This file is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libpano13
+Description: cross-platform library behind Panorama Tools and many other GUI photo stitchers
+URL: http://sourceforge.net/projects/panotools/
+Version: @VERSION@
+Libs: -L${libdir} -lpano13
+Libs.private: @LIB_JPEG@ @LIB_PNG@ @LIB_TIFF@ @LIB_ZLIB@
+Cflags: -I${includedir}


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

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

From: <brunopostle@us...> - 2009-09-03 17:13

Revision: 1040
          http://panotools.svn.sourceforge.net/panotools/?rev=1040&view=rev
Author:   brunopostle
Date:     2009-09-03 17:13:32 +0000 (Thu, 03 Sep 2009)

Log Message:
-----------
Fixes for implicit declarations (Stanislav Brabec)

Modified Paths:
--------------
    trunk/libpano/adjust.h
    trunk/libpano/parser.c

Modified: trunk/libpano/adjust.h
===================================================================
--- trunk/libpano/adjust.h	2009-09-03 14:08:33 UTC (rev 1039)
+++ trunk/libpano/adjust.h	2009-09-03 17:13:32 UTC (rev 1040)
@@ -26,3 +26,4 @@
 // sigma = 0 disables the m-estimator
 void setFcnPanoHuberSigma(double sigma);
 
+int EvaluateControlPointErrorAndComponents (int num, double *errptr, double errComponent[2]);

Modified: trunk/libpano/parser.c
===================================================================
--- trunk/libpano/parser.c	2009-09-03 14:08:33 UTC (rev 1039)
+++ trunk/libpano/parser.c	2009-09-03 17:13:32 UTC (rev 1040)
@@ -46,6 +46,7 @@
 #include <locale.h>
 
 #include "ZComb.h"
+#include "adjust.h"
 
 
 /* defined in adjust.c */


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

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

From: <brunopostle@us...> - 2009-09-03 17:26

Revision: 1041
          http://panotools.svn.sourceforge.net/panotools/?rev=1041&view=rev
Author:   brunopostle
Date:     2009-09-03 17:26:05 +0000 (Thu, 03 Sep 2009)

Log Message:
-----------
Bump version and soname

Modified Paths:
--------------
    trunk/libpano/Makefile.am
    trunk/libpano/configure.ac
    trunk/libpano/version.h

Modified: trunk/libpano/Makefile.am
===================================================================
--- trunk/libpano/Makefile.am	2009-09-03 17:13:32 UTC (rev 1040)
+++ trunk/libpano/Makefile.am	2009-09-03 17:26:05 UTC (rev 1041)
@@ -64,7 +64,7 @@
 if HAVE_LINUX
 LIN_SRC =  sys_ansi.c ppm.c
 LIN_DEFS = -D__Ansi__=1
-LIN_LDFS = -version-info 1:0:0
+LIN_LDFS = -version-info 2:0:0
 
 install-exec-hook:
 	@true
@@ -74,7 +74,7 @@
 if HAVE_DARWIN
 DAR_SRC =  sys_ansi.c ppm.c
 DAR_DEFS = -D__Ansi__=1
-DAR_LDFS = -version-info 1:0:0
+DAR_LDFS = -version-info 2:0:0
 
 install-exec-hook:
 	@true

Modified: trunk/libpano/configure.ac
===================================================================
--- trunk/libpano/configure.ac	2009-09-03 17:13:32 UTC (rev 1040)
+++ trunk/libpano/configure.ac	2009-09-03 17:26:05 UTC (rev 1041)
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.5)
-AC_INIT([pano13], [2.9.14], BUG-REPORT-ADDRESS)
+AC_INIT([pano13], [2.9.15], BUG-REPORT-ADDRESS)
 AC_CONFIG_SRCDIR([PTDialogs.c])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_HEADER([config.h])

Modified: trunk/libpano/version.h
===================================================================
--- trunk/libpano/version.h	2009-09-03 17:13:32 UTC (rev 1040)
+++ trunk/libpano/version.h	2009-09-03 17:26:05 UTC (rev 1041)
@@ -24,13 +24,13 @@
 #define VERS2 0x00
 
 //version of preferences file, used to verify data
-#define PREF_VERSION "2.9.14 "
+#define PREF_VERSION "2.9.15 "
 
 // String style of global version
-#define VERSION "2.9.14 "
+#define VERSION "2.9.15 "
 
 // Numeric style of global version, same as VERSION with more precision
-#define PTVERSION_FILEVERSIONNUMBER 2,9,14,0
+#define PTVERSION_FILEVERSIONNUMBER 2,9,15,0
 #define PTVERSION_NAME_LONG "LongVersion"
 #define LONGVERSION VERSION ", Copyright (c) 1998-2006, H. Dersch, der@..."
 


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

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

From: <dmg@us...> - 2009-09-10 06:41

Revision: 1044
          http://panotools.svn.sourceforge.net/panotools/?rev=1044&view=rev
Author:   dmg
Date:     2009-09-10 06:41:20 +0000 (Thu, 10 Sep 2009)

Log Message:
-----------
2009-09-09    <dmg@...>

* PTcommon.c, panorama.h, pt_stdint.h, math.c, adjust.c
PTcommon.c, filter.h, parser.c, correct.c: Integrated Dev"s
implementation of tilt, extended to support rotation of the camera
before independent of roll,pitch,yaw. The new parameters are:
Tx,Ty,Tz,Ts (tilt on x axis, y axis, z axis, and scaling of field
of view in the transformation). Supported by PTmender and PToptimizer

Modified Paths:
--------------
    trunk/libpano/ChangeLog
    trunk/libpano/PTcommon.c
    trunk/libpano/adjust.c
    trunk/libpano/correct.c
    trunk/libpano/filter.h
    trunk/libpano/math.c
    trunk/libpano/panorama.h
    trunk/libpano/parser.c
    trunk/libpano/pt_stdint.h

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2009-09-07 20:28:26 UTC (rev 1043)
+++ trunk/libpano/ChangeLog	2009-09-10 06:41:20 UTC (rev 1044)
@@ -1,3 +1,12 @@
+2009-09-09    <dmg@...>
+
+	* PTcommon.c, panorama.h, pt_stdint.h, math.c, adjust.c
+	PTcommon.c, filter.h, parser.c, correct.c: Integrated Dev"s
+	implementation of tilt, extended to support rotation of the camera
+	before independent of roll,pitch,yaw. The new parameters are:
+	Tx,Ty,Tz,Ts (tilt on x axis, y axis, z axis, and scaling of field
+	of view in the transformation). Supported by PTmender and PToptimizer
+
 2009-09-03 17:26  brunopostle
 
 	* Makefile.am, configure.ac, version.h: Bump version and soname

Modified: trunk/libpano/PTcommon.c
===================================================================
--- trunk/libpano/PTcommon.c	2009-09-07 20:28:26 UTC (rev 1043)
+++ trunk/libpano/PTcommon.c	2009-09-10 06:41:20 UTC (rev 1044)
@@ -27,6 +27,9 @@
  * 
  */
 
+#define NDEBUG
+
+
 #include "filter.h"
 #include "PTcommon.h"
 #include "ColourBrightness.h"
@@ -491,6 +494,7 @@
     //The "forward" transform allows us to map pixel
     //coordinates in the output image to their location in the source image.
     // We use it to test the inverse functions of libpano
+    printf("-------------------------------------------\n");
     SetMakeParams( stack, &mp, &(aP->im) , &(aP->pano), color );
     fD.func = execute_stack_new; 
     fD.param = stack;
@@ -498,7 +502,10 @@
 
     //The "inverse" transform allows us to map pixel coordinates in each source image
     //to their location in the output image.
+    //    printf("INV-------------------------------------------\n");
     SetInvMakeParams(invstack, &mpinv, &(aP->im), &(aP->pano), color);
+
+    //    printf("-------------------------------------------\n");
     finvD.func = execute_stack_new;
     finvD.param = invstack;
 
@@ -530,16 +537,22 @@
                                 newY = (int)(Dy2 + 0.5 + sh2);
 
                                 if (newX != x || newY != y) {
-                                    printf("  IN1: %f,%f (%d,%d) -> OUT: %f, %f inv -> %f %f    (%d, %d)\n", x_d, y_d, 
+                                    printf("  X,Y: %7.1f,%7.1f (%5d,%5d) -> OUT: %9.1f, %9.1f inv -> %9.1f %9.1f (%5d, %5d) -- error %5d,%5d\n", 
+                                           x_d, y_d, 
                                            x,y,
-                                           Dx, Dy, Dx2, Dy2, 
-                                           newX, newY
+                                           Dx, Dy, 
+                                           Dx2, Dy2, 
+                                           newX, newY,
+                                           newX - x,
+                                           newY - y
                                            );
                                 }
                                 // If this assertion fails, there is an error. The question is, how big? See the values above.
                                 // it is possible that the error is so small that it does not matter.
-                                assert(fabs(newX-x) <= 1.0);
-                                assert(fabs(newY-y) <= 1.0);
+/*
+                                assert(fabs(newX-x) <= 20.0);
+                                assert(fabs(newY-y) <= 20.0);
+*/
                             }
 
                         }
@@ -576,7 +589,7 @@
         if (ROIRect->right   > (TrPtr->dest->width-1))  ROIRect->right    = TrPtr->dest->width-1;  
         if (ROIRect->bottom  > (TrPtr->dest->height-1)) ROIRect->bottom   = TrPtr->dest->height-1;
         
-        printf("ROI2: %ld,%ld - %ld, %ld\n", ROIRect->left, ROIRect->top, ROIRect->right, ROIRect->bottom);
+        //        printf("ROI2: %ld,%ld - %ld, %ld\n", ROIRect->left, ROIRect->top, ROIRect->right, ROIRect->bottom);
 }
 
 
@@ -827,6 +840,7 @@
         } else {
 	    PrintError("No support for this ouput image format (%s). Output will be TIFF_m", output_file_format);
 	}
+        //        croppedTIFFIntermediate = 0;
 
 
 

Modified: trunk/libpano/adjust.c
===================================================================
--- trunk/libpano/adjust.c	2009-09-07 20:28:26 UTC (rev 1043)
+++ trunk/libpano/adjust.c	2009-09-10 06:41:20 UTC (rev 1044)
@@ -66,6 +66,7 @@
 int 			pt_average( UCHAR* pixel, int BytesPerLine, double rgb[3], int bytesPerChannel );
 double 			distsqLine(int N0, int N1);
 
+
 void adjust(TrformStr *TrPtr, aPrefs *prefs)
 {
 	int	 	destwidth, destheight;
@@ -664,7 +665,7 @@
         }
         mp->scale[1]    = mp->scale[0];
 
-        printf("\nOrig params: mp->distance: %lf, mp->scale: %lf\n\n", mp->distance, mp->scale[0]);
+        //        printf("\nOrig params: mp->distance: %lf, mp->scale: %lf\n\n", mp->distance, mp->scale[0]);
 #endif
 
  /* Pablo d'Angelo, April 2006.
@@ -779,22 +780,34 @@
     }
     mp->scale[1]    = mp->scale[0];
 
-//  printf("new params: mp->distance: %lf, mp->scale: %lf\n\n", mp->distance, mp->scale[0]);
+    //  printf("new params: mp->distance: %lf, mp->scale: %lf\n\n", mp->distance, mp->scale[0]);
 
     mp->shear[0]    = im->cP.shear_x / image_selection_height;
     mp->shear[1]    = im->cP.shear_y / image_selection_width;
     mp->rot[0]      = mp->distance * PI;                                // 180 in screenpoints
     mp->rot[1]      = -im->yaw *  mp->distance * PI / 180.0;            // rotation angle in screenpoints
+    
+    mp->tilt[0] = DEG_TO_RAD(im->cP.tilt_x);
+    mp->tilt[1] = DEG_TO_RAD(im->cP.tilt_y);
+    mp->tilt[2] = DEG_TO_RAD(im->cP.tilt_z);
+    mp->tilt[3] = im->cP.tilt_scale;
 
     /*
-    printf("Image format %d\n", im->format);
+    printf("Image format %d\n", (int)(im->format));
+    printf("distnace %f\n", mp->distance);
     printf("shear[0] %f\n", mp->shear[0]);
     printf("shear[1] %f\n", mp->shear[1]);
     printf("rot[0] %f\n", mp->rot[0]);
     printf("rot[1] %f\n", mp->rot[1]);
-    printf("scale[0] %f\n", mp->rot[0]);
+    printf("tilt[0] %f\n",    mp->tilt[0]);
+    printf("tilt[1] %f\n",    mp->tilt[1]);
+    printf("tilt[2] %f\n",    mp->tilt[2]);
+    printf("tilt[3] %f\n",    mp->tilt[3]);
+
     printf("mp->horizontal %f\n", mp->horizontal);
     printf("mp->vertical %f\n", mp->vertical);
+  printf(">>>im->cP.shear %d\n", im->cP.shear);
+  printf(">>>im->cP.tilt %d\n", im->cP.tilt);
     */
     mp->perspect[0] = (void*)(mp->mt);
     mp->perspect[1] = (void*)&(mp->distance);
@@ -928,6 +941,10 @@
         case correction_mode_deregister:SetDesc(stack[i],deregister,mp->rad); i++; break;
       }
     }
+    if (im->cP.tilt) {
+      SetDesc(stack[i],   tiltInverse,                   mp);   i++;
+    }
+
     if (mp->vertical != 0.0)
     {
       SetDesc(stack[i],   vert,                   &(mp->vertical));   i++;
@@ -966,6 +983,10 @@
     if(  aP->correct )
     {
       printf( "Correct:\n" );     
+      if( aP->c_prefs.tilt )
+      {
+        printf( "Tilt: %lg\n", mp->tilt );    
+      }
       if( aP->c_prefs.shear )
       {
         printf( "Shear: %lg\n", mp->shear );    
@@ -996,7 +1017,33 @@
 #endif
 }
 
+void PrintMakeParams(char *msg, struct MakeParams *mp, Image *im)
+{
+  printf("-------------%s\n", msg);
+  printf("distnace %f\n", mp->distance);
+  printf("shear[0] %f\n", mp->shear[0]);
+  printf("shear[1] %f\n", mp->shear[1]);
+    printf("rot[0] %f\n", mp->rot[0]);
+    printf("rot[1] %f\n", mp->rot[1]);
+  printf("tilt[0] %f\n", mp->tilt[0]);
+  printf("tilt[1] %f\n", mp->tilt[1]);
+  printf("tilt[2] %f\n", mp->tilt[2]);
+  printf("tilt[3] %f\n", mp->tilt[3]);
 
+  printf("mp->horizontal %f\n", mp->horizontal);
+  printf("mp->vertical %f\n", mp->vertical);
+  printf(">>>Image format %d\n", (int)im->format);
+  printf(">>>im->cP.shear %d\n", im->cP.shear);
+  printf(">>>im->cP.tilt %d\n", im->cP.tilt);
+  printf(">>>im->cP.tilt_x %f\n", im->cP.tilt_x);
+  printf(">>>im->cP.tilt_y %f\n", im->cP.tilt_y);
+  printf(">>>im->cP.tilt_z %f\n", im->cP.tilt_z);
+  printf(">>>im->cP.tilt_scale %f\n", im->cP.tilt_scale);
+
+
+}
+
+
 // Set inverse Makeparameters depending on adjustprefs, color and source image
 
 void  SetInvMakeParams( struct fDesc *stack, struct MakeParams *mp, Image *im , Image *pn, int color )
@@ -1020,7 +1067,7 @@
 
   // dangelo: added mercator, sinusoidal and stereographic projection
   switch (pn->format)
-  {
+    {
     case _rectilinear:
       mp->distance        = (double) pn->width / (2.0 * tan(b/2.0));
       break;
@@ -1069,7 +1116,7 @@
     case _albersequalareaconic:
       mp->distance = 1.0;
       //albersequalareaconic_erect(1.924913116, -PI/2.0, &tx, &ty, mp);  //b/2.0
-    albersequalareaconic_distance(&tx, mp);
+      albersequalareaconic_distance(&tx, mp);
       mp->distance = pn->width/(2.0*tx);
       break;
     case _equisolid:
@@ -1078,23 +1125,23 @@
     case _orthographic:
       mp->distance  = (double) pn->width / (2.0 * sin(b/2.0));
       break;
-	case _biplane:
-	  biplane_distance(pn->width,b,mp);
-	  break;
-	case _triplane:
-	  triplane_distance(pn->width,b,mp);
-	  break;    default:
+    case _biplane:
+      biplane_distance(pn->width,b,mp);
+      break;
+    case _triplane:
+      triplane_distance(pn->width,b,mp);
+      break;    default:
       // unknown
       PrintError ("SetInvMakeParams: Unsupported panorama projection");
       // no way to report an error back to the caller...
       mp->distance = 1;
       break;
-  }
+    }
 
   // calculate final scaling factor, that reverses the mp->distance
   // scaling and applies the required output scaling factor
   switch (im->format)
-  {
+    {
     case _rectilinear:
       // calculate distance for this projection
       mp->scale[0] = (double) im->width / (2.0 * tan(a/2.0)) / mp->distance;
@@ -1117,17 +1164,26 @@
     case _stereographic:
       mp->scale[0] = (double) im->width / (4.0 * tan(a/4.0)) / mp->distance;
       break;
-   default:
+    default:
       PrintError ("SetInvMakeParams: Unsupported input image projection");
       // no way to report an error back to the caller...
       mp->scale[0] = 1;
       break;
-  }
+    }
   mp->scale[1]    = mp->scale[0];
 
   mp->shear[0]  = im->cP.shear_x / im->height;
   mp->shear[1]  = im->cP.shear_y / im->width;
   
+  //PrintMakeParams("Inverse 10", mp,im);
+
+  mp->tilt[0] = DEG_TO_RAD(im->cP.tilt_x);
+  mp->tilt[1] = DEG_TO_RAD(im->cP.tilt_y);
+  mp->tilt[2] = DEG_TO_RAD(im->cP.tilt_z);
+  mp->tilt[3] = im->cP.tilt_scale;
+
+  //  PrintMakeParams("Inverse 20",mp,im);
+
   mp->scale[0] = 1.0 / mp->scale[0];
   mp->scale[1]  = mp->scale[0];
   mp->horizontal  = -im->cP.horizontal_params[color];
@@ -1137,30 +1193,23 @@
   mp->rad[5] = im->cP.radial_params[color][4];
   
   switch( im->cP.correction_mode & 3 )
-  {
+    {
     case correction_mode_radial: mp->rad[4] = ((double)(im->width < im->height ? im->width : im->height) ) / 2.0;break;
     case correction_mode_vertical: 
     case correction_mode_deregister: mp->rad[4] = ((double) im->height) / 2.0;break;
-  }
+    }
 
   mp->rot[0]    = mp->distance * PI;                // 180 in screenpoints
   mp->rot[1]    = im->yaw *  mp->distance * PI / 180.0;       //    rotation angle in screenpoints
 
   mp->perspect[0] = (void*)(mp->mt);
   mp->perspect[1] = (void*)&(mp->distance);
-  /*
-    printf("Image format %d\n", im->format);
-    printf("shear[0] %f\n", mp->shear[0]);
-    printf("shear[1] %f\n", mp->shear[1]);
-    printf("rot[0] %f\n", mp->rot[0]);
-    printf("rot[1] %f\n", mp->rot[1]);
-    printf("scale[0] %f\n", mp->rot[0]);
-    printf("mp->horizontal %f\n", mp->horizontal);
-    printf("mp->vertical %f\n", mp->vertical);
-    */
+
+  //  PrintMakeParams("Invert 30",mp,im);
+
   i = 0;  // Stack counter
     
-    // Perform radial correction
+
   if( im->cP.shear )
   {
     SetDesc( stack[i],shearInv,      mp->shear   ); i++;
@@ -1170,10 +1219,19 @@
   {
     SetDesc(stack[i],horiz,       &(mp->horizontal)); i++;
   }
+
   if (  im->cP.vertical)
   {
     SetDesc(stack[i],vert,        &(mp->vertical));   i++;
   }
+
+  if( im->cP.tilt )
+  {
+    SetDesc( stack[i],tiltForward,      mp   ); i++;
+  }
+
+  // Perform radial correction
+
   if(   im->cP.radial )
   {
     switch( im->cP.correction_mode & 3)
@@ -1215,11 +1273,11 @@
     //SetDesc(stack[i], sphere_tp_stereographic,  &(mp->distance) ); i++; // Convert stereographic to spherical
   }
 
-
+  
   SetDesc(  stack[i], persp_sphere,   mp->perspect  ); i++; // Perspective Control spherical Image
   SetDesc(  stack[i], erect_sphere_tp,  &(mp->distance) ); i++; // Convert spherical image to equirect.
   SetDesc(  stack[i], rotate_erect,   mp->rot     ); i++; // Rotate equirect. image horizontally
-
+  // THESE ARE ALL FORWARD transforms
   if(pn->format == _rectilinear)                  // rectilinear panorama
   {
     SetDesc(stack[i], rect_erect,   &(mp->distance) ); i++; // Convert equirectangular to rectilinear
@@ -2412,6 +2470,24 @@
 			if( k == 1 ){ g->im[i].cP.vertical_params[0]  =	x[j++];
 			}else{	g->im[i].cP.vertical_params[0] = g->im[k-2].cP.vertical_params[0];}
 		}
+                // tilt
+		if( (k = g->opt[i].tiltX) > 0 ){
+			if( k == 1 ){ g->im[i].cP.tilt_x  =	x[j++];
+			}else{	g->im[i].cP.tilt_x = g->im[k-2].cP.tilt_x;}
+		}
+		if( (k = g->opt[i].tiltY) > 0 ){
+			if( k == 1 ){ g->im[i].cP.tilt_y  =	x[j++];
+			}else{	g->im[i].cP.tilt_y = g->im[k-2].cP.tilt_y;}
+		}
+		if( (k = g->opt[i].tiltZ) > 0 ){
+			if( k == 1 ){ g->im[i].cP.tilt_z  =	x[j++];
+			}else{	g->im[i].cP.tilt_z = g->im[k-2].cP.tilt_z;}
+		}
+		if( (k = g->opt[i].tiltScale) > 0 ){
+			if( k == 1 ){ g->im[i].cP.tilt_scale  =	x[j++];
+			}else{	g->im[i].cP.tilt_scale = g->im[k-2].cP.tilt_scale;}
+		}
+                //shear
 		if( (k = g->opt[i].shear_x) > 0 ){
 			if( k == 1 ){ g->im[i].cP.shear_x  =	x[j++];
 			}else{	g->im[i].cP.shear_x = g->im[k-2].cP.shear_x;}
@@ -2474,6 +2550,19 @@
 		if(g->opt[i].e == 1)  //  optimize e? 0-no 1-yes
 			x[j++] = g->im[i].cP.vertical_params[0]  ; 
 
+		if(g->opt[i].tiltX == 1) { //  optimize tilt_x? 0-no 1-yes
+			x[j++] = g->im[i].cP.tilt_x  ;
+                }
+
+		if(g->opt[i].tiltY == 1)  //  optimize tilt_y? 0-no 1-yes
+			x[j++] = g->im[i].cP.tilt_y  ;
+
+		if(g->opt[i].tiltZ == 1) { //  optimize tilt_Z? 0-no 1-yes
+			x[j++] = g->im[i].cP.tilt_z  ;
+                }
+		if(g->opt[i].tiltScale == 1) { //  optimize tilt_scale? 0-no 1-yes
+			x[j++] = g->im[i].cP.tilt_scale  ;
+                }
 		if(g->opt[i].shear_x == 1)  //  optimize shear_x? 0-no 1-yes
 			x[j++] = g->im[i].cP.shear_x  ;
 
@@ -2609,7 +2698,10 @@
 
 void		SetOptDefaults( optVars *opt )
 {
-	opt->hfov = opt->yaw = opt->pitch = opt->roll = opt->a = opt->b = opt->c = opt->d = opt->e = opt->shear_x = opt->shear_y = 0;
+    opt->hfov = opt->yaw = opt->pitch = opt->roll = 0; 
+    opt->a = opt->b = opt->c = opt->d = opt->e = 0; 
+    opt->tiltX = opt->tiltY = 0;
+    opt->shear_x = opt->shear_y = 0;
 }
 
 void DoColorCorrection( Image *im1, Image *im2, int mode )

Modified: trunk/libpano/correct.c
===================================================================
--- trunk/libpano/correct.c	2009-09-07 20:28:26 UTC (rev 1043)
+++ trunk/libpano/correct.c	2009-09-10 06:41:20 UTC (rev 1044)
@@ -31,6 +31,7 @@
    
 
 #include "filter.h"
+#include <assert.h>
 
 static void 	ShiftImage(TrformStr *TrPtr, int xoff, int yoff);
 static int 		getFrame( Image *im, int *xoff, int *yoff, int width, int height, int showprogress );
@@ -39,7 +40,7 @@
 
 
 
-void 	correct	(TrformStr *TrPtr, cPrefs *prefs) 
+void 	correct (TrformStr *TrPtr, cPrefs *prefs) 
 {
 
 	int 	i=0,j,k, kstart, kend, kdone, color;
@@ -67,8 +68,14 @@
 	src			= TrPtr->src;
 	dest		= TrPtr->dest;
 
+        printf("inside Correct\n");
+
+        exit(1);
+        assert(0); // try to see when it is called
+
 	// Apply filters, if required
 
+
 	TrPtr->success = 1;
 	
 	if( prefs->luminance )
@@ -902,6 +909,13 @@
 			prefs->radial_params[i][k] = 0.0;		
 		prefs->lum_params[i]		= 0.0;
 	}
+	prefs->tilt 	=  	FALSE;
+        prefs->tilt_x   = 0;
+        prefs->tilt_y   = 0;
+        prefs->tilt_z   = 0;
+        prefs->tilt_scale   = 1;
+        
+
 	prefs->shear 	= prefs->resize 	= FALSE;
 	prefs->shear_x 	= prefs->shear_y 	= 0.0;
 	prefs->width 	= prefs->height 	= 0;

Modified: trunk/libpano/filter.h
===================================================================
--- trunk/libpano/filter.h	2009-09-07 20:28:26 UTC (rev 1043)
+++ trunk/libpano/filter.h	2009-09-10 06:41:20 UTC (rev 1044)
@@ -185,6 +185,10 @@
 		int e;
 		int shear_x;
 		int shear_y;
+		int tiltX;
+		int tiltY;
+		int tiltZ;
+		int tiltScale;
 		};
 		
 typedef struct optVars optVars;
@@ -358,6 +362,11 @@
 	double  distance;
 	double	horizontal;
 	double	vertical;
+
+  // Tilt 
+	double tilt[4]; // 0 around x, 1 around y, 2 around z, 3 scaling factor
+
+
 	Image *im;
 	Image *pn;
 	};
@@ -814,6 +823,8 @@
 int radial				( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );	
 int radial_brown			( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );	
 
+int tiltForward				( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );	
+int tiltInverse				( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );	
 
 int persp_sphere		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );	
 int persp_rect			( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );	

Modified: trunk/libpano/math.c
===================================================================
--- trunk/libpano/math.c	2009-09-07 20:28:26 UTC (rev 1043)
+++ trunk/libpano/math.c	2009-09-10 06:41:20 UTC (rev 1044)
@@ -1,4 +1,4 @@
-/* Panorama_Tools	-	Generate, Edit and Convert Panoramic Images
+/* Panorama_Tools       -       Generate, Edit and Convert Panoramic Images
    Copyright (C) 1998,1999 - Helmut Dersch  der@...
    
    This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,7 @@
 #include <float.h>
 #include "f2c.h"
 
-#define R_EPS  1.0e-6	
+#define R_EPS  1.0e-6   
 #define MAXITER 100
 
 #include <assert.h>
@@ -37,8 +37,8 @@
 #define isinf(a) (_fpclass(a) == _FPCLASS_NINF || _fpclass(a) == _FPCLASS_PINF)
 #endif
 
-void 	matrix_matrix_mult	( double m1[3][3],double m2[3][3],double result[3][3]);
-int 	polzeros_();
+void    matrix_matrix_mult      ( double m1[3][3],double m2[3][3],double result[3][3]);
+int     polzeros_();
 
 
 //------------------------- Some auxilliary math functions --------------------------------------------
@@ -90,70 +90,70 @@
 
 void matrix_mult( double m[3][3], double vector[3] )
 {
-	register int i;
-	register double v0 = vector[0];
-	register double v1 = vector[1];
-	register double v2 = vector[2];
-	
-	
-	for(i=0; i<3; i++)
-	{
-		vector[i] = m[i][0] * v0 + m[i][1] * v1 + m[i][2] * v2;
-	}
+        register int i;
+        register double v0 = vector[0];
+        register double v1 = vector[1];
+        register double v2 = vector[2];
+        
+        
+        for(i=0; i<3; i++)
+        {
+                vector[i] = m[i][0] * v0 + m[i][1] * v1 + m[i][2] * v2;
+        }
 }
-		
+                
 void matrix_inv_mult( double m[3][3], double vector[3] )
 {
-	register int i;
-	register double v0 = vector[0];
-	register double v1 = vector[1];
-	register double v2 = vector[2];
-	
-	for(i=0; i<3; i++)
-	{
-		vector[i] = m[0][i] * v0 + m[1][i] * v1 + m[2][i] * v2;
-	}
+        register int i;
+        register double v0 = vector[0];
+        register double v1 = vector[1];
+        register double v2 = vector[2];
+        
+        for(i=0; i<3; i++)
+        {
+                vector[i] = m[0][i] * v0 + m[1][i] * v1 + m[2][i] * v2;
+        }
 }
-		
+                
 void matrix_matrix_mult( double m1[3][3],double m2[3][3],double result[3][3])
 {
-	register int i,k;
-	
-	for(i=0;i<3;i++)
-	{
-		for(k=0; k<3; k++)
-		{
-			result[i][k] = m1[i][0] * m2[0][k] + m1[i][1] * m2[1][k] + m1[i][2] * m2[2][k];
-		}
-	}
+        register int i,k;
+        
+        for(i=0;i<3;i++)
+        {
+                for(k=0; k<3; k++)
+                {
+                        result[i][k] = m1[i][0] * m2[0][k] + m1[i][1] * m2[1][k] + m1[i][2] * m2[2][k];
+                }
+        }
 }
 
 // Set matrix elements based on Euler angles a, b, c
 
 void SetMatrix( double a, double b, double c , double m[3][3], int cl )
 {
-	double mx[3][3], my[3][3], mz[3][3], dummy[3][3];
-	
+        double mx[3][3], my[3][3], mz[3][3], dummy[3][3];
+        
 
-	// Calculate Matrices;
+        // Calculate Matrices;
 
-	mx[0][0] = 1.0 ; 				mx[0][1] = 0.0 ; 				mx[0][2] = 0.0;
-	mx[1][0] = 0.0 ; 				mx[1][1] = cos(a) ; 			mx[1][2] = sin(a);
-	mx[2][0] = 0.0 ;				mx[2][1] =-mx[1][2] ;			mx[2][2] = mx[1][1];
-	
-	my[0][0] = cos(b); 				my[0][1] = 0.0 ; 				my[0][2] =-sin(b);
-	my[1][0] = 0.0 ; 				my[1][1] = 1.0 ; 				my[1][2] = 0.0;
-	my[2][0] = -my[0][2];			my[2][1] = 0.0 ;				my[2][2] = my[0][0];
-	
-	mz[0][0] = cos(c) ; 			mz[0][1] = sin(c) ; 			mz[0][2] = 0.0;
-	mz[1][0] =-mz[0][1] ; 			mz[1][1] = mz[0][0] ; 			mz[1][2] = 0.0;
-	mz[2][0] = 0.0 ;				mz[2][1] = 0.0 ;				mz[2][2] = 1.0;
+        mx[0][0] = 1.0 ;                                mx[0][1] = 0.0 ;                                mx[0][2] = 0.0;
+        mx[1][0] = 0.0 ;                                mx[1][1] = cos(a) ;                     mx[1][2] = sin(a);
+        mx[2][0] = 0.0 ;                                mx[2][1] =-mx[1][2] ;                   mx[2][2] = mx[1][1];
+        
+        my[0][0] = cos(b);                              my[0][1] = 0.0 ;                                my[0][2] =-sin(b);
+        my[1][0] = 0.0 ;                                my[1][1] = 1.0 ;                                my[1][2] = 0.0;
+        my[2][0] = -my[0][2];                   my[2][1] = 0.0 ;                                my[2][2] = my[0][0];
+        
+        mz[0][0] = cos(c) ;                     mz[0][1] = sin(c) ;                     mz[0][2] = 0.0;
+        mz[1][0] =-mz[0][1] ;                   mz[1][1] = mz[0][0] ;                   mz[1][2] = 0.0;
+        mz[2][0] = 0.0 ;                                mz[2][1] = 0.0 ;                                mz[2][2] = 1.0;
 
-	if( cl )
-		matrix_matrix_mult( mz,	mx,	dummy);
-	else
-		matrix_matrix_mult( mx,	mz,	dummy);
-	matrix_matrix_mult( dummy, my, m);
+        if( cl )
+                matrix_matrix_mult( mz, mx,     dummy);
+        else
+                matrix_matrix_mult( mx, mz,     dummy);
+        matrix_matrix_mult( dummy, my, m);
 }
 
 
@@ -161,99 +161,99 @@
 
 void doCoordinateTransform( CoordInfo *ci, tMatrix *t )
 {
-	double m[3][3],a,b,c;
-	int i;
-	double mx[3][3], my[3][3], mz[3][3], dummy[3][3];
-	
+        double m[3][3],a,b,c;
+        int i;
+        double mx[3][3], my[3][3], mz[3][3], dummy[3][3];
+        
 
-	// Calculate Matrices;
-	a = DEG_TO_RAD( t->alpha );
-	b = DEG_TO_RAD( t->beta  );
-	c = DEG_TO_RAD( t->gamma );
+        // Calculate Matrices;
+        a = DEG_TO_RAD( t->alpha );
+        b = DEG_TO_RAD( t->beta  );
+        c = DEG_TO_RAD( t->gamma );
 
-	mx[0][0] = 1.0 ; 				mx[0][1] = 0.0 ; 				mx[0][2] = 0.0;
-	mx[1][0] = 0.0 ; 				mx[1][1] = cos(a) ; 			mx[1][2] = sin(a);
-	mx[2][0] = 0.0 ;				mx[2][1] =-mx[1][2] ;			mx[2][2] = mx[1][1];
-	
-	my[0][0] = cos(b); 				my[0][1] = 0.0 ; 				my[0][2] =-sin(b);
-	my[1][0] = 0.0 ; 				my[1][1] = 1.0 ; 				my[1][2] = 0.0;
-	my[2][0] = -my[0][2];			my[2][1] = 0.0 ;				my[2][2] = my[0][0];
-	
-	mz[0][0] = cos(c) ; 			mz[0][1] = sin(c) ; 			mz[0][2] = 0.0;
-	mz[1][0] =-mz[0][1] ; 			mz[1][1] = mz[0][0] ; 			mz[1][2] = 0.0;
-	mz[2][0] = 0.0 ;				mz[2][1] = 0.0 ;				mz[2][2] = 1.0;
+        mx[0][0] = 1.0 ;                                mx[0][1] = 0.0 ;                                mx[0][2] = 0.0;
+        mx[1][0] = 0.0 ;                                mx[1][1] = cos(a) ;                     mx[1][2] = sin(a);
+        mx[2][0] = 0.0 ;                                mx[2][1] =-mx[1][2] ;                   mx[2][2] = mx[1][1];
+        
+        my[0][0] = cos(b);                              my[0][1] = 0.0 ;                                my[0][2] =-sin(b);
+        my[1][0] = 0.0 ;                                my[1][1] = 1.0 ;                                my[1][2] = 0.0;
+        my[2][0] = -my[0][2];                   my[2][1] = 0.0 ;                                my[2][2] = my[0][0];
+        
+        mz[0][0] = cos(c) ;                     mz[0][1] = sin(c) ;                     mz[0][2] = 0.0;
+        mz[1][0] =-mz[0][1] ;                   mz[1][1] = mz[0][0] ;                   mz[1][2] = 0.0;
+        mz[2][0] = 0.0 ;                                mz[2][1] = 0.0 ;                                mz[2][2] = 1.0;
 
-	matrix_matrix_mult( my,	mz,	dummy);
-	matrix_matrix_mult( mx, dummy,	m);
-	
-	// Scale 
-	
-	for(i=0; i<3; i++)
-		ci->x[i] *= t->scale;
-	
-	// Do shift
-	
-	for(i=0; i<3; i++)
-		ci->x[i] += t->x_shift[i];
-	
-	// Do rotation
-#if 0	
-	SetMatrix( DEG_TO_RAD( t->alpha ) , 
-			   DEG_TO_RAD( t->beta  ) ,
-			   DEG_TO_RAD( t->gamma ) ,
-			   m, 0 );
+        matrix_matrix_mult( my, mz,     dummy);
+        matrix_matrix_mult( mx, dummy,  m);
+        
+        // Scale 
+        
+        for(i=0; i<3; i++)
+                ci->x[i] *= t->scale;
+        
+        // Do shift
+        
+        for(i=0; i<3; i++)
+                ci->x[i] += t->x_shift[i];
+        
+        // Do rotation
+#if 0   
+        SetMatrix( DEG_TO_RAD( t->alpha ) , 
+                           DEG_TO_RAD( t->beta  ) ,
+                           DEG_TO_RAD( t->gamma ) ,
+                           m, 0 );
 
 #endif
-	matrix_inv_mult( m, ci->x );
+        matrix_inv_mult( m, ci->x );
 
 }
 
 void SettMatrixDefaults( tMatrix *t )
 {
-	int i;
-	
-	t->alpha = t->beta = t->gamma = 0.0;
-	for(i=0; i<3; i++)
-		t->x_shift[i] = 0.0;
-	
-	t->scale = 1.0;
+        int i;
+        
+        t->alpha = t->beta = t->gamma = 0.0;
+        for(i=0; i<3; i++)
+                t->x_shift[i] = 0.0;
+        
+        t->scale = 1.0;
 }
 
 
-	
-	
-	
-	
+        
+        
+        
+        
 
 //------------------------------- Transformation functions --------------------------------------------
 
 
-#define 	distanceparam	(*((double*)params))
-#define 	shift		(*((double*)params))
-#define		var0		((double*)params)[0]
-#define		var1		((double*)params)[1]
-#define		mp		((struct MakeParams*)params)
+#define         distanceparam   (*((double*)params))
+#define         shift           (*((double*)params))
+#define         var0            ((double*)params)[0]
+#define         var1            ((double*)params)[1]
+#define         mp              ((struct MakeParams*)params)
 
 // execute a stack of functions stored in stack
 
-void execute_stack		( double x_dest, double y_dest, double* x_src, double* y_src, void* params)
+void execute_stack              ( double x_dest, double y_dest, double* x_src, double* y_src, void* params)
 {
-	register double 		xd = x_dest, 
-							yd = y_dest;
-	register struct fDesc*  stack = (struct fDesc *) params;;
-	
-		
-	while( (stack->func) != NULL )
-	{
+        register double                 xd = x_dest, 
+                                                        yd = y_dest;
+        register struct fDesc*  stack = (struct fDesc *) params;;
+        
+                
+        while( (stack->func) != NULL )
+        {
 
-		(stack->func) ( xd, yd, x_src, y_src, stack->param );
-		xd = *x_src;	
-		yd = *y_src;
-		stack++;
-	}
+                (stack->func) ( xd, yd, x_src, y_src, stack->param );
+                xd = *x_src;    
+                yd = *y_src;
+                stack++;
+        }
 }
 
-	
+        
 int execute_stack_new( double x_dest, double y_dest, double* x_src, double* y_src, void* params)
 {
     register double xd = x_dest,
@@ -263,7 +263,7 @@
     while( (stack->func) != NULL )
     {
         if ( (stack->func) ( xd, yd, x_src, y_src, stack->param ) ) {
-	    //	    printf("Execute stack %f %f %f %f\n", xd, yd, *x_src, *y_src);
+            //      printf("Execute stack %f %f %f %f\n", xd, yd, *x_src, *y_src);
             xd = *x_src;
             yd = *y_src;
             stack++;
@@ -279,17 +279,17 @@
 
 int rotate_erect( double x_dest, double y_dest, double* x_src, double* y_src, void* params)
 {
-	// params: double 180degree_turn(screenpoints), double turn(screenpoints);
+        // params: double 180degree_turn(screenpoints), double turn(screenpoints);
 
-		*x_src = x_dest + var1;
+                *x_src = x_dest + var1;
 
-		while( *x_src < - var0 )
-			*x_src += 2 *  var0;
+                while( *x_src < - var0 )
+                        *x_src += 2 *  var0;
 
-		while( *x_src >  var0 )
-			*x_src -= 2 *  var0;
+                while( *x_src >  var0 )
+                        *x_src -= 2 *  var0;
 
-		*y_src = y_dest ;
+                *y_src = y_dest ;
     return 1;
 }
 
@@ -301,61 +301,61 @@
 
 int inv_radial( double x_dest, double y_dest, double* x_src, double* y_src, void* params)
 {
-	// params: double coefficients[4]
+        // params: double coefficients[4]
 
-	register double rs, rd, f, scale;
-	int iter = 0;
+        register double rs, rd, f, scale;
+        int iter = 0;
 
-	rd 		= (sqrt( x_dest*x_dest + y_dest*y_dest )) / ((double*)params)[4]; // Normalized 
+        rd              = (sqrt( x_dest*x_dest + y_dest*y_dest )) / ((double*)params)[4]; // Normalized 
 
-	rs	= rd;				
-	f 	= (((((double*)params)[3] * rs + ((double*)params)[2]) * rs + 
-				((double*)params)[1]) * rs + ((double*)params)[0]) * rs;
+        rs      = rd;                           
+        f       = (((((double*)params)[3] * rs + ((double*)params)[2]) * rs + 
+                                ((double*)params)[1]) * rs + ((double*)params)[0]) * rs;
 
-	while( abs(f - rd) > R_EPS && iter++ < MAXITER )
-	{
-		rs = rs - (f - rd) / ((( 4 * ((double*)params)[3] * rs + 3 * ((double*)params)[2]) * rs  + 
-						  2 * ((double*)params)[1]) * rs + ((double*)params)[0]);
+        while( abs(f - rd) > R_EPS && iter++ < MAXITER )
+        {
+                rs = rs - (f - rd) / ((( 4 * ((double*)params)[3] * rs + 3 * ((double*)params)[2]) * rs  + 
+                                                  2 * ((double*)params)[1]) * rs + ((double*)params)[0]);
 
-		f 	= (((((double*)params)[3] * rs + ((double*)params)[2]) * rs + 
-				((double*)params)[1]) * rs + ((double*)params)[0]) * rs;
-	}
+                f       = (((((double*)params)[3] * rs + ((double*)params)[2]) * rs + 
+                                ((double*)params)[1]) * rs + ((double*)params)[0]) * rs;
+        }
 
-	scale = rs / rd;
-//	printf("scale = %lg iter = %d\n", scale,iter);	
-	
-	*x_src = x_dest * scale  ;
-	*y_src = y_dest * scale  ;
+        scale = rs / rd;
+//      printf("scale = %lg iter = %d\n", scale,iter);  
+        
+        *x_src = x_dest * scale  ;
+        *y_src = y_dest * scale  ;
     return 1;
 }
 
 int inv_vertical( double x_dest, double y_dest, double* x_src, double* y_src, void* params)
 {
-	// params: double coefficients[4]
+        // params: double coefficients[4]
 
-	register double rs, rd, f, scale;
-	int iter = 0;
+        register double rs, rd, f, scale;
+        int iter = 0;
 
-	rd 		= abs( y_dest ) / ((double*)params)[4]; // Normalized 
+        rd              = abs( y_dest ) / ((double*)params)[4]; // Normalized 
 
-	rs	= rd;				
-	f 	= (((((double*)params)[3] * rs + ((double*)params)[2]) * rs + 
-				((double*)params)[1]) * rs + ((double*)params)[0]) * rs;
+        rs      = rd;                           
+        f       = (((((double*)params)[3] * rs + ((double*)params)[2]) * rs + 
+                                ((double*)params)[1]) * rs + ((double*)params)[0]) * rs;
 
-	while( abs(f - rd) > R_EPS && iter++ < MAXITER )
-	{
-		rs = rs - (f - rd) / ((( 4 * ((double*)params)[3] * rs + 3 * ((double*)params)[2]) * rs  + 
-						  2 * ((double*)params)[1]) * rs + ((double*)params)[0]);
+        while( abs(f - rd) > R_EPS && iter++ < MAXITER )
+        {
+                rs = rs - (f - rd) / ((( 4 * ((double*)params)[3] * rs + 3 * ((double*)params)[2]) * rs  + 
+                                                  2 * ((double*)params)[1]) * rs + ((double*)params)[0]);
 
-		f 	= (((((double*)params)[3] * rs + ((double*)params)[2]) * rs + 
-				((double*)params)[1]) * rs + ((double*)params)[0]) * rs;
-	}
+                f       = (((((double*)params)[3] * rs + ((double*)params)[2]) * rs + 
+                                ((double*)params)[1]) * rs + ((double*)params)[0]) * rs;
+        }
 
-	scale = rs / rd;
-//	printf("scale = %lg iter = %d\n", scale,iter);	
-	
-	*x_src = x_dest  ;
-	*y_src = y_dest * scale  ;
+        scale = rs / rd;
+//      printf("scale = %lg iter = %d\n", scale,iter);  
+        
+        *x_src = x_dest  ;
+        *y_src = y_dest * scale  ;
     return 1;
 }
 
@@ -363,17 +363,189 @@
 
 int resize( double x_dest, double y_dest, double* x_src, double* y_src, void* params)
 {
-	// params: double scale_horizontal, double scale_vertical;
+        // params: double scale_horizontal, double scale_vertical;
 
-		*x_src = x_dest * var0;
-		*y_src = y_dest * var1;
+                *x_src = x_dest * var0;
+                *y_src = y_dest * var1;
     return 1;
 }
 
+int tiltInverse( double x_dest, double y_dest, double* x_src, double* y_src, void* params)
+{
+        
+  // 
+  // This is really the inverse transformation
+  
+  //	printf( "Entered invtilt function \n");
+  
+  
+    double theta = mp->tilt[0];            // use the tilt angle specified by the 'L' parameter
+    double sigma = mp->tilt[1];            // use the tilt angle specified by the 'L' parameter
+    double phi   = mp->tilt[2];
+    double scale = mp->tilt[3];
+    double v[3];                                            // 3D projective coordinate vector
+    double m_tilt[3][3];                            // tilt matrix
+    double m_rotate[3][3];                            // tilt matrix
+    double xmax = mp->im->width/2;          // maximum y value is image width divided by 2
+    double z0, z1;
+    double FOV = DEG_TO_RAD(mp->im->hfov/scale);                  
+    double m_slant[3][3];                           // slant matrix
+    
+    //        printf("Tilt Inverse %5.2f %5.2f %5.2f, %5.2f\n", x_dest, y_dest, theta, sigma);
+    
+    // These operations are based on the typical projection of a point to a camera.
+    // But, we want the projection to happen without translation, so we need to subtract
+    // the coordinates of 0,0 projected... that is why the [1][2], [2][2] components
+    // of the matrix are 0 or 1 in the tilt-x and tilt-y
+    
+    
+    // Tilt (around X) INVERSE. The matrix does not require the [1][2], [2][2]
+    // because it is tilted in its center
+    m_tilt[0][0] = 1;       m_tilt[0][1] = 0;                               m_tilt[0][2] = 0;
+    m_tilt[1][0] = 0;       m_tilt[1][1] = cos(theta);                      m_tilt[1][2] = 0; // sin(theta); 
+    m_tilt[2][0] = 0;       m_tilt[2][1] = -sin(theta);                     m_tilt[2][2] = 1; //cos(theta);
+    
+    // Tilt (around Y) INVERSE.       
+    // [0][2] and [2][2] are changed to tilt on center of image. See above
+    m_slant[0][0] = cos(sigma);	m_slant[0][1] = 0;		m_slant[0][2] = 0; //-sin(sigma);
+    m_slant[1][0] = 0;		m_slant[1][1] = 1;		m_slant[1][2] = 0;
+    m_slant[2][0] = sin(sigma);	m_slant[2][1] = 0;		m_slant[2][2] = 1; //cos(sigma);
+    
+    // Slant (around z)
+    
+    // Tilt (around z) INVERSE 
+    m_rotate[0][0] = cos(phi);	m_rotate[0][1] = sin(phi);		m_rotate[0][2] = 0;
+    m_rotate[1][0] = -sin(phi);	m_rotate[1][1] = cos(phi);		m_rotate[1][2] = 0;
+    m_rotate[2][0] = 0;	        m_rotate[2][1] = 0;		        m_rotate[2][2]=  1;
+    
+    z0 = xmax/tan(FOV/2);           // FOV is full angle FOV in radians
+    //    printf("Values Forward %5.2f %5.2f %5.2f, %5.2f\n", x_dest, y_dest, distanceparam, z0);
+    
+    // z0 is distance to image from center of projection                                            
+    
+    //printf("z0 is %f \n", z0);
+    // Now you have [x_dest, y_dest, z1]'.  Multiply that vector by M, the adjusted tilt matrix
+    v[0] = x_dest;
+    v[1] = y_dest;
+    v[2] = z0;
+    
+    matrix_mult(m_rotate,v);
+    matrix_mult(m_slant,v);
+    matrix_mult(m_tilt,v);
+
+    
+    // Now project into xy plane
+    *x_src =  v[0]* z0 /v[2];
+    *y_src =  v[1]* z0 /v[2];
+
+// THIS IS THE OPTIMIZED VERSION with no matrices multiplications. ..
+#ifdef OPTIMIZED
+    double x = x_dest;
+    double y = y_dest;
+    double above = (x * cos(phi) + y * sin(phi)) * cos (sigma);
+    double below1  = (x * cos(phi) + y * sin(phi)) * sin(sigma);
+    double below2 = - sin(theta) * (y * cos(phi) - x * sin(phi));
+    double x4 = z0*  above / (below1 + below2 + z0);
+
+    above  = (-x * sin (phi) + y * cos(phi)) * cos(theta);
+    below1 = (x * cos(phi) + y * sin(phi)) * sin (sigma);
+    below2 = (-x * sin(phi) + y * cos(phi)) * sin(theta);
+    
+    double y4 = z0 * above / (below1 - below2 + z0);
+#endif
+
+//    printf("x4 %6.2f x_c %6.2f\n", x4, *x_src);
+//    printf("x4 %6.2f x_c %6.2f\n", y4, *y_src);
+
+    
+    return 1;
+}
+
+// Dev: inverse tilt function.  Substitute correct matrix for "un-tilting"
+int tiltForward( double x_dest, double y_dest, double* x_src, double* y_src, void* params)
+{
+  // INVERSE is a misnomer --panotools ##$&^
+  // This is really the forward transformation
+
+  //	printf( "Entered invtilt function \n");
+
+	double phi = mp->tilt[0];		// use the tilt angle specified by the 'L' parameter (already in radians)
+	double phi2 = mp->tilt[1];		// use the tilt angle specified by the 'L' parameter (already in radians)
+        double phi3  = mp->tilt[2];
+        double scale  = mp->tilt[3];
+
+	double v[3];						// 3D projective coordinate vector
+	double m_tilt[3][3];				// tilt matrix
+	double xmax = mp->im->width/2;		// maximum y value is image width divided by 2
+	double z0, z1, s;
+	double FOV = DEG_TO_RAD(mp->im->hfov/scale);
+        double m_slant[3][3];                           // slant matrix
+
+//        printf("Tilt Forward %5.2f %5.2f angles %5.2f, %5.2f, %5.2f\n", x_dest, y_dest, phi, phi2, phi3);
+
+	// TILT TO STRAIGHT matrix (tilt2() in MATLAB).  Really and UN-TILTING matrix
+        // FORWARD
+	m_tilt[0][0] = 1;	m_tilt[0][1] = 0;		m_tilt[0][2] = 0;
+	m_tilt[1][0] = 0;	m_tilt[1][1] = 1/cos(phi);	m_tilt[1][2] = 0;
+	m_tilt[2][0] = 0;	m_tilt[2][1] = tan(phi);	m_tilt[2][2] = 1;
+								
+
+	m_slant[0][0] = 1/cos(phi2);	m_slant[0][1] = 0;		m_slant[0][2] = 0;
+	m_slant[1][0] = 0;		m_slant[1][1] = 1;		m_slant[1][2] = 0;
+	m_slant[2][0] = -sin(phi2)/cos(phi2);	m_slant[2][1] = 0;		m_slant[2][2] = 1;
+
+        double m_rotate[3][3];                            // tilt matrix
+
+        // FORWARD
+        m_rotate[0][0] = cos(phi3);	m_rotate[0][1] = -sin(phi3);		m_rotate[0][2] = 0;
+        m_rotate[1][0] = sin(phi3);	m_rotate[1][1] = cos(phi3);		m_rotate[1][2] = 0;
+        m_rotate[2][0] = 0;	        m_rotate[2][1] = 0;		        m_rotate[2][2]=  1;
+
+
+
+	z0 = xmax/tan(FOV/2); 		// FOV is full angle FOV in radians
+								// z0 is distance to image from center of projection						
+        // First step, undo the projection of the point
+        z1 = (z0 * z0) /(x_dest * (-sin(phi2)/cos(phi2))  + y_dest * tan(phi) + z0);
+        
+        s = z1 / z0;
+        s = z0 /(x_dest * (-sin(phi2)/cos(phi2))  + y_dest * sin(phi)/cos(phi) + z0);
+        z1 = (z0* z0) /(x_dest * (-sin(phi2)/cos(phi2))  + y_dest * sin(phi)/cos(phi) + z0);
+
+        //(y_dest * tan(phi) + x_dest * tan(phi2) + z0);
+
+	//s = z0 / (y_dest * tan(phi) + z0);		// s is a scaling factor ...
+        
+	//printf("z0 is %f \n", z0);
+	// Now you have [x_dest, y_dest, z1]'.  Multiply that vector by M, the adjusted tilt matrix
+	v[0] =  s* x_dest;
+	v[1] =  s* y_dest;
+	v[2] =  z1;
+
+        //	matrix_mult(m_tilt,v);
+        matrix_mult(m_tilt,v);
+        matrix_mult(m_slant,v);
+	matrix_mult(m_rotate,v);
+
+	*x_src =   v[0] ;			// convert back to cartesian coordinates
+	*y_src =   v[1];
+
+//        printf( "Entered tiltforward function tilt z0,z1,v[21] (%f,%f, %f)\n", z0, z1, v[2]);
+
+        //	printf( "Entered invtiltb function in (%6.2f %6.2f) out (%6.2f %6.2f)\n", x_dest, y_dest, *x_src, *y_src);
+
+	// Uncommenting code below causes tilt function to do nothing:
+	//		*x_src	= x_dest;	
+	//		*y_src  = y_dest;
+    return 1;
+}
+
 int shear( double x_dest, double y_dest, double* x_src, double* y_src, void* params)
 {
 	// params: double shear_horizontal, double shear_vertical;
+  //	printf( "Entered shear function \n");
 
+
 		*x_src  = x_dest + var0 * y_dest;
 		*y_src  = y_dest + var1 * x_dest;
     return 1;
@@ -382,7 +554,9 @@
 int shearInv( double x_dest, double y_dest, double* x_src, double* y_src, void* params)
 {
 	// params: double shear_horizontal, double shear_vertical;
+  //	printf( "Entered shear inv function \n");
 
+
     *y_src  = (y_dest - var1 * x_dest) / (1 - var1 * var0);
     *x_src  = (x_dest - var0 * *y_src);
     return 1;
@@ -683,7 +857,7 @@
 
 
 
-/** convert from erect to mercator */
+/** convert from erect to mercator FORWARD */
 int mercator_erect( double x_dest,double  y_dest, double* x_src, double* y_src, void* params)
 {
     // params: distanceparam
@@ -692,7 +866,7 @@
     return 1;
 }
 
-/** convert from mercator to erect */
+/** convert from mercator to erect INVERSE */
 int erect_mercator( double x_dest,double  y_dest, double* x_src, double* y_src, void* params)
 {
     // params: distanceparam

Modified: trunk/libpano/panorama.h
===================================================================
--- trunk/libpano/panorama.h	2009-09-07 20:28:26 UTC (rev 1043)
+++ trunk/libpano/panorama.h	2009-09-10 06:41:20 UTC (rev 1044)
@@ -196,6 +196,13 @@
     int shear;                  //  shear correction requested?
     double shear_x;             //  horizontal shear values
     double shear_y;             //  vertical shear values
+
+    int tilt;                  //  tilt correction requested?
+    double tilt_x;             //  tilt on x values
+    double tilt_y;             //  tilt on y values
+    double tilt_z;             //  tilt on z values
+    double tilt_scale;         //  scale for tilting
+
     int resize;                 //  scaling requested ?
     pt_int32 width;             //  new width
     pt_int32 height;            //  new height

Modified: trunk/libpano/parser.c
===================================================================
--- trunk/libpano/parser.c	2009-09-07 20:28:26 UTC (rev 1043)
+++ trunk/libpano/parser.c	2009-09-10 06:41:20 UTC (rev 1044)
@@ -326,6 +326,51 @@
                                     }
                                     im->cP.shear    = TRUE;
                                         break;
+                            case 'T':  
+                                li++;
+                                switch (*li) {
+                                case 'x':  
+                                    if( *(li+1) == '=' ){
+                                        li++;
+                                        READ_VAR( "%d", &(opt->tiltX));
+                                        opt->tiltX += 2;
+                                    }else{
+                                        READ_VAR("%lf", &(im->cP.tilt_x));
+                                    }
+                                    im->cP.tilt    = TRUE;
+                                    break;
+                                case 'y': 
+                                    if( *(li+1) == '=' ){
+                                        li++;
+                                        READ_VAR( "%d", &(opt->tiltY));
+                                        opt->tiltY += 2;
+                                    }else{
+                                        READ_VAR("%lf", &(im->cP.tilt_y));
+                                    }
+                                    im->cP.tilt    = TRUE;
+                                    break;
+                                case 'z': 
+                                    if( *(li+1) == '=' ){
+                                        li++;
+                                        READ_VAR( "%d", &(opt->tiltZ));
+                                        opt->tiltZ += 2;
+                                    }else{
+                                        READ_VAR("%lf", &(im->cP.tilt_z));
+                                    }
+                                    im->cP.tilt    = TRUE;
+                                    break;
+                                case 's': 
+                                    if( *(li+1) == '=' ){
+                                        li++;
+                                        READ_VAR( "%d", &(opt->tiltScale));
+                                        opt->tiltScale += 2;
+                                    }else{
+                                        READ_VAR("%lf", &(im->cP.tilt_scale));
+                                    }
+                                    im->cP.tilt    = TRUE;
+                                    break;
+                                }
+                                break;
                             case 'n':           // Set filename
                                         nextWord( buf, &li );
                                         sprintf( im->name, "%s", buf );
@@ -425,43 +470,62 @@
                     {
                         switch(*li)
                         {
-                            case 'y':   READ_OPT_VAR(yaw);
-                                        break;
-                            case 'p':   READ_OPT_VAR(pitch);
-                                        break;
-                            case 'r':   READ_OPT_VAR(roll);
-                                        break;
-                            case 'v':   READ_OPT_VAR(hfov);
-                                        break;
-                            case 'a':   READ_OPT_VAR(a);
-                                        break;
-                            case 'b':   READ_OPT_VAR(b);
-                                        break;
-                            case 'c':   READ_OPT_VAR(c);
-                                        break;
-                            case 'd':   READ_OPT_VAR(d);
-                                        break;
-                            case 'e':   READ_OPT_VAR(e);
-                                        break;
-                            case 'g':   READ_OPT_VAR(shear_x);
-                                        break;
-                            case 't':   READ_OPT_VAR(shear_y);
-                                        break;
-                            case 'X':   READ_VAR( "%d", &k );
-                                        if( k>=0 && k<gl->numIm )
-                                            gl->cim[k].set[0] = FALSE;
-                                        break;
-                            case 'Y':   READ_VAR( "%d", &k );
-                                        if( k>=0 && k<gl->numIm )
-                                            gl->cim[k].set[1] = FALSE;
-                                        break;
-                            case 'Z':   READ_VAR( "%d", &k );
-                                        if( k>=0 && k<gl->numIm )
-                                            gl->cim[k].set[2] = FALSE;
-                                        break;
-                            default:
-                                li++;
+                        case 'y':   READ_OPT_VAR(yaw);
+                            break;
+                        case 'p':   READ_OPT_VAR(pitch);
+                            break;
+                        case 'r':   READ_OPT_VAR(roll);
+                            break;
+                        case 'v':   READ_OPT_VAR(hfov);
+                            break;
+                        case 'a':   READ_OPT_VAR(a);
+                            break;
+                        case 'b':   READ_OPT_VAR(b);
+                            break;
+                        case 'c':   READ_OPT_VAR(c);
+                            break;
+                        case 'd':   READ_OPT_VAR(d);
+                            break;
+                        case 'e':   READ_OPT_VAR(e);
+                            break;
+                        case 'g':   READ_OPT_VAR(shear_x);
+                            break;
+                        case 't':   READ_OPT_VAR(shear_y);
+                            break;
+                        case 'T':   
+                            li++;
+                            switch (*li) {
+                            case 'x':
+                                READ_OPT_VAR(tiltX);
                                 break;
+                            case 'y':
+                                READ_OPT_VAR(tiltY);
+                                break;
+                            case 'z':
+                                READ_OPT_VAR(tiltZ);
+                                break;
+                            case 's':
+                                READ_OPT_VAR(tiltScale);
+                                break;
+                            }
+                            break;
+                        case 'S':   READ_OPT_VAR(tiltY);
+                            break;
+                        case 'X':   READ_VAR( "%d", &k );
+                            if( k>=0 && k<gl->numIm )
+                                gl->cim[k].set[0] = FALSE;
+                            break;
+                        case 'Y':   READ_VAR( "%d", &k );
+                            if( k>=0 && k<gl->numIm )
+                                gl->cim[k].set[1] = FALSE;
+                            break;
+                        case 'Z':   READ_VAR( "%d", &k );
+                            if( k>=0 && k<gl->numIm )
+                                gl->cim[k].set[2] = FALSE;
+                            break;
+                        default:
+                            li++;
+                            break;
                         }
                         
                     }
@@ -635,6 +699,12 @@
         k = gl->opt[i].shear_y - 2;
         if( k >= 0 ) gl->im[i].cP.shear_y = gl->im[ k ].cP.shear_y;
 
+        k = gl->opt[i].tiltX - 2;
+        if( k >= 0 ) gl->im[i].cP.tilt_x = gl->im[ k ].cP.tilt_x;
+
+        k = gl->opt[i].tiltY - 2;
+        if( k >= 0 ) gl->im[i].cP.tilt_y = gl->im[ k ].cP.tilt_y;
+
         gl->im[i].cP.radial_params[0][0] = 1.0 - ( gl->im[i].cP.radial_params[0][3]
                                                         + gl->im[i].cP.radial_params[0][2]
                                                         + gl->im[i].cP.radial_params[0][1] ) ;
@@ -750,16 +820,27 @@
             optc = 0;
 
         line += sprintf( line, "# Image No %d:\n", i );
-        line += sprintf( line, "# Yaw:  %g deg (%c) Pitch:  %g deg (%c) \n# Roll:   %g deg (%c) HFov:   %g deg (%c)\n# Polynomial Coefficients: a   %f (%c); b   %f (%c); c   %f (%c)\n# Horizontal Shift: %f (%c)   Vertical Shift:  %f (%c)\n",
-                    g->im[i].yaw, ( g->opt[i].yaw ? '*' : 'p' ),
-                    g->im[i].pitch,  ( g->opt[i].pitch  ? '*' : 'p' ),
-                    g->im[i].roll, ( g->opt[i].roll ? '*' : 'p' ),
-                    g->im[i].hfov,  (              optHfov  ? '*' : 'p' ),
-                    g->im[i].cP.radial_params[0][3], (opta ? '*':'p'),
-                    g->im[i].cP.radial_params[0][2], (optb ? '*':'p'),
-                    g->im[i].cP.radial_params[0][1], (optc ? '*':'p'),
-                    g->im[i].cP.horizontal_params[0], (g->opt[i].d ? '*':'p'),
-                    g->im[i].cP.vertical_params[0], (g->opt[i].e ? '*':'p')
+        line += sprintf( line, "# Yaw:  %g deg (%c) Pitch:  %g deg (%c) \n"
+"# Roll:   %g deg (%c) HFov:   %g deg (%c)\n"
+"# Polynomial Coefficients: a   %f (%c); b   %f (%c); c   %f (%c)\n"
+"# Horizontal Shift: %f (%c)   Vertical Shift:  %f (%c)\n"
+"# TiltX: %f (%c)   TiltY:  %f (%c)\n"
+"# TiltZ: %f (%c)   TiltScale:  %f (%c)\n",
+                         g->im[i].yaw, ( g->opt[i].yaw ? '*' : 'p' ),
+                         g->im[i].pitch,  ( g->opt[i].pitch  ? '*' : 'p' ),
+                         g->im[i].roll, ( g->opt[i].roll ? '*' : 'p' ),
+                         g->im[i].hfov,  (              optHfov  ? '*' : 'p' ),
+                         g->im[i].cP.radial_params[0][3], (opta ? '*':'p'),
+                         g->im[i].cP.radial_params[0][2], (optb ? '*':'p'),
+                         g->im[i].cP.radial_params[0][1], (optc ? '*':'p'),
+                         g->im[i].cP.horizontal_params[0], (g->opt[i].d ? '*':'p'),
+                         g->im[i].cP.vertical_params[0], (g->opt[i].e ? '*':'p'),
+                         // Tilt
+                         g->im[i].cP.tilt_x, (g->opt[i].tiltX ? '*':'p'),
+                         g->im[i].cP.tilt_y, (g->opt[i].tiltY ? '*':'p'),
+                         g->im[i].cP.tilt_z, (g->opt[i].tiltZ ? '*':'p'),
+                         g->im[i].cP.tilt_scale, (g->opt[i].tiltScale ? '*':'p')
+
                     );
         if( opta || optb || optc )
         {
@@ -777,6 +858,10 @@
         {
             line += sprintf( line, "g%f t%f ", g->im[i].cP.shear_x, g->im[i].cP.shear_y);
         }
+        if( g->im[i].cP.tilt )
+        {
+            line += sprintf( line, "Tx%f Ty%f Tz%f Ts%f ", g->im[i].cP.tilt_x, g->im[i].cP.tilt_y, g->im[i].cP.tilt_z, g->im[i].cP.tilt_scale);
+        }
         if( g->im[i].cP.cutFrame &&
          !( g->im[i].selection.bottom != 0 || g->im[i].selection.right != 0 )) // g->im[i].format != _fisheye_circ && g->im[i].cP.cutFrame )
         {
@@ -1443,6 +1528,23 @@
         case 't':   READ_VAR("%lf", &(im.cP.shear_y));
         im.cP.shear = TRUE;
         break;
+        case 'T': 
+            ch++;
+            switch (*ch) {
+            case 'x':   READ_VAR("%lf", &(im.cP.tilt_x));
+                im.cP.tilt     = TRUE;
+                break;
+            case 'y':   READ_VAR("%lf", &(im.cP.tilt_y));
+                im.cP.tilt = TRUE;
+                break;
+            case 'z':   READ_VAR("%lf", &(im.cP.tilt_z));
+                im.cP.tilt = TRUE;
+                break;
+            case 's':   READ_VAR("%lf", &(im.cP.tilt_scale));
+                im.cP.tilt = TRUE;
+                break;
+            }
+            break;
         case '+':   nextWord( buf, &ch );
         PrintError("Obsolete + parameter is ignored in image description");
         sprintf( sBuf.srcName, "%s", buf);

Modified: trunk/libpano/pt_stdint.h
===================================================================
--- trunk/libpano/pt_stdint.h	2009-09-07 20:28:26 UTC (rev 1043)
+++ trunk/libpano/pt_stdint.h	2009-09-10 06:41:20 UTC (rev 1044)
@@ -27,7 +27,9 @@
 
 # else
 #  include <stdint.h>
+#ifndef INLINE
 #define INLINE inline
+#endif
 # endif
 
 #endif


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

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

From: <dmg@us...> - 2009-09-14 18:23

Revision: 1045
          http://panotools.svn.sourceforge.net/panotools/?rev=1045&view=rev
Author:   dmg
Date:     2009-09-14 18:23:15 +0000 (Mon, 14 Sep 2009)

Log Message:
-----------
2009-09-14    <dmg@...>

* configure.ac: Added support for kfreebsd. Patch created by
Debian upstream maintainer Cyril Brulebois

Modified Paths:
--------------
    trunk/libpano/ChangeLog
    trunk/libpano/configure.ac

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2009-09-10 06:41:20 UTC (rev 1044)
+++ trunk/libpano/ChangeLog	2009-09-14 18:23:15 UTC (rev 1045)
@@ -1,3 +1,8 @@
+2009-09-14    <dmg@...>
+
+	* configure.ac: Added support for kfreebsd. Patch created by
+	Debian's upstream maintainer Cyril Brulebois
+
 2009-09-09    <dmg@...>
 
 	* PTcommon.c, panorama.h, pt_stdint.h, math.c, adjust.c

Modified: trunk/libpano/configure.ac
===================================================================
--- trunk/libpano/configure.ac	2009-09-10 06:41:20 UTC (rev 1044)
+++ trunk/libpano/configure.ac	2009-09-14 18:23:15 UTC (rev 1045)
@@ -27,7 +27,7 @@
     HSYS=unknown
     HCPU="${host_cpu}"
 	;;
-  linux*)
+  linux*|k*bsd*)
     PANO_WIN32_RESOURCE=
     HSYS=linux
     dnl


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

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

From: <dmg@us...> - 2009-09-16 19:50

Revision: 1050
          http://panotools.svn.sourceforge.net/panotools/?rev=1050&view=rev
Author:   dmg
Date:     2009-09-16 19:50:06 +0000 (Wed, 16 Sep 2009)

Log Message:
-----------
2009-09-16    <dmg@...>

        * correct.c (correct): Removed debugging code that I introduced
        early. I suspect correct is no longer needed. Thanks to Jim
        (again) for catching this.
 
        * parser.c (ReadCoordinates): Removed bogus case switch (thanks to
        Jim Watters for catching this!)

        * PTcommon.c: Changed use of NDEBUG to a new preprocessor define
        called PANO_TEST_INVERSE

Modified Paths:
--------------
    trunk/libpano/ChangeLog
    trunk/libpano/PTcommon.c
    trunk/libpano/correct.c
    trunk/libpano/parser.c

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2009-09-16 18:14:47 UTC (rev 1049)
+++ trunk/libpano/ChangeLog	2009-09-16 19:50:06 UTC (rev 1050)
@@ -1,3 +1,15 @@
+2009-09-16    <dmg@...>
+
+	* correct.c (correct): Removed debugging code that I introduced
+	early. I suspect correct is no longer needed. Thanks to Jim
+	(again) for catching this.
+
+	* parser.c (ReadCoordinates): Removed bogus case switch (thanks to
+	Jim Watters for catching this!)
+
+	* PTcommon.c: Changed use of NDEBUG to a new preprocessor define
+	called PANO_TEST_INVERSE
+
 2009-09-14 20:59  brunopostle
 
 	* tests/panoAutomateTest.pl,
@@ -12,8 +24,8 @@
 
 2009-09-14 18:23  dmg
 
-	* ChangeLog, configure.ac: 2009-09-14 <dmg@...>
-	  
+	* ChangeLog, configure.ac: 
+
 	  * configure.ac: Added support for kfreebsd. Patch created by
 	  Debian upstream maintainer Cyril Brulebois
 
@@ -21,7 +33,7 @@
 
 	* ChangeLog, PTcommon.c, adjust.c, correct.c, filter.h, math.c,
 	  panorama.h, parser.c, pt_stdint.h: 2009-09-09 <dmg@...>
-	  
+
 	  * PTcommon.c, panorama.h, pt_stdint.h, math.c, adjust.c
 	  PTcommon.c, filter.h, parser.c, correct.c: Integrated Dev"s
 	  implementation of tilt, extended to support rotation of the

Modified: trunk/libpano/PTcommon.c
===================================================================
--- trunk/libpano/PTcommon.c	2009-09-16 18:14:47 UTC (rev 1049)
+++ trunk/libpano/PTcommon.c	2009-09-16 19:50:06 UTC (rev 1050)
@@ -27,9 +27,6 @@
  * 
  */
 
-#define NDEBUG
-
-
 #include "filter.h"
 #include "PTcommon.h"
 #include "ColourBrightness.h"
@@ -58,6 +55,10 @@
 #endif
 
 
+// Uncomment following line to enable testing of inverses in getROI
+// #define PANO_TEST_INVERSE
+
+
 int panoFlattenTIFF(fullPath * fullPathImages, int counterImageFiles,
                     fullPath * outputFileName, int removeOriginals);
 
@@ -468,7 +469,7 @@
 {
     struct MakeParams mpinv;
     fDesc invstack[15], finvD;
-#ifndef NDEBUG                        
+#ifdef PANO_TEST_INVERSE
     struct MakeParams mp;
     fDesc stack[15], fD;
 #endif
@@ -490,7 +491,7 @@
     ROIRect->top = TrPtr->dest->height - 1;
     ROIRect->bottom = 0;
 
-#ifndef NDEBUG                        
+#ifdef PANO_TEST_INVERSE
     //The "forward" transform allows us to map pixel
     //coordinates in the output image to their location in the source image.
     // We use it to test the inverse functions of libpano
@@ -527,7 +528,7 @@
                         //Map the source image cartesian coordinate to the destination image cartesian coordinate
                         finvD.func( x_d, y_d, &Dx, &Dy, finvD.param);
                         
-#ifndef NDEBUG                        
+#ifdef PANO_TEST_INVERSE
                         fD.func( Dx, Dy, &Dx2, &Dy2, fD.param);
                         {
                             int newX, newY;

Modified: trunk/libpano/correct.c
===================================================================
--- trunk/libpano/correct.c	2009-09-16 18:14:47 UTC (rev 1049)
+++ trunk/libpano/correct.c	2009-09-16 19:50:06 UTC (rev 1050)
@@ -68,11 +68,6 @@
 	src			= TrPtr->src;
 	dest		= TrPtr->dest;
 
-        printf("inside Correct\n");
-
-        exit(1);
-        assert(0); // try to see when it is called
-
 	// Apply filters, if required
 
 

Modified: trunk/libpano/parser.c
===================================================================
--- trunk/libpano/parser.c	2009-09-16 18:14:47 UTC (rev 1049)
+++ trunk/libpano/parser.c	2009-09-16 19:50:06 UTC (rev 1050)
@@ -509,8 +509,6 @@
                                 break;
                             }
                             break;
-                        case 'S':   READ_OPT_VAR(tiltY);
-                            break;
                         case 'X':   READ_VAR( "%d", &k );
                             if( k>=0 && k<gl->numIm )
                                 gl->cim[k].set[0] = FALSE;


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

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

From: <dmg@us...> - 2009-09-17 16:40

Revision: 1051
          http://panotools.svn.sourceforge.net/panotools/?rev=1051&view=rev
Author:   dmg
Date:     2009-09-17 16:40:27 +0000 (Thu, 17 Sep 2009)

Log Message:
-----------
2009-09-17    <dmg@...>

* parser.c: Fail if Ts parameter is set to zero

Modified Paths:
--------------
    trunk/libpano/ChangeLog
    trunk/libpano/parser.c

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2009-09-16 19:50:06 UTC (rev 1050)
+++ trunk/libpano/ChangeLog	2009-09-17 16:40:27 UTC (rev 1051)
@@ -1,3 +1,7 @@
+2009-09-17    <dmg@...>
+
+	* parser.c: Fail if Ts parameter is set to zero
+
 2009-09-16    <dmg@...>
 
 	* correct.c (correct): Removed debugging code that I introduced

Modified: trunk/libpano/parser.c
===================================================================
--- trunk/libpano/parser.c	2009-09-16 19:50:06 UTC (rev 1050)
+++ trunk/libpano/parser.c	2009-09-17 16:40:27 UTC (rev 1051)
@@ -366,6 +366,10 @@
                                         opt->tiltScale += 2;
                                     }else{
                                         READ_VAR("%lf", &(im->cP.tilt_scale));
+                                        if (im->cP.tilt_scale == 0) {
+                                            PrintError("Ts parameter can't be zero. Error in script: Line %d", lineNum);
+                                            return -1;
+                                        }
                                     }
                                     im->cP.tilt    = TRUE;
                                     break;
@@ -1540,6 +1544,10 @@
                 break;
             case 's':   READ_VAR("%lf", &(im.cP.tilt_scale));
                 im.cP.tilt = TRUE;
+                if (im.cP.tilt_scale == 0) {
+                    PrintError("Ts parameter can't be zero. Error in script");
+                    return -1;
+                }
                 break;
             }
             break;


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

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

From: <jim0watters@us...> - 2009-09-18 03:25

Revision: 1056
          http://panotools.svn.sourceforge.net/panotools/?rev=1056&view=rev
Author:   jim0watters
Date:     2009-09-18 03:25:37 +0000 (Fri, 18 Sep 2009)

Log Message:
-----------
Fix crash if script p line has n"TIFF_m" without any other options for tiff

Modified Paths:
--------------
    trunk/libpano/ChangeLog
    trunk/libpano/PTcommon.c

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2009-09-17 21:27:20 UTC (rev 1055)
+++ trunk/libpano/ChangeLog	2009-09-18 03:25:37 UTC (rev 1056)
@@ -1,10 +1,13 @@
 2009-09-17    Jim Watters
 
+	* PTcommon.c Fix crash if script p line has n"TIFF_m" without any other 
+	  options for tiff
+
 	* adjust.c: Add tiltZ and tiltScale to list being set to default values
 	
 	* math.c Move variable initialization to the beginning of code block for
 	  MSSC compiler.
-
+	  
 2009-09-17    <dmg@...>
 
 	* parser.c: Fail if Ts parameter is set to zero

Modified: trunk/libpano/PTcommon.c
===================================================================
--- trunk/libpano/PTcommon.c	2009-09-17 21:27:20 UTC (rev 1055)
+++ trunk/libpano/PTcommon.c	2009-09-18 03:25:37 UTC (rev 1056)
@@ -824,20 +824,25 @@
 	if (strcmp(output_file_format, "TIFF_m") == 0 ) {
             // CHeck if we are suppose to do cropped or uncropped
             croppedTIFFIntermediate = 1;
-            nextWord(output_file_format, &tempString);
-            if (strcmp(output_file_format, "") == 0 || 
-                strcmp(output_file_format, "r:CROP") == 0
-                ) {
-                // DO uncropped by default unless we are fisheye
-                if (prefs->im.format == _fisheye_circ) {
-                    PrintError("Cropped output is unsupported for circular fisheye lenses. Ignored");
-                    croppedTIFFIntermediate = 0;
-                } 
-            } else if (strcmp(output_file_format, "r:UNCROP") == 0) {
+            if(strcmp(tempString, "") != 0) {
+              nextWord(output_file_format, &tempString);
+              if (strcmp(output_file_format, "") == 0 || 
+                  strcmp(output_file_format, "r:CROP") == 0
+                  ) {
+                  // DO uncropped by default unless we are fisheye
+                  if (prefs->im.format == _fisheye_circ) {
+                      PrintError("Cropped output is unsupported for circular fisheye lenses. Ignored");
+                  } 
+              } else if (strcmp(output_file_format, "r:UNCROP") == 0) {
+                  croppedTIFFIntermediate = 0;
+              } else {
+                  PrintError("Unsupported option in TIFF_m output (%s). Ignored", output_file_format);
+              }
+            }
+            // DO uncropped by default unless we are fisheye
+            if (prefs->im.format == _fisheye_circ) {
                 croppedTIFFIntermediate = 0;
-            } else {
-                PrintError("Unsupported option in TIFF_m output (%s). Ignored", output_file_format);
-            }
+            } 
         } else {
 	    PrintError("No support for this ouput image format (%s). Output will be TIFF_m", output_file_format);
 	}


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

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

From: <dmg@us...> - 2009-09-18 20:14

Revision: 1057
          http://panotools.svn.sourceforge.net/panotools/?rev=1057&view=rev
Author:   dmg
Date:     2009-09-18 20:13:51 +0000 (Fri, 18 Sep 2009)

Log Message:
-----------
009-09-18    <dmg@...>

Patch submitted by Kornel Benko

* ptpicker.c: Casted some values in printf to avoid compiler
warnings.

* CMakeLists.txt: As allways one has to call cmake
-DCPACK_BINARY_DEB:BOOL=ON to create a package (debian/ubuntu in
this example)

        make package creates then the package libpano13-2.9.15-Linux.deb.
           (Values automatically taken from configure.ac) The package will
install the header-files and the (shared) libpano13 library.

Modified Paths:
--------------
    trunk/libpano/CMakeLists.txt
    trunk/libpano/ChangeLog
    trunk/libpano/ptpicker.c

Modified: trunk/libpano/CMakeLists.txt
===================================================================
--- trunk/libpano/CMakeLists.txt	2009-09-18 03:25:37 UTC (rev 1056)
+++ trunk/libpano/CMakeLists.txt	2009-09-18 20:13:51 UTC (rev 1057)
@@ -27,7 +27,7 @@
 
 ## Locate the hugin source root and its parent directory
 IF ( HUGIN_BASE_DIR )
-  GET_FILENAME_COMPONENT( SOURCE_BASE_DIR ${HUGIN_SOURCE_DIR} PATH CACHE )
+  GET_FILENAME_COMPONENT( SOURCE_BASE_DIR ${HUGIN_BASE_DIR} PATH CACHE )
   set(CMAKE_MODULE_PATH ${HUGIN_BASE_DIR}/CMakeModules )
 ELSE ( HUGIN_BASE_DIR )
   GET_FILENAME_COMPONENT( SOURCE_BASE_DIR ${CMAKE_SOURCE_DIR} PATH CACHE )
@@ -125,19 +125,27 @@
   set( java_c ptpicker.c pteditor.c )
 endif ( HAVE_JAVA )
 
+set(pano13_install_hdr
+  panorama.h
+  filter.h
+  version.h
+  panotypes.h
+  PTcommon.h
+  pt_stdint.h
+  file.h
+  queryfeature.h
+  pteditor.h
+  ptutils.h)
+
 set( pano13_hdr 
 	${java_h}
+	${pano13_install_hdr}
 	ColourBrightness.h
 	f2c.h
 	fftn.h
-	filter.h 
-	panorama.h 
-	pt_stdint.h
-	PTcommon.h
 	rgbe.h
 	sys_ansi.h 
 	sys_win.h 
-	version.h 
 	ZComb.h
 )
 
@@ -145,7 +153,7 @@
 	pano13.rc
 	pano13vc.def
 )
-          
+
 set( pano13_src 
 	${java_c}
 	${win_c}
@@ -186,5 +194,63 @@
 	Triangulate.c
 	ZComb.c
 )
-	
-add_library ( libpano13 ${pano13_hdr} ${pano13_res} ${pano13_src} )
\ No newline at end of file
+
+add_library ( pano13 SHARED ${pano13_hdr} ${pano13_res} ${pano13_src} )
+
+install(TARGETS pano13 DESTINATION lib)
+install(FILES ${pano13_install_hdr} DESTINATION "include/pano13")
+
+macro(setstripped _varname _value)
+  string(STRIP ${_value} _v)
+  if(USE_POSIX_PACKAGING)
+    string(TOLOWER ${_v} ${_varname})
+  else()
+    set(${_varname} ${_v})
+  endif()
+endmacro(setstripped)
+
+set(TOP_SRC_DIR ${CMAKE_SOURCE_DIR})
+file(STRINGS "${TOP_SRC_DIR}/configure.ac" _config_lines)
+foreach(_c_l ${_config_lines} )
+  if(_c_l MATCHES "^AC_INIT\\(\\[\([^,]+\)\\], *\\[\([^,]+\)\\], *\([^,]+\)")
+    setstripped(PACKAGE_BASE ${CMAKE_MATCH_1})
+    setstripped(PACKAGE_VERSION ${CMAKE_MATCH_2})
+    setstripped(PACKAGE_BUGREPORT ${CMAKE_MATCH_3})
+    if(PACKAGE_VERSION MATCHES "^\([0-9]+\)\\.\([0-9]+\)\\.\([0-9]+\).*$")
+      message(STATUS "found version = ${PACKAGE_VERSION}")
+      set(PANO_MAJOR_VERSION ${CMAKE_MATCH_1})
+      set(PANO_MINOR_VERSION ${CMAKE_MATCH_2})
+      set(PANO_PATCH_VERSION ${CMAKE_MATCH_3})
+    endif()
+  endif()
+endforeach(_c_l)
+
+set(CPACK_PACKAGE_VERSION_MAJOR "${PANO_MAJOR_VERSION}")
+set(CPACK_PACKAGE_VERSION_MINOR "${PANO_MINOR_VERSION}")
+set(CPACK_PACKAGE_VERSION_PATCH "${PANO_PATCH_VERSION}")
+
+# needed by rpm
+set(CPACK_SET_DESTDIR "ON")
+
+# the next ones are needed by deb
+set(CPACK_PACKAGE_CONTACT "${PACKAGE_BUGREPORT}")
+set(CPACK_SOURCE_PACKAGE_FILE_NAME "libpano13")
+set(CPACK_PACKAGE_DESCRIPTION_FILE "${TOP_SRC_DIR}/README")
+set(CPACK_RESOURCE_FILE_LICENSE "${TOP_SRC_DIR}/gpl.txt")
+
+# Find the revision number and use it as the release in rpm-package-build.
+# This way we may omit the otherwise needed "--force" parameter when
+# installing from that rpm package.
+# ... Disabled for the moment, because configure.ac supplies a value
+find_program(_svnversion svnversion)
+message(STATUS "svnversion = ${_svnversion}")
+if(NOT ${_svnversion} MATCHES "-NOTFOUND")
+  execute_process(COMMAND ${_svnversion} WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE CPACK_RPM_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE)
+  # We use this value also to set the package-patch-value
+  if(CPACK_RPM_PACKAGE_RELEASE MATCHES "^\([0-9]+\)")
+    #set(CPACK_PACKAGE_VERSION_PATCH ${CMAKE_MATCH_1})
+  endif()
+endif()
+
+include(CPack)
+

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2009-09-18 03:25:37 UTC (rev 1056)
+++ trunk/libpano/ChangeLog	2009-09-18 20:13:51 UTC (rev 1057)
@@ -1,13 +1,28 @@
+2009-09-18    <dmg@...>
+
+	Patch submitted by Kornel Benko
+
+	* ptpicker.c: Casted some values in printf to avoid compiler
+	warnings.
+
+	* CMakeLists.txt: As allways one has to call cmake
+	-DCPACK_BINARY_DEB:BOOL=ON to create a package (debian/ubuntu in
+	this example)
+
+        make package creates then the package libpano13-2.9.15-Linux.deb.
+           (Values automatically taken from configure.ac) The package will
+	install the header-files and the (shared) libpano13 library.
+
 2009-09-17    Jim Watters
 
-	* PTcommon.c Fix crash if script p line has n"TIFF_m" without any other 
-	  options for tiff
+	* PTcommon.c Fix crash if script p line has n"TIFF_m" without any
+	other options for tiff
 
 	* adjust.c: Add tiltZ and tiltScale to list being set to default values
-	
+
 	* math.c Move variable initialization to the beginning of code block for
 	  MSSC compiler.
-	  
+
 2009-09-17    <dmg@...>
 
 	* parser.c: Fail if Ts parameter is set to zero

Modified: trunk/libpano/ptpicker.c
===================================================================
--- trunk/libpano/ptpicker.c	2009-09-18 03:25:37 UTC (rev 1056)
+++ trunk/libpano/ptpicker.c	2009-09-18 20:13:51 UTC (rev 1057)
@@ -731,7 +731,7 @@
 		
 		
 	
-	sprintf(line, "p f%d w%ld h%ld v%lg u%d %s n\"%s\" %s\n\n", pf, g->pano.width, g->pano.height, g->pano.hfov, g->st.feather, cv, g->pano.name, ch );
+	sprintf(line, "p f%d w%ld h%ld v%lg u%d %s n\"%s\" %s\n\n", pf, (long int) g->pano.width, (long int) g->pano.height, g->pano.hfov, g->st.feather, cv, g->pano.name, ch );
 	count = strlen( line ); mywrite( fnum, count, line );
 	
 	for(i=0; i<g->numIm; i++)
@@ -743,7 +743,7 @@
 		else
 			sprintf(ch, "v%lg", g->im[i].hfov);
 			
-		sprintf(line, "i f%ld w%ld h%ld y%lg p%lg r%lg %s %s n\"%s\" ", im->format, im->width, im->height, 
+		sprintf(line, "i f%ld w%ld h%ld y%lg p%lg r%lg %s %s n\"%s\" ", (long int) im->format, (long int) im->width, (long int) im->height, 
 											im->yaw, im->pitch, im->roll, 
 											(im->cP.correction_mode & correction_mode_morph ? "o" : "" ),
 											ch, im->name );
@@ -784,8 +784,8 @@
 		}
 
 		if( g->im[i].selection.bottom != 0 || g->im[i].selection.right != 0 ){
-			sprintf( ch, " S%ld,%ld,%ld,%ld ",g->im[i].selection.left, g->im[i].selection.right,
-						       g->im[i].selection.top, g->im[i].selection.bottom );
+			sprintf( ch, " S%ld,%ld,%ld,%ld ",(long int) g->im[i].selection.left, (long int) g->im[i].selection.right,
+						       (long int) g->im[i].selection.top, (long int) g->im[i].selection.bottom );
 			strcat(line, ch);
 		}
 


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

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

From: <kornelbenko@us...> - 2009-09-18 21:59

Revision: 1062
          http://panotools.svn.sourceforge.net/panotools/?rev=1062&view=rev
Author:   kornelbenko
Date:     2009-09-18 21:59:07 +0000 (Fri, 18 Sep 2009)

Log Message:
-----------
Added installation of manuals

Modified Paths:
--------------
    trunk/libpano/CMakeLists.txt

Added Paths:
-----------
    trunk/libpano/man/CMakeLists.txt

Modified: trunk/libpano/CMakeLists.txt
===================================================================
--- trunk/libpano/CMakeLists.txt	2009-09-18 21:39:58 UTC (rev 1061)
+++ trunk/libpano/CMakeLists.txt	2009-09-18 21:59:07 UTC (rev 1062)
@@ -34,8 +34,10 @@
   set(CMAKE_MODULE_PATH ${SOURCE_BASE_DIR}/hugin/CMakeModules )
 ENDIF ( HUGIN_BASE_DIR )
 
-## load the Hugin cmake modules
-include(HuginMacros)
+if(WIN32)
+  ## load the Hugin cmake modules
+  include(HuginMacros)
+endif()
 include(CheckIncludeFiles)
 
 ##  global setup
@@ -200,6 +202,11 @@
 install(TARGETS pano13 DESTINATION lib)
 install(FILES ${pano13_install_hdr} DESTINATION "include/pano13")
 
+set(TOP_SRC_DIR ${CMAKE_SOURCE_DIR})
+
+add_subdirectory(man)
+add_dependencies(pano13 man)
+
 macro(setstripped _varname _value)
   string(STRIP ${_value} _v)
   if(USE_POSIX_PACKAGING)
@@ -209,7 +216,6 @@
   endif()
 endmacro(setstripped)
 
-set(TOP_SRC_DIR ${CMAKE_SOURCE_DIR})
 file(STRINGS "${TOP_SRC_DIR}/configure.ac" _config_lines)
 foreach(_c_l ${_config_lines} )
   if(_c_l MATCHES "^AC_INIT\\(\\[\([^,]+\)\\], *\\[\([^,]+\)\\], *\([^,]+\)")

Added: trunk/libpano/man/CMakeLists.txt
===================================================================
--- trunk/libpano/man/CMakeLists.txt	                        (rev 0)
+++ trunk/libpano/man/CMakeLists.txt	2009-09-18 21:59:07 UTC (rev 1062)
@@ -0,0 +1,28 @@
+# This file is part of libpano13, the hugin build environment.
+# Licence details can be found in the file gpl.txt.
+#
+# Copyright (c) 2008, 2009 Kornel Benko, <Kornel.Benko@...>
+#
+
+project(man)
+
+file(GLOB_RECURSE manuals RELATIVE "${TOP_SRC_DIR}/man" "${TOP_SRC_DIR}/man/*.1")
+
+macro(add_manual _mansrc)
+  get_filename_component(_mandest ${_mansrc} NAME_WE)
+  SET(_created_manual "${CMAKE_CURRENT_BINARY_DIR}/${_mandest}.1")
+  configure_file("${TOP_SRC_DIR}/man/${_mansrc}" ${_created_manual} @ONLY)
+  SET_SOURCE_FILES_PROPERTIES(${_created_manual} GENERATED)
+  LIST(APPEND _manuals ${_created_manual})
+endmacro(add_manual)
+
+set(_manuals)
+foreach(_m ${manuals})
+  # this is not needed now, but maybe we will later
+  # adapt data like version or date into the manuals
+  add_manual(${_m})
+endforeach(_m)
+
+add_custom_target(man ALL DEPENDS ${_manuals})
+
+install(FILES ${_manuals} DESTINATION "share/man/man1")


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

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

From: <dmg@us...> - 2009-09-19 02:47

Revision: 1066
          http://panotools.svn.sourceforge.net/panotools/?rev=1066&view=rev
Author:   dmg
Date:     2009-09-19 02:47:01 +0000 (Sat, 19 Sep 2009)

Log Message:
-----------
2009-09-18    <dmg@...>

* CMakeLists.txt: Moved wx-widgets into Windows-only part

Modified Paths:
--------------
    trunk/libpano/CMakeLists.txt
    trunk/libpano/ChangeLog

Modified: trunk/libpano/CMakeLists.txt
===================================================================
--- trunk/libpano/CMakeLists.txt	2009-09-19 02:41:59 UTC (rev 1065)
+++ trunk/libpano/CMakeLists.txt	2009-09-19 02:47:01 UTC (rev 1066)
@@ -51,9 +51,9 @@
 IF (WIN32)
   SET(wxWidgets_ROOT_DIR ${SOURCE_BASE_DIR}/wxWidgets-2.8.10)
   ADD_DEFINITIONS(-D__Win__)
+  FIND_PACKAGE(wxWidgets REQUIRED)
 ENDIF(WIN32)
 
-FIND_PACKAGE(wxWidgets REQUIRED)
 
 ##
 ## Graphics libraries

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2009-09-19 02:41:59 UTC (rev 1065)
+++ trunk/libpano/ChangeLog	2009-09-19 02:47:01 UTC (rev 1066)
@@ -1,3 +1,7 @@
+2009-09-18    <dmg@...>
+
+	* CMakeLists.txt: Moved wx-widgets into Windows-only part
+
 2009-09-18    <dmg@...>
 
 	* doc/developmentPolicy.txt: Added file with a draft of a policy


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

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

From: <kornelbenko@us...> - 2009-09-19 05:41

Revision: 1067
          http://panotools.svn.sourceforge.net/panotools/?rev=1067&view=rev
Author:   kornelbenko
Date:     2009-09-19 05:41:17 +0000 (Sat, 19 Sep 2009)

Log Message:
-----------
Added tools directory

Modified Paths:
--------------
    trunk/libpano/CMakeLists.txt
    trunk/libpano/ChangeLog

Added Paths:
-----------
    trunk/libpano/tools/CMakeLists.txt

Modified: trunk/libpano/CMakeLists.txt
===================================================================
--- trunk/libpano/CMakeLists.txt	2009-09-19 02:47:01 UTC (rev 1066)
+++ trunk/libpano/CMakeLists.txt	2009-09-19 05:41:17 UTC (rev 1067)
@@ -204,10 +204,14 @@
 
 install(FILES ${pano13_install_hdr} DESTINATION "include/pano13")
 
+#
+
 set(TOP_SRC_DIR ${CMAKE_SOURCE_DIR})
 
 add_subdirectory(man)
 add_dependencies(pano13 man)
+add_subdirectory(tools)
+add_dependencies(tools pano13)
 
 macro(setstripped _varname _value)
   string(STRIP ${_value} _v)

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2009-09-19 02:47:01 UTC (rev 1066)
+++ trunk/libpano/ChangeLog	2009-09-19 05:41:17 UTC (rev 1067)
@@ -1,3 +1,9 @@
+2009-09-19    <Kornel.Benko@...>
+
+	* tools/CMakeLists.txt: created, but don't know, how to produce panoinfo on unix yet
+
+	* CMakeLists.txt: added tools directory + tools dependencies
+
 2009-09-18    <dmg@...>
 
 	* CMakeLists.txt: Moved wx-widgets into Windows-only part

Added: trunk/libpano/tools/CMakeLists.txt
===================================================================
--- trunk/libpano/tools/CMakeLists.txt	                        (rev 0)
+++ trunk/libpano/tools/CMakeLists.txt	2009-09-19 05:41:17 UTC (rev 1067)
@@ -0,0 +1,25 @@
+# This file is part of libpano13, the hugin build environment.
+# Licence details can be found in the file gpl.txt.
+#
+# Copyright (c) 2008, 2009 Kornel Benko, <Kornel.Benko@...>
+#
+
+project(tools)
+
+set(commands PTtiff2psd PTtiffdump PTcrop PTAInterpolate PTblender
+    PTroller PTuncrop PToptimizer PTmender PTinfo PTmasker)
+# panoinfo needs windows.h
+
+if(WIN32)
+  list(APPEND commands panoinfo)
+endif()
+
+include_directories(${TOP_SRC_DIR})
+
+foreach(_cmd ${commands})
+  add_executable(${_cmd} ${_cmd}.c)
+  target_link_libraries(${_cmd} pano13 ${TIFF_LIBRARY} ${PNG_LIBRARY})
+  install(TARGETS ${_cmd} DESTINATION bin CONFIGURATIONS Release RelWithDebInfo MinSizeRel)
+endforeach(_cmd)
+
+add_custom_target(tools DEPENDS ${commands})
\ No newline at end of file


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

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

From: <kornelbenko@us...> - 2009-09-19 06:22

Revision: 1068
          http://panotools.svn.sourceforge.net/panotools/?rev=1068&view=rev
Author:   kornelbenko
Date:     2009-09-19 06:21:48 +0000 (Sat, 19 Sep 2009)

Log Message:
-----------
Add installation of lib/pkgconfig/libpano13.pc

Modified Paths:
--------------
    trunk/libpano/CMakeLists.txt
    trunk/libpano/ChangeLog

Modified: trunk/libpano/CMakeLists.txt
===================================================================
--- trunk/libpano/CMakeLists.txt	2009-09-19 05:41:17 UTC (rev 1067)
+++ trunk/libpano/CMakeLists.txt	2009-09-19 06:21:48 UTC (rev 1068)
@@ -204,8 +204,6 @@
 
 install(FILES ${pano13_install_hdr} DESTINATION "include/pano13")
 
-#
-
 set(TOP_SRC_DIR ${CMAKE_SOURCE_DIR})
 
 add_subdirectory(man)
@@ -237,6 +235,21 @@
   endif()
 endforeach(_c_l)
 
+# set some variables which are used in libpano13.pc.in
+set(prefix ${CMAKE_INSTALL_PREFIX})
+set(exec_prefix ${CMAKE_INSTALL_PREFIX})
+set(libdir ${CMAKE_INSTALL_PREFIX}/lib)
+set(includedir ${CMAKE_INSTALL_PREFIX}/include)
+set(LIB_JPEG ${JPEG_LIBRARY})
+set(LIB_TIFF ${TIFF_LIBRARY})
+set(LIB_ZLIB ${ZLIB_LIBRARY})
+set(LIB_PNG ${PNG_LIBRARY})
+set(VERSION ${PACKAGE_VERSION})
+
+configure_file("${TOP_SRC_DIR}/libpano13.pc.in" "${CMAKE_BINARY_DIR}/libpano13.pc" @ONLY)
+
+install(FILES "${CMAKE_BINARY_DIR}/libpano13.pc" DESTINATION "lib/pkgconfig")
+
 set(CPACK_PACKAGE_VERSION_MAJOR "${PANO_MAJOR_VERSION}")
 set(CPACK_PACKAGE_VERSION_MINOR "${PANO_MINOR_VERSION}")
 set(CPACK_PACKAGE_VERSION_PATCH "${PANO_PATCH_VERSION}")

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2009-09-19 05:41:17 UTC (rev 1067)
+++ trunk/libpano/ChangeLog	2009-09-19 06:21:48 UTC (rev 1068)
@@ -1,5 +1,9 @@
 2009-09-19    <Kornel.Benko@...>
 
+	* CMakeLists.txt: Added libpano13.pc
+
+2009-09-19    <Kornel.Benko@...>
+
 	* tools/CMakeLists.txt: created, but don't know, how to produce panoinfo on unix yet
 
 	* CMakeLists.txt: added tools directory + tools dependencies


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

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

From: <kornelbenko@us...> - 2009-09-19 12:59

Revision: 1069
          http://panotools.svn.sourceforge.net/panotools/?rev=1069&view=rev
Author:   kornelbenko
Date:     2009-09-19 12:59:24 +0000 (Sat, 19 Sep 2009)

Log Message:
-----------
Enable test of our only two simple tests.

In build-tree one has first to call "make".
After this one may call "make test" to actually execute the tests.

Modified Paths:
--------------
    trunk/libpano/CMakeLists.txt
    trunk/libpano/ChangeLog

Added Paths:
-----------
    trunk/libpano/tests/CMakeLists.txt
    trunk/libpano/tests/simpleStitch/CMakeLists.txt
    trunk/libpano/tests/simpleTiff16/CMakeLists.txt

Modified: trunk/libpano/CMakeLists.txt
===================================================================
--- trunk/libpano/CMakeLists.txt	2009-09-19 06:21:48 UTC (rev 1068)
+++ trunk/libpano/CMakeLists.txt	2009-09-19 12:59:24 UTC (rev 1069)
@@ -279,3 +279,6 @@
 
 include(CPack)
 
+
+enable_testing()
+add_subdirectory(tests)

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2009-09-19 06:21:48 UTC (rev 1068)
+++ trunk/libpano/ChangeLog	2009-09-19 12:59:24 UTC (rev 1069)
@@ -1,5 +1,15 @@
 2009-09-19    <Kornel.Benko@...>
 
+	* CMakeLists.txt: enable testing
+
+	* tests/CMakeLists.txt: define the macro prepare_test and add the tests
+
+	* tests/simpleStitch/CMakeLists.txt: call "prepare_test" to make test1
+
+	* tests/simpleTiff16/CMakeLists.txt: call "prepare_test" to make test2
+
+2009-09-19    <Kornel.Benko@...>
+
 	* CMakeLists.txt: Added libpano13.pc
 
 2009-09-19    <Kornel.Benko@...>

Added: trunk/libpano/tests/CMakeLists.txt
===================================================================
--- trunk/libpano/tests/CMakeLists.txt	                        (rev 0)
+++ trunk/libpano/tests/CMakeLists.txt	2009-09-19 12:59:24 UTC (rev 1069)
@@ -0,0 +1,33 @@
+# This file is part of libpano13, the hugin build environment.
+# Licence details can be found in the file gpl.txt.
+#
+# Copyright (c) 2008, 2009 Kornel Benko, <Kornel.Benko@...>
+#
+
+project(test)
+
+macro(prepare_test _testname _prjname _imagemask)
+  file(GLOB images  RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/${_imagemask}")
+  file(GLOB references  RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/reference/*")
+  set(_depends)
+  foreach(_i ${images} ${references})
+    if(NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${_i}")
+      add_custom_command(
+        OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${_i}"
+        COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/${_i}" "${CMAKE_CURRENT_BINARY_DIR}/${_i}"
+        DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${_i}")
+      SET_SOURCE_FILES_PROPERTIES("${CMAKE_CURRENT_BINARY_DIR}/${_i}" GENERATED)
+      list(APPEND _depends "${CMAKE_CURRENT_BINARY_DIR}/${_i}")
+    endif()
+  endforeach(_i)
+  add_custom_target(${_prjname} ALL DEPENDS ${_depends})
+
+  add_test(${_testname} ${PERL_EXE} "${TOP_SRC_DIR}/tests/panoAutomateTest.pl" "${CMAKE_CURRENT_SOURCE_DIR}/simple.txt")
+  add_dependencies(${_prjname} tools)
+endmacro()
+
+find_program(PERL_EXE "perl")
+if(NOT PERL_EXE MATCHES "-NOTFOUND")
+    add_subdirectory(simpleStitch)
+    add_subdirectory(simpleTiff16)
+endif()

Added: trunk/libpano/tests/simpleStitch/CMakeLists.txt
===================================================================
--- trunk/libpano/tests/simpleStitch/CMakeLists.txt	                        (rev 0)
+++ trunk/libpano/tests/simpleStitch/CMakeLists.txt	2009-09-19 12:59:24 UTC (rev 1069)
@@ -0,0 +1,10 @@
+# This file is part of libpano13, the hugin build environment.
+# Licence details can be found in the file gpl.txt.
+#
+# Copyright (c) 2008, 2009 Kornel Benko, <Kornel.Benko@...>
+#
+
+project(test1)
+
+prepare_test(simpleStitch test1 "*.jpg")
+

Added: trunk/libpano/tests/simpleTiff16/CMakeLists.txt
===================================================================
--- trunk/libpano/tests/simpleTiff16/CMakeLists.txt	                        (rev 0)
+++ trunk/libpano/tests/simpleTiff16/CMakeLists.txt	2009-09-19 12:59:24 UTC (rev 1069)
@@ -0,0 +1,10 @@
+# This file is part of libpano13, the hugin build environment.
+# Licence details can be found in the file gpl.txt.
+#
+# Copyright (c) 2008, 2009 Kornel Benko, <Kornel.Benko@...>
+#
+
+project(test2)
+
+prepare_test(simpleTiff16 test2 "*.TIF")
+


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

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

From: <jim0watters@us...> - 2009-09-19 15:06

Revision: 1070
          http://panotools.svn.sourceforge.net/panotools/?rev=1070&view=rev
Author:   jim0watters
Date:     2009-09-19 15:06:10 +0000 (Sat, 19 Sep 2009)

Log Message:
-----------
fixed getROI to not clip the nadir and zenith shots when outputting as cropped tiffs.

Modified Paths:
--------------
    trunk/libpano/ChangeLog
    trunk/libpano/PTcommon.c

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2009-09-19 12:59:24 UTC (rev 1069)
+++ trunk/libpano/ChangeLog	2009-09-19 15:06:10 UTC (rev 1070)
@@ -1,3 +1,10 @@
+2009-09-19    Jim Watters
+
+    * PTcommon.c fixed getROI to not clip the nadir and zenith shots when 
+      outputting as cropped tiffs
+
+    * doc/stitch.txt, doc/optimize.txt: documented the Tilt parameters
+
 2009-09-19    <Kornel.Benko@...>
 
 	* CMakeLists.txt: enable testing

Modified: trunk/libpano/PTcommon.c
===================================================================
--- trunk/libpano/PTcommon.c	2009-09-19 12:59:24 UTC (rev 1069)
+++ trunk/libpano/PTcommon.c	2009-09-19 15:06:10 UTC (rev 1070)
@@ -469,10 +469,8 @@
 {
     struct MakeParams mpinv;
     fDesc invstack[15], finvD;
-#ifdef PANO_TEST_INVERSE
     struct MakeParams mp;
     fDesc stack[15], fD;
-#endif
     int color = 0;
 
     int x, y, x_jump;
@@ -491,7 +489,6 @@
     ROIRect->top = TrPtr->dest->height - 1;
     ROIRect->bottom = 0;
 
-#ifdef PANO_TEST_INVERSE
     //The "forward" transform allows us to map pixel
     //coordinates in the output image to their location in the source image.
     // We use it to test the inverse functions of libpano
@@ -499,7 +496,6 @@
     SetMakeParams( stack, &mp, &(aP->im) , &(aP->pano), color );
     fD.func = execute_stack_new; 
     fD.param = stack;
-#endif
 
     //The "inverse" transform allows us to map pixel coordinates in each source image
     //to their location in the output image.
@@ -583,7 +579,57 @@
         
     // printf("ROI1: %ld,%ld - %ld, %ld\n", ROIRect->left, ROIRect->top, ROIRect->right, ROIRect->bottom);
 
+        // If the destination is wrapped and the ROI is at least 95% of the width
+        // Then ensure it is of the full width so no missing data is removed from either side.
+        if ( (TrPtr->mode & _wrapX) &&
+             ( (ROIRect->right-ROIRect->left) > (TrPtr->dest->width * 0.95) ) )
+        {
+          ROIRect->left  = 0;
+          ROIRect->right = TrPtr->dest->width-1;
+        }
 
+        // Test for a zenith shot
+        if(ROIRect->top != 0)
+        {
+          Dx = 0;
+          Dy = - h2;
+          fD.func( Dx, Dy, &Dx2, &Dy2, fD.param);
+          {
+            if (!isnan(Dx2) && !isnan(Dy2)) {
+
+              x_d = (int)(Dx2 + 0.5 + sw2);
+              y_d = (int)(Dy2 + 0.5 + sh2);
+              // if x_d, y_d is inside the image then this is a zenith shot and should extent to the top
+              if (y_d >= 0 && y_d <= TrPtr->src->height &&
+                  x_d >= 0 && x_d <= TrPtr->src->width )
+              {
+                ROIRect->top = 0;
+              }
+            }
+          }
+        }
+
+        // Test for a nadir shot
+        if(ROIRect->bottom != TrPtr->dest->height-1)
+        {
+          Dx = 0;
+          Dy = h2;
+          fD.func( Dx, Dy, &Dx2, &Dy2, fD.param);
+          {
+            if (!isnan(Dx2) && !isnan(Dy2)) {
+
+              x_d = (int)(Dx2 + 0.5 + sw2);
+              y_d = (int)(Dy2 + 0.5 + sh2);
+              // if x_d, y_d is inside the image then this is a zenith shot and should extent to the top
+              if (y_d >= 0 && y_d <= TrPtr->src->height &&
+                  x_d >= 0 && x_d <= TrPtr->src->width )
+              {
+                ROIRect->bottom = TrPtr->dest->height-1;
+              }
+            }
+          }
+        }
+
         //Reduce ROI if it extends beyond boundaries of final panorama region
         if (ROIRect->left    < 0) ROIRect->left =0;
         if (ROIRect->top     < 0) ROIRect->top  =0;
@@ -724,7 +770,7 @@
     memset(&transform, 0, sizeof(TrformStr));
     transform.src = &image1;    // Input image
     transform.dest = &resultPanorama;   // Output image
-    transform.mode = 8;         // How to run transformation
+    transform.mode = _honor_valid;      // How to run transformation
     transform.success = 1;      // 1 success 0 failure
 
     //Allocate space to hold fully qualified names of input images
@@ -853,6 +899,8 @@
         transform.interpolator  = prefs->interpolator;
         transform.gamma         = prefs->gamma;
         transform.fastStep      = prefs->fastStep;
+        if( prefs->pano.hfov == 360.0 )
+          transform.mode       |= _wrapX;
         
         if (ptQuietFlag == 0) {
             sprintf(tmpStr, "Converting Image %d / %d", (loopCounter + 1),


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

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

From: <kornelbenko@us...> - 2009-09-19 19:06

Revision: 1072
          http://panotools.svn.sourceforge.net/panotools/?rev=1072&view=rev
Author:   kornelbenko
Date:     2009-09-19 19:06:07 +0000 (Sat, 19 Sep 2009)

Log Message:
-----------
Don't compile PTAInterpolate if no JAVA, it uses writeProject() from
ptpicker.c

Modified Paths:
--------------
    trunk/libpano/ChangeLog
    trunk/libpano/tools/CMakeLists.txt

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2009-09-19 17:26:49 UTC (rev 1071)
+++ trunk/libpano/ChangeLog	2009-09-19 19:06:07 UTC (rev 1072)
@@ -1,3 +1,7 @@
+2009-09-19    <Kornel.Benko@...>
+
+	* CMakeLists.txt: Remove java dependency, PTAInterpolate uses writeProject() from ptpicker.c
+
 2009-09-19    Jim Watters
 
     * PTcommon.c fixed getROI to not clip the nadir and zenith shots when 

Modified: trunk/libpano/tools/CMakeLists.txt
===================================================================
--- trunk/libpano/tools/CMakeLists.txt	2009-09-19 17:26:49 UTC (rev 1071)
+++ trunk/libpano/tools/CMakeLists.txt	2009-09-19 19:06:07 UTC (rev 1072)
@@ -6,8 +6,13 @@
 
 project(tools)
 
-set(commands PTtiff2psd PTtiffdump PTcrop PTAInterpolate PTblender
+set(commands PTtiff2psd PTtiffdump PTcrop PTblender
     PTroller PTuncrop PToptimizer PTmender PTinfo PTmasker)
+if (HAVE_JAVA)
+  # this one depends on java (uses writeProject() from ptpicker)
+  list(APPEND commands PTAInterpolate)
+endif()
+
 # panoinfo needs windows.h
 
 if(WIN32)


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

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

From: <kornelbenko@us...> - 2009-09-20 12:41

Revision: 1074
          http://panotools.svn.sourceforge.net/panotools/?rev=1074&view=rev
Author:   kornelbenko
Date:     2009-09-20 12:40:55 +0000 (Sun, 20 Sep 2009)

Log Message:
-----------
creation of static pano13 library too

Modified Paths:
--------------
    trunk/libpano/CMakeLists.txt
    trunk/libpano/ChangeLog

Modified: trunk/libpano/CMakeLists.txt
===================================================================
--- trunk/libpano/CMakeLists.txt	2009-09-20 06:52:49 UTC (rev 1073)
+++ trunk/libpano/CMakeLists.txt	2009-09-20 12:40:55 UTC (rev 1074)
@@ -199,10 +199,14 @@
 	ZComb.c
 )
 
-add_library (pano13 SHARED ${pano13_hdr} ${pano13_res} ${pano13_src})
+add_library(pano13 SHARED ${pano13_hdr} ${pano13_res} ${pano13_src})
+add_library(pano13a STATIC ${pano13_hdr} ${pano13_res} ${pano13_src})
 set_target_properties(pano13 PROPERTIES VERSION "1.0.0" SOVERSION "1")
+set_target_properties(pano13a PROPERTIES OUTPUT_NAME pano13)
 
-install(TARGETS pano13 LIBRARY DESTINATION lib)
+install(TARGETS pano13 pano13a
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib)
 
 install(FILES ${pano13_install_hdr} DESTINATION "include/pano13")
 

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2009-09-20 06:52:49 UTC (rev 1073)
+++ trunk/libpano/ChangeLog	2009-09-20 12:40:55 UTC (rev 1074)
@@ -1,3 +1,7 @@
+2009-09-20    <Kornel.Benko@...>
+
+	* CMakeLists.txt: white space + creation of static pano13 library too
+
 2009-09-19    <Kornel.Benko@...>
 
 	* CMakeLists.txt: Remove java dependency, PTAInterpolate uses writeProject() from ptpicker.c


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

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

From: <brunopostle@us...> - 2009-09-20 20:52

Revision: 1075
          http://panotools.svn.sourceforge.net/panotools/?rev=1075&view=rev
Author:   brunopostle
Date:     2009-09-20 20:52:43 +0000 (Sun, 20 Sep 2009)

Log Message:
-----------
Bump soname to 2:0:0 for real this time

Modified Paths:
--------------
    trunk/libpano/CMakeLists.txt
    trunk/libpano/Makefile.am

Modified: trunk/libpano/CMakeLists.txt
===================================================================
--- trunk/libpano/CMakeLists.txt	2009-09-20 12:40:55 UTC (rev 1074)
+++ trunk/libpano/CMakeLists.txt	2009-09-20 20:52:43 UTC (rev 1075)
@@ -201,7 +201,7 @@
 
 add_library(pano13 SHARED ${pano13_hdr} ${pano13_res} ${pano13_src})
 add_library(pano13a STATIC ${pano13_hdr} ${pano13_res} ${pano13_src})
-set_target_properties(pano13 PROPERTIES VERSION "1.0.0" SOVERSION "1")
+set_target_properties(pano13 PROPERTIES VERSION "2.0.0" SOVERSION "2")
 set_target_properties(pano13a PROPERTIES OUTPUT_NAME pano13)
 
 install(TARGETS pano13 pano13a

Modified: trunk/libpano/Makefile.am
===================================================================
--- trunk/libpano/Makefile.am	2009-09-20 12:40:55 UTC (rev 1074)
+++ trunk/libpano/Makefile.am	2009-09-20 20:52:43 UTC (rev 1075)
@@ -64,7 +64,7 @@
 if HAVE_LINUX
 LIN_SRC =  sys_ansi.c ppm.c
 LIN_DEFS = -D__Ansi__=1
-LIN_LDFS = -version-info 1:0:0
+LIN_LDFS = -version-info 2:0:0
 
 install-exec-hook:
 	@true
@@ -74,7 +74,7 @@
 if HAVE_DARWIN
 DAR_SRC =  sys_ansi.c ppm.c
 DAR_DEFS = -D__Ansi__=1
-DAR_LDFS = -version-info 1:0:0
+DAR_LDFS = -version-info 2:0:0
 
 install-exec-hook:
 	@true


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

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

From: <brunopostle@us...> - 2009-09-20 21:08

Revision: 1076
          http://panotools.svn.sourceforge.net/panotools/?rev=1076&view=rev
Author:   brunopostle
Date:     2009-09-20 21:08:13 +0000 (Sun, 20 Sep 2009)

Log Message:
-----------
The cmake stuff should be available in the automake tarball

Modified Paths:
--------------
    trunk/libpano/Makefile.am
    trunk/libpano/man/Makefile.am
    trunk/libpano/tests/Makefile.am
    trunk/libpano/tests/simpleStitch/Makefile.am
    trunk/libpano/tests/simpleTiff16/Makefile.am
    trunk/libpano/tools/Makefile.am

Modified: trunk/libpano/Makefile.am
===================================================================
--- trunk/libpano/Makefile.am	2009-09-20 20:52:43 UTC (rev 1075)
+++ trunk/libpano/Makefile.am	2009-09-20 21:08:13 UTC (rev 1076)
@@ -109,6 +109,7 @@
 
 EXTRA_DIST =  gpl.txt README.linux README.windows \
 	      makefile.win32 \
+	      CMakeLists.txt \
 	      bootstrap filter.r libpano13.def pano13.rc \
 	      seamer_.c sys_X11.c sys_win.c bmp.c shell_mac.c \
 	      sys_mac.c ppm.c sys_ansi.c ppm.c ZComb.h adjust.h \

Modified: trunk/libpano/man/Makefile.am
===================================================================
--- trunk/libpano/man/Makefile.am	2009-09-20 20:52:43 UTC (rev 1075)
+++ trunk/libpano/man/Makefile.am	2009-09-20 21:08:13 UTC (rev 1076)
@@ -4,7 +4,8 @@
 
 EXTRA_DIST = panoinfo.pod PTAInterpolate.pod PTblender.pod PTcrop.pod PTinfo.pod PTmasker.pod \
 	PTmender.pod PToptimizer.pod PTroller.pod PTtiff2psd.pod PTtiffdump.pod \
-	PTuncrop.pod $(man_MANS)
+	PTuncrop.pod $(man_MANS) \
+	CMakeLists.txt
 
 %.1: %.pod
 	pod2man --center $(PACKAGE) --release $(PACKAGE_VERSION) $< $@

Modified: trunk/libpano/tests/Makefile.am
===================================================================
--- trunk/libpano/tests/Makefile.am	2009-09-20 20:52:43 UTC (rev 1075)
+++ trunk/libpano/tests/Makefile.am	2009-09-20 21:08:13 UTC (rev 1076)
@@ -1,4 +1,5 @@
-EXTRA_DIST = panoAutomateTest.pl ChangeLog
+EXTRA_DIST = panoAutomateTest.pl ChangeLog \
+	CMakeLists.txt
 
 SUBDIRS = simpleStitch simpleTiff16
 

Modified: trunk/libpano/tests/simpleStitch/Makefile.am
===================================================================
--- trunk/libpano/tests/simpleStitch/Makefile.am	2009-09-20 20:52:43 UTC (rev 1075)
+++ trunk/libpano/tests/simpleStitch/Makefile.am	2009-09-20 21:08:13 UTC (rev 1076)
@@ -1,4 +1,5 @@
 EXTRA_DIST = 051221_6054_750.jpg 051221_6055_750.jpg \
+	     CMakeLists.txt \
              ChangeLog README.txt simple.pto simple.txt
 
 MAINTAINERCLEANFILES = \

Modified: trunk/libpano/tests/simpleTiff16/Makefile.am
===================================================================
--- trunk/libpano/tests/simpleTiff16/Makefile.am	2009-09-20 20:52:43 UTC (rev 1075)
+++ trunk/libpano/tests/simpleTiff16/Makefile.am	2009-09-20 21:08:13 UTC (rev 1076)
@@ -1,4 +1,5 @@
 EXTRA_DIST = 060520_3398.TIF \
+	     CMakeLists.txt \
              ChangeLog simple.txt
 
 SUBDIRS = reference

Modified: trunk/libpano/tools/Makefile.am
===================================================================
--- trunk/libpano/tools/Makefile.am	2009-09-20 20:52:43 UTC (rev 1075)
+++ trunk/libpano/tools/Makefile.am	2009-09-20 21:08:13 UTC (rev 1076)
@@ -80,7 +80,8 @@
 panoinfo_SOURCES    = $(WIN_SRC) $(LIN_SRC) $(DAR_SRC)
 panoinfo_LDADD      = -l${PANOLIB}
 
-EXTRA_DIST = README.PTmender 
+EXTRA_DIST = README.PTmender \
+	CMakeLists.txt
                
 
 MAINTAINERCLEANFILES = \


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

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

From: <kornelbenko@us...> - 2009-09-21 06:30

Revision: 1078
          http://panotools.svn.sourceforge.net/panotools/?rev=1078&view=rev
Author:   kornelbenko
Date:     2009-09-21 06:30:35 +0000 (Mon, 21 Sep 2009)

Log Message:
-----------
Added needed libraries to create tools

Modified Paths:
--------------
    trunk/libpano/CMakeLists.txt
    trunk/libpano/tools/CMakeLists.txt

Modified: trunk/libpano/CMakeLists.txt
===================================================================
--- trunk/libpano/CMakeLists.txt	2009-09-20 21:32:54 UTC (rev 1077)
+++ trunk/libpano/CMakeLists.txt	2009-09-21 06:30:35 UTC (rev 1078)
@@ -67,7 +67,9 @@
 FIND_PACKAGE(PNG REQUIRED)
 INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
 INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR})
-
+
+set(_common_libs ${TIFF_LIBRARIES} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES})
+
 #
 # Check build type and set options accordingly
 #

Modified: trunk/libpano/tools/CMakeLists.txt
===================================================================
--- trunk/libpano/tools/CMakeLists.txt	2009-09-20 21:32:54 UTC (rev 1077)
+++ trunk/libpano/tools/CMakeLists.txt	2009-09-21 06:30:35 UTC (rev 1078)
@@ -23,8 +23,8 @@
 
 foreach(_cmd ${commands})
   add_executable(${_cmd} ${_cmd}.c)
-  target_link_libraries(${_cmd} pano13 ${TIFF_LIBRARY} ${PNG_LIBRARY})
+  target_link_libraries(${_cmd} pano13 ${_common_libs})
   install(TARGETS ${_cmd} DESTINATION bin CONFIGURATIONS Release RelWithDebInfo MinSizeRel)
 endforeach(_cmd)
 
-add_custom_target(tools DEPENDS ${commands})
\ No newline at end of file
+add_custom_target(tools DEPENDS ${commands})


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

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

From: <dangelo@us...> - 2009-09-22 19:46

Revision: 1079
          http://panotools.svn.sourceforge.net/panotools/?rev=1079&view=rev
Author:   dangelo
Date:     2009-09-22 19:46:33 +0000 (Tue, 22 Sep 2009)

Log Message:
-----------
Mosaic mode based on camera position (not compiled by default).

Modified Paths:
--------------
    trunk/libpano/ChangeLog
    trunk/libpano/adjust.c
    trunk/libpano/filter.h
    trunk/libpano/math.c

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2009-09-21 06:30:35 UTC (rev 1078)
+++ trunk/libpano/ChangeLog	2009-09-22 19:46:33 UTC (rev 1079)
@@ -1,3 +1,8 @@
+2009-09-20 21:08  dangelo
+
+	* adjust.c, panorama.h, filter.h, math.c: Mosaic mode based on
+	  camera position.
+
 2009-09-20 21:08  brunopostle
 
 	* Makefile.am, man/Makefile.am, tests/Makefile.am,

Modified: trunk/libpano/adjust.c
===================================================================
--- trunk/libpano/adjust.c	2009-09-21 06:30:35 UTC (rev 1078)
+++ trunk/libpano/adjust.c	2009-09-22 19:46:33 UTC (rev 1079)
@@ -51,6 +51,8 @@
 #define ADJUST_LOG_FILENAME "PToolsLog.txt"  // file name for logging, if enabled
 #define ADJUST_LOGGING_ENABLED 0
 
+// enable mosaic with X,Y,Z camera positions instead of tilt
+//#define MOSAIC_XYZ 1
 
 FILE* adjustLogFile = 0;
 
@@ -787,10 +789,17 @@
     mp->rot[0]      = mp->distance * PI;                                // 180 in screenpoints
     mp->rot[1]      = -im->yaw *  mp->distance * PI / 180.0;            // rotation angle in screenpoints
     
+#ifdef MOSAIC_XYZ
+    mp->tilt[0] = im->cP.tilt_x;
+    mp->tilt[1] = im->cP.tilt_y;
+    mp->tilt[2] = im->cP.tilt_z;
+    mp->tilt[3] = im->cP.tilt_scale;
+#else
     mp->tilt[0] = DEG_TO_RAD(im->cP.tilt_x);
     mp->tilt[1] = DEG_TO_RAD(im->cP.tilt_y);
     mp->tilt[2] = DEG_TO_RAD(im->cP.tilt_z);
     mp->tilt[3] = im->cP.tilt_scale;
+#endif
 
     /*
     printf("Image format %d\n", (int)(im->format));
@@ -898,14 +907,14 @@
     {
       SetDesc(stack[i],   erect_albersequalareaconic,     mp  ); i++; // Convert albersequalareaconic to equirect
     }
-	else if(pn->format == _biplane)
-	{
-	  SetDesc(stack[i], erect_biplane, mp ); i++;  // Convert biplane to equirect
-	}
-	else if(pn->format == _triplane)
-	{
+    else if(pn->format == _biplane)
+    {
+      SetDesc(stack[i], erect_biplane, mp ); i++;  // Convert biplane to equirect
+    }
+    else if(pn->format == _triplane)
+    {
       SetDesc(stack[i], erect_triplane, mp ); i++;  // Convert triplane to equirect
-	}
+    }
     else if(pn->format == _equirectangular) 
     {
       // no conversion needed     
@@ -913,6 +922,13 @@
       PrintError("Projection type %d not supported, using equirectangular", pn->format);
     }
 
+#ifdef MOSAIC_XYZ
+    if (im->cP.tilt) {
+      SetDesc(stack[i], plane_transfer_to_camera, mp);   i++;
+    }    
+#endif
+    // 
+
     SetDesc(  stack[i],   rotate_erect,           mp->rot         ); i++; // Rotate equirect. image horizontally
     SetDesc(  stack[i],   sphere_tp_erect,        &(mp->distance) ); i++; // Convert spherical image to equirect.
     SetDesc(  stack[i],   persp_sphere,           mp->perspect    ); i++; // Perspective Control spherical Image
@@ -941,9 +957,11 @@
         case correction_mode_deregister:SetDesc(stack[i],deregister,mp->rad); i++; break;
       }
     }
+#ifndef MOSAIC_XYZ
     if (im->cP.tilt) {
       SetDesc(stack[i],   tiltInverse,                   mp);   i++;
     }
+#endif
 
     if (mp->vertical != 0.0)
     {
@@ -1176,11 +1194,17 @@
   mp->shear[1]  = im->cP.shear_y / im->width;
   
   //PrintMakeParams("Inverse 10", mp,im);
-
+#ifdef MOSAIC_XYZ
+  mp->tilt[0] = im->cP.tilt_x;
+  mp->tilt[1] = im->cP.tilt_y;
+  mp->tilt[2] = im->cP.tilt_z;
+  mp->tilt[3] = im->cP.tilt_scale;
+#else
   mp->tilt[0] = DEG_TO_RAD(im->cP.tilt_x);
   mp->tilt[1] = DEG_TO_RAD(im->cP.tilt_y);
   mp->tilt[2] = DEG_TO_RAD(im->cP.tilt_z);
   mp->tilt[3] = im->cP.tilt_scale;
+#endif
 
   //  PrintMakeParams("Inverse 20",mp,im);
 
@@ -1225,10 +1249,12 @@
     SetDesc(stack[i],vert,        &(mp->vertical));   i++;
   }
 
+#ifndef MOSAIC_XYZ
   if( im->cP.tilt )
   {
     SetDesc( stack[i],tiltForward,      mp   ); i++;
   }
+#endif
 
   // Perform radial correction
 
@@ -1277,6 +1303,14 @@
   SetDesc(  stack[i], persp_sphere,   mp->perspect  ); i++; // Perspective Control spherical Image
   SetDesc(  stack[i], erect_sphere_tp,  &(mp->distance) ); i++; // Convert spherical image to equirect.
   SetDesc(  stack[i], rotate_erect,   mp->rot     ); i++; // Rotate equirect. image horizontally
+
+#ifdef MOSAIC_XYZ
+  if( im->cP.tilt )
+  {
+    SetDesc( stack[i], plane_transfer_from_camera,      mp   ); i++;
+  }
+#endif
+
   // THESE ARE ALL FORWARD transforms
   if(pn->format == _rectilinear)                  // rectilinear panorama
   {

Modified: trunk/libpano/filter.h
===================================================================
--- trunk/libpano/filter.h	2009-09-21 06:30:35 UTC (rev 1078)
+++ trunk/libpano/filter.h	2009-09-22 19:46:33 UTC (rev 1079)
@@ -842,6 +842,8 @@
 int sphere_cp_pano		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );	
 int rect_erect			( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );	
 int erect_rect			( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );	
+int plane_transfer_to_camera( double x_dest, double y_dest, double * x_src, double * y_src, void * params);
+int plane_transfer_from_camera( double x_dest, double y_dest, double * x_src, double * y_src, void * params);
 int erect_sphere_tp	( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );	
 int mirror_erect		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );
 int mercator_erect		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params );

Modified: trunk/libpano/math.c
===================================================================
--- trunk/libpano/math.c	2009-09-21 06:30:35 UTC (rev 1078)
+++ trunk/libpano/math.c	2009-09-22 19:46:33 UTC (rev 1079)
@@ -232,6 +232,8 @@
 #define         shift           (*((double*)params))
 #define         var0            ((double*)params)[0]
 #define         var1            ((double*)params)[1]
+#define         var2            ((double*)params)[2]
+#define         var3            ((double*)params)[3]
 #define         mp              ((struct MakeParams*)params)
 
 // execute a stack of functions stored in stack
@@ -757,19 +759,31 @@
 	*x_src = distanceparam * tan(phi);
 	*y_src = distanceparam / (tan( theta ) * cos(phi));
 #endif
-        // normalize phi to be in the -PI, PI range
-        while(phi <= -PI)
-            phi += 2*PI;
-        while(phi > PI)
-            phi -= 2*PI;
+	// normalize phi to be in the -PI, PI range
+	while(phi <= -PI)
+		phi += 2*PI;
+	while(phi > PI)
+		phi -= 2*PI;
 
-        // check if the point is "in front" of the camera
-        if (phi < -PI/2.0 || phi > PI/2.0) {
-            // behind, transform considered invalid
-            return 0;
-        } else
-            return 1;
+	// check if the point is "in front" of the camera
+	if (phi < -PI/2.0 || phi > PI/2.0) {
+		// behind, transform considered invalid
+		return 0;
+	} else
+		return 1;
+	// normalize phi to be in the -PI, PI range
+	while(phi <= -PI)
+		phi += 2*PI;
+	while(phi > PI)
+		phi -= 2*PI;
 
+	// check if the point is "in front" of the camera
+	if (phi < -PI/2.0 || phi > PI/2.0) {
+		// behind, transform considered invalid
+		return 0;
+	} else
+		return 1;
+
 }
 // This is the cylindrical projection
 int pano_erect( double x_dest,double  y_dest, double* x_src, double* y_src, void* params)
@@ -1780,6 +1794,134 @@
     return 1;
 }
 
+/** transfer a point from a camera centered at x1,y1,z1 into the camera at x2,y2,z2 */
+int plane_transfer_to_camera( double x_dest, double y_dest, double * x_src, double * y_src, void * params)
+{
+	// params: distance, x1,y1,z1
+	
+	double  phi, theta;
+	double x_plane, y_plane;
+	double x_ray,y_ray,z_ray;
+
+
+	phi 	= x_dest / mp->distance;
+	theta 	=  - y_dest / mp->distance  + PI / 2.0;
+	if(theta < 0)
+	{
+		theta = - theta;
+		phi += PI;
+	}
+	if(theta > PI)
+	{
+		theta = PI - (theta - PI);
+		phi += PI;
+	}
+
+	// if the ray goes behind the camera, abort here
+	// normalize phi to be in the -PI, PI range
+	while(phi <= -PI)
+		phi += 2*PI;
+	while(phi > PI)
+		phi -= 2*PI;
+
+	// check if the point is "in front" of the camera
+	if (phi < -PI/2.0 || phi > PI/2.0)
+		// behind, transform considered invalid
+		return 0;
+
+	// compute the position on the intermediate plane
+	// the ray originates from the pano center (0,0,0)
+	// and intersects the plane located at z=-1
+	// basically rect_erect, but with distance = 1
+	x_plane = tan(phi);
+	y_plane = 1.0 / (tan( theta ) * cos(phi));
+
+	// compute ray leading to to the camera.
+	x_ray = x_plane - mp->tilt[0];
+	y_ray = y_plane - mp->tilt[1];
+	z_ray = mp->tilt[2] + 1.0;
+
+	// transform into erect
+	// basically erect_rect
+	*x_src = mp->distance * atan2( x_ray, z_ray );
+	*y_src = mp->distance * atan2(  y_ray, sqrt( z_ray*z_ray + x_ray*x_ray ) );	
+
+	/*
+	printf("plane(%.1f,%.1f%.1f): %8.5f %8.5f -> %8.5f %8.5f -> %8.5f %8.5f %8.5f -> %8.5f %8.5f\n", 
+		   mp->tilt[0], mp->tilt[1], mp->tilt[2],
+		   x_dest, y_dest, 
+		   //RAD_TO_DEG(phi), RAD_TO_DEG(theta),
+		   x_plane, y_plane,
+		   x_ray, y_ray, z_ray, *x_src, *y_src);
+	*/
+
+	return 1;
+}
+
+/** transfer a point from a camera centered at x1,y1,z1 into the camera at x2,y2,z2 */
+int plane_transfer_from_camera( double x_dest, double y_dest, double * x_src, double * y_src, void * params)
+{
+	// params: MakeParams
+
+	double  phi, theta;
+	double x_plane, y_plane;
+	double x_ray,y_ray,z_ray;
+
+	phi 	= x_dest / mp->distance;
+	theta 	=  - y_dest / mp->distance  + PI / 2.0;
+	if(theta < 0)
+	{
+		theta = - theta;
+		phi += PI;
+	}
+	if(theta > PI)
+	{
+		theta = PI - (theta - PI);
+		phi += PI;
+	}
+
+	// normalize phi to be in the -PI, PI range
+	while(phi <= -PI)
+		phi += 2*PI;
+	while(phi > PI)
+		phi -= 2*PI;
+
+	// check if the point is "in front" of the panorama camera
+	if (phi < -PI/2.0 || phi > PI/2.0)
+		// behind, transform considered invalid
+		return 0;
+
+	// compute the position on the intermediate plane
+	// Intersection of ray from the image center (Tx,Ty,Tz)
+	// with plane located at z=-1
+	x_plane = (mp->tilt[2]+1.0)* tan(phi);
+	y_plane = (mp->tilt[2]+1.0) / (tan( theta ) * cos(phi));
+
+	// shift according to camera position
+	x_plane += mp->tilt[0];
+	y_plane += mp->tilt[1];
+
+	x_ray = x_plane;
+	y_ray = y_plane;
+	z_ray = 1.0;
+
+	// transform into erect
+	// basically erect_rect
+	*x_src = mp->distance * atan2( x_ray, z_ray );
+	*y_src = mp->distance * atan2(  y_ray, sqrt( z_ray*z_ray + x_ray*x_ray ) );	
+
+	/*
+	printf("cam->plane(%.1f,%.1f%.1f): %8.5f %8.5f -> %8.5f %8.5f -> %8.5f %8.5f %8.5f -> %8.5f %8.5f\n", 
+		   mp->tilt[0], mp->tilt[1], mp->tilt[2],
+		   x_dest, y_dest, 
+		   //RAD_TO_DEG(phi), RAD_TO_DEG(theta),
+		   x_plane, y_plane,
+		   x_ray, y_ray, z_ray, *x_src, *y_src);
+	*/
+
+}
+
+
 /** convert from erect to biplane */
 int biplane_erect		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params )
 {


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

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

From: <dmg@us...> - 2009-09-26 05:34

Revision: 1080
          http://panotools.svn.sourceforge.net/panotools/?rev=1080&view=rev
Author:   dmg
Date:     2009-09-26 05:34:37 +0000 (Sat, 26 Sep 2009)

Log Message:
-----------
Now both types of tilt/mosaic modes live happily  together, new test parms

Modified Paths:
--------------
    trunk/libpano/ChangeLog
    trunk/libpano/PTcommon.c
    trunk/libpano/PTcommon.h
    trunk/libpano/adjust.c
    trunk/libpano/adjust.h
    trunk/libpano/correct.c
    trunk/libpano/filter.h
    trunk/libpano/math.c
    trunk/libpano/panorama.h
    trunk/libpano/parser.c

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2009-09-22 19:46:33 UTC (rev 1079)
+++ trunk/libpano/ChangeLog	2009-09-26 05:34:37 UTC (rev 1080)
@@ -1,3 +1,33 @@
+2009-09-25    <dmg@...>
+
+	* correct.c (SetCorrectDefaults): Initialized values of new parameters.
+
+	* adjust.h (GetGlobalPtr): added parms to its prototype
+
+	* PTcommon.c (panoPrintImage): Refactored this function from adjust.c
+
+	* panorama.h (correct_Prefs): Added new parameters
+
+	* adjust.c (SetAlignParams): Added new variables and renamed tilt ones.
+	(panoAdjustPrintMakeParams): Renamed function to make it standard.
+	Renamed variable g to optInfo
+	(SetAlignParams): Make sure the tilt parameters never go outside
+	incorrect values.
+
+	* parser.c (panoParseVariable, ParseScript): Refactored some
+	code. Sorry but I had to reindent the entire function.
+
+	* parser.c (WriteResults): Added new parameters to the output.
+
+	* parser.c (ParseScript): Renamed Tx, Ty,
+	and Tz to TiX, TiY, and TiZ. Added translation variables TrX, TxY,
+	and TrZ and test ones Te0, Te1, Te2, Te3.
+
+	* filter.h: Added translation parameters, (trans[XYZ]), renamed
+	optimization variables to a more meaningful name (suffix optVar),
+	added a new set of variables for testing new functions in the
+	stack.
+
 2009-09-20 21:08  dangelo
 
 	* adjust.c, panorama.h, filter.h, math.c: Mosaic mode based on

Modified: trunk/libpano/PTcommon.c
===================================================================
--- trunk/libpano/PTcommon.c	2009-09-22 19:46:33 UTC (rev 1079)
+++ trunk/libpano/PTcommon.c	2009-09-26 05:34:37 UTC (rev 1080)
@@ -56,7 +56,7 @@
 
 
 // Uncomment following line to enable testing of inverses in getROI
-// #define PANO_TEST_INVERSE
+#define PANO_TEST_INVERSE
 
 
 int panoFlattenTIFF(fullPath * fullPathImages, int counterImageFiles,
@@ -718,7 +718,7 @@
 
     int ebx;
 
-    int croppedTIFFIntermediate = 1;
+    int croppedTIFFIntermediate = 0;
     int croppedWidth = 0, croppedHeight = 0;
     PTRect ROIRect;
     unsigned int outputScanlineNumber = 0;
@@ -892,7 +892,7 @@
         } else {
 	    PrintError("No support for this ouput image format (%s). Output will be TIFF_m", output_file_format);
 	}
-        //        croppedTIFFIntermediate = 0;
+        //croppedTIFFIntermediate = 0;
 
 
 
@@ -1921,3 +1921,37 @@
 
     return 0;
 }
+
+
+
+void panoPrintImage(char *msg, Image *im)
+{
+    printf("-------------%s\n", msg);
+    if (im != NULL) {
+        printf(">>>Image format %d\n", im->format);
+        printf(">>>Roll %f\n", im->roll);
+        printf(">>>Pitch %f\n", im->pitch);
+        printf(">>>Yaw %f\n", im->yaw);
+        
+        printf(">>>im->cP.shear %d\n", im->cP.shear);
+        printf(">>>im->cP.tilt %d\n", im->cP.tilt);
+        printf(">>>im->cP.tilt_x %f\n", im->cP.tilt_x);
+        printf(">>>im->cP.tilt_y %f\n", im->cP.tilt_y);
+        printf(">>>im->cP.tilt_z %f\n", im->cP.tilt_z);
+        printf(">>>im->cP.tilt_scale %f\n", im->cP.tilt_scale);
+        
+        printf(">>>im->cP.translation %d\n", im->cP.trans);
+        printf(">>>im->cP.trans_x %f\n", im->cP.trans_x);
+        printf(">>>im->cP.trans_y %f\n", im->cP.trans_y);
+        printf(">>>im->cP.trans_z %f\n", im->cP.trans_z);
+        
+        printf(">>>im->cP.test %d\n", im->cP.test);
+        printf(">>>im->cP.test parm1 %f\n", im->cP.test_p0);
+        printf(">>>im->cP.test parm2 %f\n", im->cP.test_p1);
+        printf(">>>im->cP.test parm3 %f\n", im->cP.test_p2);
+        printf(">>>im->cP.test parm4 %f\n", im->cP.test_p3);
+    }
+    printf("\n\n");
+
+}
+

Modified: trunk/libpano/PTcommon.h
===================================================================
--- trunk/libpano/PTcommon.h	2009-09-22 19:46:33 UTC (rev 1079)
+++ trunk/libpano/PTcommon.h	2009-09-26 05:34:37 UTC (rev 1080)
@@ -80,4 +80,7 @@
 
 int panoCroppingMain(int argc,char *argv[], int operation, char *version,char *usage, char *defaultPrefix);
 
+void panoPrintImage(char *msg, Image *im);
+
+
 #endif

Modified: trunk/libpano/adjust.c
===================================================================
--- trunk/libpano/adjust.c	2009-09-22 19:46:33 UTC (rev 1079)
+++ trunk/libpano/adjust.c	2009-09-26 05:34:37 UTC (rev 1080)
@@ -1,4 +1,4 @@
-/* Panorama_Tools	-	Generate, Edit and Convert Panoramic Images
+/* Panorama_Tools       -       Generate, Edit and Convert Panoramic Images
    Copyright (C) 1998,1999 - Helmut Dersch  der@...
    
    This program is free software; you can redistribute it and/or modify
@@ -36,13 +36,16 @@
                   panorama size (feature change)
                6) Report rms error during optimization (bug fix)
 */
+#include <math.h>
 #include "filter.h"
 #include "f2c.h"
 #include <float.h>
+#include <assert.h>
+#include <PTcommon.h>
 
-#define C_FACTOR	100.0
+#define C_FACTOR        100.0
 
-static  AlignInfo	*g;	// This struct holds all informations for the optimization
+static  AlignInfo       *optInfo;       // This struct holds all informations for the optimization
 
 static double initialAvgFov;   // these three for fov stabilization
 static double avgfovFromSAP;
@@ -51,397 +54,428 @@
 #define ADJUST_LOG_FILENAME "PToolsLog.txt"  // file name for logging, if enabled
 #define ADJUST_LOGGING_ENABLED 0
 
-// enable mosaic with X,Y,Z camera positions instead of tilt
-//#define MOSAIC_XYZ 1
-
 FILE* adjustLogFile = 0;
 
 
-void 			ColCorrect( Image *im, double ColCoeff[3][2] );
-void 			GetColCoeff( Image *src, Image *buf, double ColCoeff[3][2] );
-void 			getControlPoints( Image *im, struct controlPoint *cp );
-void 			writeControlPoints( struct controlPoint *cp,char* cdesc );
-int 			CheckParams( AlignInfo *g );
-static int		CheckMakeParams( aPrefs *aP);
-//static int		GetOverlapRect( PTRect *OvRect, PTRect *r1, PTRect *r2 );
-int 			AddEdgePoints( AlignInfo *gl );
-int 			pt_average( UCHAR* pixel, int BytesPerLine, double rgb[3], int bytesPerChannel );
-double 			distsqLine(int N0, int N1);
+void                    ColCorrect( Image *im, double ColCoeff[3][2] );
+void                    GetColCoeff( Image *src, Image *buf, double ColCoeff[3][2] );
+void                    getControlPoints( Image *im, struct controlPoint *cp );
+void                    writeControlPoints( struct controlPoint *cp,char* cdesc );
+int                     CheckParams( AlignInfo *g );
+static int              CheckMakeParams( aPrefs *aP);
+//static int            GetOverlapRect( PTRect *OvRect, PTRect *r1, PTRect *r2 );
+int                     AddEdgePoints( AlignInfo *gl );
+int                     pt_average( UCHAR* pixel, int BytesPerLine, double rgb[3], int bytesPerChannel );
+double                  distsqLine(int N0, int N1);
 
 
+
+void panoAdjustPrintMakeParams(char *msg, struct MakeParams *mp, Image *im)
+{
+    printf("-------------%s\n", msg);
+    if (mp != NULL) {
+        printf("distnace %f\n", mp->distance);
+        printf("shear[0] %f\n", mp->shear[0]);
+        printf("shear[1] %f\n", mp->shear[1]);
+        printf("rot[0] %f\n", mp->rot[0]);
+        printf("rot[1] %f\n", mp->rot[1]);
+        printf("tilt[0] %f\n", mp->tilt[0]);
+        printf("tilt[1] %f\n", mp->tilt[1]);
+        printf("tilt[2] %f\n", mp->tilt[2]);
+        printf("tilt[3] %f\n", mp->tilt[3]);
+        
+        printf("trans[0] %f\n", mp->trans[0]);
+        printf("trans[1] %f\n", mp->trans[1]);
+        printf("trans[2] %f\n", mp->trans[2]);
+        
+        printf("test[0] %f\n", mp->test[0]);
+        printf("test[1] %f\n", mp->test[1]);
+        printf("test[2] %f\n", mp->test[2]);
+        printf("test[3] %f\n", mp->test[3]);
+        
+        
+        printf("mp->horizontal %f\n", mp->horizontal);
+        printf("mp->vertical %f\n", mp->vertical);
+    }
+    panoPrintImage(msg, im);
+    printf("\n\n");
+
+}
+
+
 void adjust(TrformStr *TrPtr, aPrefs *prefs)
 {
-	int	 	destwidth, destheight;
-	aPrefs		aP, *aPtr=NULL;
+        int             destwidth, destheight;
+        aPrefs          aP, *aPtr=NULL;
 #if 0
-	int 		nt = 0;		// Morph  parameters
-	PTTriangle 	*ts=NULL; 
-	PTTriangle 	*td=NULL; 
+        int             nt = 0;         // Morph  parameters
+        PTTriangle      *ts=NULL; 
+        PTTriangle      *td=NULL; 
 #endif
-	SetAdjustDefaults(&aP);
+        SetAdjustDefaults(&aP);
 
-	switch( prefs->mode & 7 )// Should we use prefs, or read from script?
-	{
-		case _insert:
-		case _extract:
-			if( prefs->mode & _useScript ){
-				aPtr = readAdjustLine( &(prefs->scriptFile) );
-				if(aPtr==NULL){
-					PrintError("Error processing script file" );
-					TrPtr->success = 0;
-					return;
-				}
-				memcpy(&aP, aPtr, sizeof(aPrefs));
-				free(aPtr); aPtr = &aP;
+        switch( prefs->mode & 7 )// Should we use prefs, or read from script?
+        {
+                case _insert:
+                case _extract:
+                        if( prefs->mode & _useScript ){
+                                aPtr = readAdjustLine( &(prefs->scriptFile) );
+                                if(aPtr==NULL){
+                                        PrintError("Error processing script file" );
+                                        TrPtr->success = 0;
+                                        return;
+                                }
+                                memcpy(&aP, aPtr, sizeof(aPrefs));
+                                free(aPtr); aPtr = &aP;
 
-				if( (TrPtr->mode & 7) == _usedata ){ // Report panorama format and stitching info back to calling app.
-					memcpy( &prefs->pano, &aP.pano, sizeof( Image ) );
-					memcpy( &prefs->sBuf, &aP.sBuf, sizeof( stBuf ) );
-				}
+                                if( (TrPtr->mode & 7) == _usedata ){ // Report panorama format and stitching info back to calling app.
+                                        memcpy( &prefs->pano, &aP.pano, sizeof( Image ) );
+                                        memcpy( &prefs->sBuf, &aP.sBuf, sizeof( stBuf ) );
+                                }
 
-				TrPtr->interpolator = aP.interpolator;
-				TrPtr->gamma	    = aP.gamma;
+                                TrPtr->interpolator = aP.interpolator;
+                                TrPtr->gamma        = aP.gamma;
                 TrPtr->fastStep     = aP.fastStep;
-					
+                                        
 #if 0
-				int readmode = 1;
-				aPtr = &aP;
-				gsPrPtr->interpolator 	= TrPtr->interpolator;
-				gsPrPtr->gamma			= TrPtr->gamma;
-                gsPrPtr->fastStep	    = TrPtr->fastStep;
-				if( TrPtr->mode & _destSupplied ){
-					PTRect* p = &TrPtr->dest->selection;
-					if( !(p->bottom == 0 && p->right == 0) &&
-					    !(p->right == TrPtr->dest->width &&
-					     p->bottom == TrPtr->dest->height) )
-						readmode = 0;
-				}
-				if( readAdjust( aPtr, &(prefs->scriptFile), readmode, gsPrPtr ) != 0 )
-				{
-					PrintError("Error processing script file" );
-					TrPtr->success = 0;
-					return;
-				}
-				if( (TrPtr->mode & 7) == _usedata ) // Report panorama format and stitching info back to calling app.
-				{
-					memcpy( &prefs->pano, &aP.pano, sizeof( Image ) );
-					memcpy( &prefs->sBuf, &aP.sBuf, sizeof( stBuf ) );
-				}
-				// Use modevalues read from script
-				TrPtr->interpolator = gsPrPtr->interpolator;
-				TrPtr->gamma		= gsPrPtr->gamma;
+                                int readmode = 1;
+                                aPtr = &aP;
+                                gsPrPtr->interpolator   = TrPtr->interpolator;
+                                gsPrPtr->gamma                  = TrPtr->gamma;
+                gsPrPtr->fastStep           = TrPtr->fastStep;
+                                if( TrPtr->mode & _destSupplied ){
+                                        PTRect* p = &TrPtr->dest->selection;
+                                        if( !(p->bottom == 0 && p->right == 0) &&
+                                            !(p->right == TrPtr->dest->width &&
+                                             p->bottom == TrPtr->dest->height) )
+                                                readmode = 0;
+                                }
+                                if( readAdjust( aPtr, &(prefs->scriptFile), readmode, gsPrPtr ) != 0 )
+                                {
+                                        PrintError("Error processing script file" );
+                                        TrPtr->success = 0;
+                                        return;
+                                }
+                                if( (TrPtr->mode & 7) == _usedata ) // Report panorama format and stitching info back to calling app.
+                                {
+                                        memcpy( &prefs->pano, &aP.pano, sizeof( Image ) );
+                                        memcpy( &prefs->sBuf, &aP.sBuf, sizeof( stBuf ) );
+                                }
+                                // Use modevalues read from script
+                                TrPtr->interpolator = gsPrPtr->interpolator;
+                                TrPtr->gamma            = gsPrPtr->gamma;
                 TrPtr->fastStep     = gsPrPtr->fastStep;
-				
-				// Parse script again, now reading triangles if morphing requested
-				if( aPtr->im.cP.correction_mode & correction_mode_morph )
-				{
-					char*				script;
-					AlignInfo			ainf;
-					int					nIm, nPts; // Number of image being processed
-					Image				im[2];
-					
-					script = LoadScript( &(prefs->scriptFile) );
-					if( script != NULL ) 					// We can read the scriptfile
-					{	
-						nIm = numLines( script, '!' ) - 1;
-						
-						if( nIm < 0)
-							nIm = numLines( script, 'o' ) - 1;
-					
-						// Set ainf
-						ainf.nt 	= 0;
-						ainf.t		= NULL;
-						ainf.numIm 	= 2;
-						ainf.im		= im;
-						memcpy( &ainf.pano, &aP.pano, sizeof( Image ));
-						memcpy( &ainf.im[0], &aP.pano, sizeof( Image ));
-						memcpy( &ainf.im[1], &aP.pano, sizeof( Image ));
-						
-						nPts = ReadMorphPoints( script, &ainf, nIm );
-						if(nPts > 0) // Found Points
-						{
-							AddEdgePoints( &ainf );
-							TriangulatePoints( &ainf, 1 );
-							nt = ainf.nt;
-							if(nt > 0)
-							{
-								SortControlPoints	( &ainf, 1 );
-								SetSourceTriangles	( &ainf, 1, &td  );
-								SetDestTriangles    ( &ainf, 1, &ts  );
-							}
-						}
-						if(ainf.numPts > 0) free(ainf.cpt);
-						free( script );
-					}
-				}
+                                
+                                // Parse script again, now reading triangles if morphing requested
+                                if( aPtr->im.cP.correction_mode & correction_mode_morph )
+                                {
+                                        char*                           script;
+                                        AlignInfo                       ainf;
+                                        int                                     nIm, nPts; // Number of image being processed
+                                        Image                           im[2];
+                                        
+                                        script = LoadScript( &(prefs->scriptFile) );
+                                        if( script != NULL )                                    // We can read the scriptfile
+                                        {       
+                                                nIm = numLines( script, '!' ) - 1;
+                                                
+                                                if( nIm < 0)
+                                                        nIm = numLines( script, 'o' ) - 1;
+                                        
+                                                // Set ainf
+                                                ainf.nt         = 0;
+                                                ainf.t          = NULL;
+                                                ainf.numIm      = 2;
+                                                ainf.im         = im;
+                                                memcpy( &ainf.pano, &aP.pano, sizeof( Image ));
+                                                memcpy( &ainf.im[0], &aP.pano, sizeof( Image ));
+                                                memcpy( &ainf.im[1], &aP.pano, sizeof( Image ));
+                                                
+                                                nPts = ReadMorphPoints( script, &ainf, nIm );
+                                                if(nPts > 0) // Found Points
+                                                {
+                                                        AddEdgePoints( &ainf );
+                                                        TriangulatePoints( &ainf, 1 );
+                                                        nt = ainf.nt;
+                                                        if(nt > 0)
+                                                        {
+                                                                SortControlPoints       ( &ainf, 1 );
+                                                                SetSourceTriangles      ( &ainf, 1, &td  );
+                                                                SetDestTriangles    ( &ainf, 1, &ts  );
+                                                        }
+                                                }
+                                                if(ainf.numPts > 0) free(ainf.cpt);
+                                                free( script );
+                                        }
+                                }
 #endif
-			}else{
-			 	aPtr = prefs;
-			}
-			 break;
-		default:
-			break;
-	}
-	switch( prefs->mode & 7)
-	{
-		case _insert:			// Create a panoramic image using src; merge with buffer if required
-			// Find brightest rectangle if this is a circular fisheye image
-			{
-			Image ImCrop, *theSrc=NULL;
-			// Initialise at least the data pointer since cutTheFrame may not do it
-			ImCrop.data = NULL;
-			
-			if( aPtr->im.format ==_fisheye_circ	&& aPtr->im.cP.cutFrame )
-			{
-				int fwidth = TrPtr->src->width, fheight = TrPtr->src->height;
-				
-				if( aPtr->im.cP.frame ) // subtract framewidth from width/height
-				{
-					fwidth = TrPtr->src->width - aPtr->im.cP.frame;
-					if( aPtr->im.cP.frame < fwidth ) fwidth -= aPtr->im.cP.frame;
-					if( aPtr->im.cP.frame < fheight) fheight-= aPtr->im.cP.frame;
-				}
-				else
-				{
-					if( aPtr->im.cP.fwidth > 0)
-						fwidth = aPtr->im.cP.fwidth;
-					if( aPtr->im.cP.fheight > 0)
-						fheight = aPtr->im.cP.fheight;
-				}
-					
-				if( cutTheFrame( &ImCrop, TrPtr->src, fwidth, fheight, TrPtr->mode & _show_progress ) != 0 )
-				{
-					PrintError("Error Cropping Image");
-					TrPtr->success = 0;
-					return;
-				}
-				theSrc = TrPtr->src;
-				TrPtr->src = &ImCrop;
-				
-			}
-			// Image params are set as src 
-			aPtr->im.width	= TrPtr->src->width;
-			aPtr->im.height	= TrPtr->src->height;
-			
-			// Pano is set to buffer, if merging requested; else as prefs
-			if( *aPtr->sBuf.srcName != 0 )
-			{
-				if (LoadBufImage( &(aPtr->pano), aPtr->sBuf.srcName, 0) != 0 )
-				{
-					PrintError( "Error loading Buffer; trying without" );
-				}
-			}
-						
-			if( aPtr->pano.width == 0 && aPtr->im.hfov != 0.0)
-			{
-				aPtr->pano.width = (pt_int32)(aPtr->im.width * aPtr->pano.hfov / aPtr->im.hfov);
-				aPtr->pano.width/=10; aPtr->pano.width*=10;
-			}
-			if( aPtr->pano.height == 0 )
-				aPtr->pano.height = aPtr->pano.width/2;
+                        }else{
+                                aPtr = prefs;
+                        }
+                         break;
+                default:
+                        break;
+        }
+        switch( prefs->mode & 7)
+        {
+                case _insert:                   // Create a panoramic image using src; merge with buffer if required
+                        // Find brightest rectangle if this is a circular fisheye image
+                        {
+                        Image ImCrop, *theSrc=NULL;
+                        // Initialise at least the data pointer since cutTheFrame may not do it
+                        ImCrop.data = NULL;
+                        
+                        if( aPtr->im.format ==_fisheye_circ     && aPtr->im.cP.cutFrame )
+                        {
+                                int fwidth = TrPtr->src->width, fheight = TrPtr->src->height;
+                                
+                                if( aPtr->im.cP.frame ) // subtract framewidth from width/height
+                                {
+                                        fwidth = TrPtr->src->width - aPtr->im.cP.frame;
+                                        if( aPtr->im.cP.frame < fwidth ) fwidth -= aPtr->im.cP.frame;
+                                        if( aPtr->im.cP.frame < fheight) fheight-= aPtr->im.cP.frame;
+                                }
+                                else
+                                {
+                                        if( aPtr->im.cP.fwidth > 0)
+                                                fwidth = aPtr->im.cP.fwidth;
+                                        if( aPtr->im.cP.fheight > 0)
+                                                fheight = aPtr->im.cP.fheight;
+                                }
+                                        
+                                if( cutTheFrame( &ImCrop, TrPtr->src, fwidth, fheight, TrPtr->mode & _show_progress ) != 0 )
+                                {
+                                        PrintError("Error Cropping Image");
+                                        TrPtr->success = 0;
+                                        return;
+                                }
+                                theSrc = TrPtr->src;
+                                TrPtr->src = &ImCrop;
+                                
+                        }
+                        // Image params are set as src 
+                        aPtr->im.width  = TrPtr->src->width;
+                        aPtr->im.height = TrPtr->src->height;
+                        
+                        // Pano is set to buffer, if merging requested; else as prefs
+                        if( *aPtr->sBuf.srcName != 0 )
+                        {
+                                if (LoadBufImage( &(aPtr->pano), aPtr->sBuf.srcName, 0) != 0 )
+                                {
+                                        PrintError( "Error loading Buffer; trying without" );
+                                }
+                        }
+                                                
+                        if( aPtr->pano.width == 0 && aPtr->im.hfov != 0.0)
+                        {
+                                aPtr->pano.width = (pt_int32)(aPtr->im.width * aPtr->pano.hfov / aPtr->im.hfov);
+                                aPtr->pano.width/=10; aPtr->pano.width*=10;
+                        }
+                        if( aPtr->pano.height == 0 )
+                                aPtr->pano.height = aPtr->pano.width/2;
 
-			destheight 				= aPtr->pano.height;
-			destwidth 				= aPtr->pano.width;
-			
-			if( destheight == 0 || destwidth == 0 )
-			{
-				PrintError("Please set Panorama width/height" );
-				TrPtr->success = 0;
-				goto _insert_exit;
-			}
-			
-		
-			if( SetDestImage( TrPtr, destwidth, destheight) != 0)
-			{
-				PrintError("Could not allocate %ld bytes",TrPtr->dest->dataSize );
-				TrPtr->success = 0;
-				goto _insert_exit;
-			}
-			TrPtr->mode				|= _honor_valid;
-			CopyPosition( TrPtr->src,  &(aPtr->im) );
-			CopyPosition( TrPtr->dest, &(aPtr->pano) );
+                        destheight                              = aPtr->pano.height;
+                        destwidth                               = aPtr->pano.width;
+                        
+                        if( destheight == 0 || destwidth == 0 )
+                        {
+                                PrintError("Please set Panorama width/height" );
+                                TrPtr->success = 0;
+                                goto _insert_exit;
+                        }
+                        
+                
+                        if( SetDestImage( TrPtr, destwidth, destheight) != 0)
+                        {
+                                PrintError("Could not allocate %ld bytes",TrPtr->dest->dataSize );
+                                TrPtr->success = 0;
+                                goto _insert_exit;
+                        }
+                        TrPtr->mode                             |= _honor_valid;
+                        CopyPosition( TrPtr->src,  &(aPtr->im) );
+                        CopyPosition( TrPtr->dest, &(aPtr->pano) );
       // JMW 2008/01/07 Alpha is valid data don't override it with blank data
-//			addAlpha( TrPtr->src ); // Add alpha channel to indicate valid data
-			
-			aPtr->mode = prefs->mode; // For checkparam
-			MakePano( TrPtr,  aPtr );
-			
-			if(aPtr->ts) free(aPtr->ts);
-			if(aPtr->td) free(aPtr->td);
+//                      addAlpha( TrPtr->src ); // Add alpha channel to indicate valid data
+                        
+                        aPtr->mode = prefs->mode; // For checkparam
+                        MakePano( TrPtr,  aPtr );
+                        
+                        if(aPtr->ts) free(aPtr->ts);
+                        if(aPtr->td) free(aPtr->td);
 
-			// Stitch images; Proceed only if panoramic image valid
+                        // Stitch images; Proceed only if panoramic image valid
 
-			if( TrPtr->success )
-			{
-				if( *(aPtr->sBuf.srcName) != 0 ){ // We have to merge in one images
-					// Load the bufferimage
-					if( LoadBufImage( &aPtr->pano, aPtr->sBuf.srcName, 1 ) != 0 )
-					{
-						PrintError( "Could not load buffer %s; Keeping Source",aPtr->sBuf.srcName );
-						goto _insert_exit;
-					}
+                        if( TrPtr->success )
+                        {
+                                if( *(aPtr->sBuf.srcName) != 0 ){ // We have to merge in one images
+                                        // Load the bufferimage
+                                        if( LoadBufImage( &aPtr->pano, aPtr->sBuf.srcName, 1 ) != 0 )
+                                        {
+                                                PrintError( "Could not load buffer %s; Keeping Source",aPtr->sBuf.srcName );
+                                                goto _insert_exit;
+                                        }
 
-					if( HaveEqualSize( &aPtr->pano, TrPtr->dest ))
-					{
-	
-						// At this point we have two valid, equally sized images						
-						// Do Colour Correction on one or both  images
-						DoColorCorrection( TrPtr->dest, &aPtr->pano, aPtr->sBuf.colcorrect & 3);
-						
-						if( merge( TrPtr->dest , &aPtr->pano, aPtr->sBuf.feather, TrPtr->mode & _show_progress, aPtr->sBuf.seam ) != 0 )
-						{
-							PrintError( "Error merging images. Keeping Source" );
-						}
-					}
-					myfree( (void**)aPtr->pano.data );
-				} // src != 0
-					
-				if( *(aPtr->sBuf.destName) != 0 ) // save buffer image
-				{
-					if( SaveBufImage( TrPtr->dest, aPtr->sBuf.destName ) != 0 )
-						PrintError( "Could not save to Buffer. Most likely your disk is full");
-				}
-			} // Tr.success 
-				
+                                        if( HaveEqualSize( &aPtr->pano, TrPtr->dest ))
+                                        {
+        
+                                                // At this point we have two valid, equally sized images                                                
+                                                // Do Colour Correction on one or both  images
+                                                DoColorCorrection( TrPtr->dest, &aPtr->pano, aPtr->sBuf.colcorrect & 3);
+                                                
+                                                if( merge( TrPtr->dest , &aPtr->pano, aPtr->sBuf.feather, TrPtr->mode & _show_progress, aPtr->sBuf.seam ) != 0 )
+                                                {
+                                                        PrintError( "Error merging images. Keeping Source" );
+                                                }
+                                        }
+                                        myfree( (void**)aPtr->pano.data );
+                                } // src != 0
+                                        
+                                if( *(aPtr->sBuf.destName) != 0 ) // save buffer image
+                                {
+                                        if( SaveBufImage( TrPtr->dest, aPtr->sBuf.destName ) != 0 )
+                                                PrintError( "Could not save to Buffer. Most likely your disk is full");
+                                }
+                        } // Tr.success 
+                                
 
-			if( TrPtr->success == 0  && ! (TrPtr->mode & _destSupplied) )	
-				myfree( (void**)TrPtr->dest->data );
-				
-		_insert_exit:
-			if( aPtr->im.format ==_fisheye_circ	&& aPtr->im.cP.cutFrame )	// There is a cropped source image;
-			{
-				if( ImCrop.data != NULL )
-					myfree( (void**) ImCrop.data );
-				TrPtr->src = theSrc;
-			}
-			
-			}
-			break;
-		
-		case _extract:
-				
-			if( aPtr->im.width == 0 )
-			{
-				aPtr->im.width = 500 ;
-			}
-			if(  aPtr->im.height == 0 )
-			{
-				aPtr->im.height = aPtr->im.width * 4 / 5;
-			}
-				
-			// Set pano-params to src-image irrespective of prefs
-			aPtr->pano.width	= TrPtr->src->width;				//	width of panorama
-			aPtr->pano.height	= TrPtr->src->height;				//  height of panorama
-			
-			CopyPosition( TrPtr->src, &(aPtr->pano) );
-//			addAlpha( TrPtr->src ); 
-				
-			if( *(aPtr->sBuf.destName) != 0 ) // save buffer image
-			{
-				if( SaveBufImage( TrPtr->src, aPtr->sBuf.destName ) != 0 )
-					PrintError( "Could not save Buffer Image. Most likely your disk is full");
-			} 
-			
-			// Set up Image Structure in TrPtr struct
+                        if( TrPtr->success == 0  && ! (TrPtr->mode & _destSupplied) )   
+                                myfree( (void**)TrPtr->dest->data );
+                                
+                _insert_exit:
+                        if( aPtr->im.format ==_fisheye_circ     && aPtr->im.cP.cutFrame )       // There is a cropped source image;
+                        {
+                                if( ImCrop.data != NULL )
+                                        myfree( (void**) ImCrop.data );
+                                TrPtr->src = theSrc;
+                        }
+                        
+                        }
+                        break;
+                
+                case _extract:
+                                
+                        if( aPtr->im.width == 0 )
+                        {
+                                aPtr->im.width = 500 ;
+                        }
+                        if(  aPtr->im.height == 0 )
+                        {
+                                aPtr->im.height = aPtr->im.width * 4 / 5;
+                        }
+                                
+                        // Set pano-params to src-image irrespective of prefs
+                        aPtr->pano.width        = TrPtr->src->width;                            //      width of panorama
+                        aPtr->pano.height       = TrPtr->src->height;                           //  height of panorama
+                        
+                        CopyPosition( TrPtr->src, &(aPtr->pano) );
+//                      addAlpha( TrPtr->src ); 
+                                
+                        if( *(aPtr->sBuf.destName) != 0 ) // save buffer image
+                        {
+                                if( SaveBufImage( TrPtr->src, aPtr->sBuf.destName ) != 0 )
+                                        PrintError( "Could not save Buffer Image. Most likely your disk is full");
+                        } 
+                        
+                        // Set up Image Structure in TrPtr struct
 
 
-			destheight 			= aPtr->im.height;
-			destwidth 			= aPtr->im.width;
+                        destheight                      = aPtr->im.height;
+                        destwidth                       = aPtr->im.width;
 
 
-			if( SetDestImage( TrPtr, destwidth, destheight) != 0)
-			{
-				PrintError("Could not allocate %ld bytes",TrPtr->dest->dataSize );
-				TrPtr->success = 0;
-				return;
-			}
+                        if( SetDestImage( TrPtr, destwidth, destheight) != 0)
+                        {
+                                PrintError("Could not allocate %ld bytes",TrPtr->dest->dataSize );
+                                TrPtr->success = 0;
+                                return;
+                        }
 
-			CopyPosition( TrPtr->dest, &(aPtr->im) );
+                        CopyPosition( TrPtr->dest, &(aPtr->im) );
 
-			TrPtr->mode					|= _honor_valid;
-			if( aPtr->pano.hfov == 360.0 )
-				TrPtr->mode				|= _wrapX;
-			
-			aPtr->mode = prefs->mode; // For checkparam
-			ExtractStill( TrPtr,  aPtr );
-				
-				
-			if( TrPtr->success == 0 && ! (TrPtr->mode & _destSupplied))	
-				myfree( (void**)TrPtr->dest->data );
-			break;
-		
-		case _readControlPoints:
-			{
-				char			*script, *newscript, cdesc[1000];
-				controlPoint 	cp[NUMPTS];			// List of Control points
+                        TrPtr->mode                                     |= _honor_valid;
+                        if( aPtr->pano.hfov == 360.0 )
+                                TrPtr->mode                             |= _wrapX;
+                        
+                        aPtr->mode = prefs->mode; // For checkparam
+                        ExtractStill( TrPtr,  aPtr );
+                                
+                                
+                        if( TrPtr->success == 0 && ! (TrPtr->mode & _destSupplied))     
+                                myfree( (void**)TrPtr->dest->data );
+                        break;
+                
+                case _readControlPoints:
+                        {
+                                char                    *script, *newscript, cdesc[1000];
+                                controlPoint    cp[NUMPTS];                     // List of Control points
 
-				script = LoadScript( &(prefs->scriptFile) );
-				if( script != NULL ) 					// We can read the scriptfile
-				{
-					newscript = (char*) malloc( strlen(script) + NUMPTS * 60 ); // One line per pair of points
-					if( newscript != NULL )
-					{
-						readControlPoints( script, cp );		// If this is the second image: get coordinates in first
-						getControlPoints( TrPtr->src, cp );		// Scan image and find control points
-						writeControlPoints( cp, cdesc );		// format control point coordinates
-						
-						sprintf( newscript, "%s\n%s", script, cdesc );
-						
-						if( WriteScript( newscript,&( prefs->scriptFile), 0 ) != 0 )
-										PrintError( "Could not write Scriptfile" );
-						free( newscript );
-					}
-					free( script );
-				}
+                                script = LoadScript( &(prefs->scriptFile) );
+                                if( script != NULL )                                    // We can read the scriptfile
+                                {
+                                        newscript = (char*) malloc( strlen(script) + NUMPTS * 60 ); // One line per pair of points
+                                        if( newscript != NULL )
+                                        {
+                                                readControlPoints( script, cp );                // If this is the second image: get coordinates in first
+                                                getControlPoints( TrPtr->src, cp );             // Scan image and find control points
+                                                writeControlPoints( cp, cdesc );                // format control point coordinates
+                                                
+                                                sprintf( newscript, "%s\n%s", script, cdesc );
+                                                
+                                                if( WriteScript( newscript,&( prefs->scriptFile), 0 ) != 0 )
+                                                                                PrintError( "Could not write Scriptfile" );
+                                                free( newscript );
+                                        }
+                                        free( script );
+                                }
 
-			}
-			TrPtr->success = 0;							// Don't destroy image!
-			break;
+                        }
+                        TrPtr->success = 0;                                                     // Don't destroy image!
+                        break;
 
 
-		case _runOptimizer:
-			// Run Optimizer; Dummy image needed but not changed
-			{
-				char*				script;
-				OptInfo				opt;
-				AlignInfo			ainf;
+                case _runOptimizer:
+                        // Run Optimizer; Dummy image needed but not changed
+                        {
+                                char*                           script;
+                                OptInfo                         opt;
+                                AlignInfo                       ainf;
 
-				script = LoadScript( &(prefs->scriptFile) );
-				if( script != NULL ) 					// We can read the scriptfile
-				{
-					if (ParseScript( script, &ainf ) == 0)
-					{
-						if( CheckParams( &ainf ) == 0 ) 				// and it seems to make sense
-						{
-							ainf.fcn	= fcnPano;
-							
-							SetGlobalPtr( &ainf ); 
-							
-							opt.numVars 		= g->numParam;
-							opt.numData 		= g->numPts;
-							opt.SetVarsToX		= SetLMParams;
-							opt.SetXToVars		= SetAlignParams;
-							opt.fcn				= g->fcn;
-							*opt.message		= 0;
+                                script = LoadScript( &(prefs->scriptFile) );
+                                if( script != NULL )                                    // We can read the scriptfile
+                                {
+                                        if (ParseScript( script, &ainf ) == 0)
+                                        {
+                                                if( CheckParams( &ainf ) == 0 )                                 // and it seems to make sense
+                                                {
+                                                        ainf.fcn        = fcnPano;
+                                                        
+                                                        // optInfo is a static variable that is used in all optimizations
+                                                        SetGlobalPtr( &ainf ); // equivalent to optInfo = &ainf;
+                                                        
+                                                        opt.numVars             = optInfo->numParam;
+                                                        opt.numData             = optInfo->numPts;
+                                                        opt.SetVarsToX          = SetLMParams;
+                                                        opt.SetXToVars          = SetAlignParams;
+                                                        opt.fcn                 = optInfo->fcn;
+                                                        *opt.message            = 0;
+                                                        RunLMOptimizer( &opt );
+                                                        optInfo->data                           = opt.message;
+                                                        WriteResults( script, &(prefs->scriptFile), optInfo, distSquared ,
+                                                                    ( TrPtr->mode & 7 ) != _usedata );
+                                                }
+                                                DisposeAlignInfo( &ainf );                                      // These were allocated by 'ParseScript()'
+                                        }
+                                        free( script );
+                                }
+                        }
+                                
+                        TrPtr->success = 0;                                                     // Don't destroy Dummy image!
+                        break;
+                default:
+                        TrPtr->success = 0;                                                     
+                        break;
 
-							RunLMOptimizer( &opt );
-							g->data				= opt.message;
-							WriteResults( script, &(prefs->scriptFile), g, distSquared ,
-							            ( TrPtr->mode & 7 ) != _usedata );
-						}
-						DisposeAlignInfo( &ainf );					// These were allocated by 'ParseScript()'
-					}
-					free( script );
-				}
-			}
-				
-			TrPtr->success = 0;							// Don't destroy Dummy image!
-			break;
-		default:
-			TrPtr->success = 0;							
-			break;
-
-	}
+        }
 }
 
 
@@ -450,7 +484,7 @@
 
 void MakePano( TrformStr *TrPtr, aPrefs *aP )
 {
-	MyMakePano( TrPtr, aP, 1 );
+        MyMakePano( TrPtr, aP, 1 );
 }
 
 
@@ -459,63 +493,63 @@
 of the image that has to be converted.*/
 void MyMakePano( TrformStr *TrPtr, aPrefs *aP, int imageNum )
 {
-	struct 	MakeParams	mp,mpinv;
-	fDesc        stack[15], fD;		// Parameters for execute 
-	fDesc        invstack[15], finvD;		// Invers Parameters for execute 
-	void	*morph[3];	
+        struct  MakeParams      mp,mpinv;
+        fDesc        stack[15], fD;             // Parameters for execute 
+        fDesc        invstack[15], finvD;               // Invers Parameters for execute 
+        void    *morph[3];      
 
-	int 	i,k, kstart, kend, color;
+        int     i,k, kstart, kend, color;
 
-	TrPtr->success = 1;
-	
-	if( CheckMakeParams( aP) != 0)
-	{
-		TrPtr->success = 0;
-		return;
-	}
+        TrPtr->success = 1;
+        
+        if( CheckMakeParams( aP) != 0)
+        {
+                TrPtr->success = 0;
+                return;
+        }
 
 
-	if(  isColorSpecific( &(aP->im.cP) ) )			// Color dependent
-	{
-		kstart 	= 1; kend	= 4;
-	}
-	else 											// Color independent
-	{
-		kstart	= 0; kend	= 1;
-	}
-				
-	for( k = kstart; k < kend; k++ )
-	{
-		color = k-1; if( color < 0 ) color = 0;
-		SetMakeParams( stack, &mp, &(aP->im) , &(aP->pano), color );
-		SetInvMakeParamsCorrect( invstack, &mpinv, &(aP->im) , &(aP->pano), color );
-		
-		if( aP->nt > 0 )	// Morphing requested
-		{
-			morph[0] = (void*)aP->td;
-			morph[1] = (void*)aP->ts;
-			morph[2] = (void*)&aP->nt;
+        if(  isColorSpecific( &(aP->im.cP) ) )                  // Color dependent
+        {
+                kstart  = 1; kend       = 4;
+        }
+        else                                                                                    // Color independent
+        {
+                kstart  = 0; kend       = 1;
+        }
+                                
+        for( k = kstart; k < kend; k++ )
+        {
+                color = k-1; if( color < 0 ) color = 0;
+                SetMakeParams( stack, &mp, &(aP->im) , &(aP->pano), color );
+                SetInvMakeParamsCorrect( invstack, &mpinv, &(aP->im) , &(aP->pano), color );
+                
+                if( aP->nt > 0 )        // Morphing requested
+                {
+                        morph[0] = (void*)aP->td;
+                        morph[1] = (void*)aP->ts;
+                        morph[2] = (void*)&aP->nt;
 
-			i=0; while( stack[i].func != NULL && i<14 ) i++;
-			if( i!=14 )
-			{
-				for(i=14; i>0; i--)
-				{
-					memcpy( &stack[i], &stack[i-1], sizeof( fDesc ));
-				}
-				stack[0].func 		= tmorph;
-				stack[0].param 		= (void*)morph;
-			}
-		}
+                        i=0; while( stack[i].func != NULL && i<14 ) i++;
+                        if( i!=14 )
+                        {
+                                for(i=14; i>0; i--)
+                                {
+                                        memcpy( &stack[i], &stack[i-1], sizeof( fDesc ));
+                                }
+                                stack[0].func           = tmorph;
+                                stack[0].param          = (void*)morph;
+                        }
+                }
 
-		if( TrPtr->success != 0)
-		{
-			fD.func = execute_stack_new; fD.param = stack;
-			finvD.func = execute_stack_new; finvD.param = invstack;
+                if( TrPtr->success != 0)
+                {
+                        fD.func = execute_stack_new; fD.param = stack;
+                        finvD.func = execute_stack_new; finvD.param = invstack;
 
-			transFormEx( TrPtr,  &fD , &finvD , k, imageNum );
-		}
-	}
+                        transFormEx( TrPtr,  &fD , &finvD , k, imageNum );
+                }
+        }
 }
 
 // Extract image from pano in TrPtr->src 
@@ -524,43 +558,43 @@
 
 void ExtractStill( TrformStr *TrPtr , aPrefs *aP )
 {
-	struct 	MakeParams	mp,mpinv;
-	fDesc 	stack[15], fD;		// Parameters for execute 
-	fDesc 	stackinv[15], fDinv;		// Invers Parameters for execute 
+        struct  MakeParams      mp,mpinv;
+        fDesc   stack[15], fD;          // Parameters for execute 
+        fDesc   stackinv[15], fDinv;            // Invers Parameters for execute 
 
-	int 	k, kstart, kend, color;
+        int     k, kstart, kend, color;
 
-	TrPtr->success = 1;
+        TrPtr->success = 1;
 
-	if( CheckMakeParams( aP) != 0)
-	{
-		TrPtr->success = 0;
-		return;
-	}
-		
+        if( CheckMakeParams( aP) != 0)
+        {
+                TrPtr->success = 0;
+                return;
+        }
+                
 
-	if( isColorSpecific( &(aP->im.cP) ) )			// Color dependent
-	{
-		kstart 	= 1; kend	= 4;
-	}
-	else 															// Color independent
-	{
-		kstart	= 0; kend	= 1;
-	}
-				
-	for( k = kstart; k < kend; k++ )
-	{
-		color = k-1; if( color < 0 ) color = 0;
-		SetInvMakeParamsCorrect( stack, &mp, &(aP->im), &(aP->pano), color );
-		SetMakeParams( stackinv, &mpinv, &(aP->im), &(aP->pano), color );
-		
-		if( TrPtr->success != 0)
-		{
-			fD.func = execute_stack_new; fD.param = stack;
-			fDinv.func = execute_stack_new; fDinv.param = stackinv;
-			transFormEx( TrPtr, &fD, &fDinv, k, 1 );
-		}
-	}
+        if( isColorSpecific( &(aP->im.cP) ) )                   // Color dependent
+        {
+                kstart  = 1; kend       = 4;
+        }
+        else                                                                                                                    // Color independent
+        {
+                kstart  = 0; kend       = 1;
+        }
+                                
+        for( k = kstart; k < kend; k++ )
+        {
+                color = k-1; if( color < 0 ) color = 0;
+                SetInvMakeParamsCorrect( stack, &mp, &(aP->im), &(aP->pano), color );
+                SetMakeParams( stackinv, &mpinv, &(aP->im), &(aP->pano), color );
+                
+                if( TrPtr->success != 0)
+                {
+                        fD.func = execute_stack_new; fD.param = stack;
+                        fDinv.func = execute_stack_new; fDinv.param = stackinv;
+                        transFormEx( TrPtr, &fD, &fDinv, k, 1 );
+                }
+        }
 }
 
 
@@ -734,12 +768,12 @@
     case _orthographic:
       mp->distance  = (double) pn->width / (2.0 * sin(b/2.0));
        break;
-	case _biplane:
-	  biplane_distance(pn->width,b,mp);
-	  break;
-	case _triplane:
-	  triplane_distance(pn->width,b,mp);
-	  break;
+        case _biplane:
+          biplane_distance(pn->width,b,mp);
+          break;
+        case _triplane:
+          triplane_distance(pn->width,b,mp);
+          break;
     default:
       // unknown
       PrintError ("SetMakeParams: Unsupported panorama projection");
@@ -789,425 +823,385 @@
     mp->rot[0]      = mp->distance * PI;                                // 180 in screenpoints
     mp->rot[1]      = -im->yaw *  mp->distance * PI / 180.0;            // rotation angle in screenpoints
     
-#ifdef MOSAIC_XYZ
-    mp->tilt[0] = im->cP.tilt_x;
-    mp->tilt[1] = im->cP.tilt_y;
-    mp->tilt[2] = im->cP.tilt_z;
-    mp->tilt[3] = im->cP.tilt_scale;
-#else
     mp->tilt[0] = DEG_TO_RAD(im->cP.tilt_x);
     mp->tilt[1] = DEG_TO_RAD(im->cP.tilt_y);
     mp->tilt[2] = DEG_TO_RAD(im->cP.tilt_z);
     mp->tilt[3] = im->cP.tilt_scale;
-#endif
 
-    /*
-    printf("Image format %d\n", (int)(im->format));
-    printf("distnace %f\n", mp->distance);
-    printf("shear[0] %f\n", mp->shear[0]);
-    printf("shear[1] %f\n", mp->shear[1]);
-    printf("rot[0] %f\n", mp->rot[0]);
-    printf("rot[1] %f\n", mp->rot[1]);
-    printf("tilt[0] %f\n",    mp->tilt[0]);
-    printf("tilt[1] %f\n",    mp->tilt[1]);
-    printf("tilt[2] %f\n",    mp->tilt[2]);
-    printf("tilt[3] %f\n",    mp->tilt[3]);
+    mp->trans[0] = im->cP.trans_x;
+    mp->trans[1] = im->cP.trans_y;
+    mp->trans[2] = im->cP.trans_z;
 
-    printf("mp->horizontal %f\n", mp->horizontal);
-    printf("mp->vertical %f\n", mp->vertical);
-  printf(">>>im->cP.shear %d\n", im->cP.shear);
-  printf(">>>im->cP.tilt %d\n", im->cP.tilt);
-    */
+
+    mp->test[0] = im->cP.test_p0;
+    mp->test[1] = im->cP.test_p1;
+    mp->test[2] = im->cP.test_p2;
+    mp->test[3] = im->cP.test_p3;
+
+    //    panoAdjustPrintMakeParams("SetmakeParms", mp, im);
+
     mp->perspect[0] = (void*)(mp->mt);
     mp->perspect[1] = (void*)&(mp->distance);
             
     for(i=0; i<4; i++)
-      mp->rad[i]  = im->cP.radial_params[color][i];
+        mp->rad[i]  = im->cP.radial_params[color][i];
     mp->rad[5] = im->cP.radial_params[color][4];
 
     if( (im->cP.correction_mode & 3) == correction_mode_radial )
-      mp->rad[4]  = ( (double)( image_selection_width < image_selection_height ? image_selection_width : image_selection_height) ) / 2.0;
+        mp->rad[4]  = ( (double)( image_selection_width < image_selection_height ? image_selection_width : image_selection_height) ) / 2.0;
     else
-      mp->rad[4]  = ((double) image_selection_height) / 2.0;
+        mp->rad[4]  = ((double) image_selection_height) / 2.0;
 
-// Joost: removed, see above
-//  mp->horizontal  = im->cP.horizontal_params[color];
-//  mp->vertical  = im->cP.vertical_params[color];
+    // Joost: removed, see above
+    //  mp->horizontal  = im->cP.horizontal_params[color];
+    //  mp->vertical  = im->cP.vertical_params[color];
 
     i = 0;
 
     if(pn->format == _rectilinear)                                  // rectilinear panorama
-    {
-      SetDesc(stack[i],   erect_rect,             &(mp->distance) ); i++;   // Convert rectilinear to equirect
-    }
+        {
+            SetDesc(stack[i],   erect_rect,             &(mp->distance) ); i++;   // Convert rectilinear to equirect
+        }
     else if(pn->format == _panorama)
-    {
-      SetDesc(stack[i],   erect_pano,             &(mp->distance) ); i++;   // Convert panoramic to equirect
-    }
+        {
+            SetDesc(stack[i],   erect_pano,             &(mp->distance) ); i++;   // Convert panoramic to equirect
+        }
     else if(pn->format == _fisheye_circ || pn->format == _fisheye_ff)
-    {
-      SetDesc(stack[i],   erect_sphere_tp,        &(mp->distance) ); i++; // Convert fisheye to equirect
-    }
+        {
+            SetDesc(stack[i],   erect_sphere_tp,        &(mp->distance) ); i++; // Convert fisheye to equirect
+        }
     else if(pn->format == _equisolid)
-    {
-      SetDesc(stack[i],   sphere_tp_equisolid,    &(mp->distance) ); i++; // Convert fisheye equisolid to spherical
-      SetDesc(stack[i],   erect_sphere_tp,        &(mp->distance) ); i++; // Convert spherical to equirect
-    }
+        {
+            SetDesc(stack[i],   sphere_tp_equisolid,    &(mp->distance) ); i++; // Convert fisheye equisolid to spherical
+            SetDesc(stack[i],   erect_sphere_tp,        &(mp->distance) ); i++; // Convert spherical to equirect
+        }
     else if(pn->format == _mirror)
-    {
-      SetDesc(stack[i],   sphere_cp_mirror,       &(mp->distance) ); i++; // Convert mirror to spherical
-      SetDesc(stack[i],   erect_sphere_cp,        &(mp->distance) ); i++; // Convert spherical to equirect
-    }
+        {
+            SetDesc(stack[i],   sphere_cp_mirror,       &(mp->distance) ); i++; // Convert mirror to spherical
+            SetDesc(stack[i],   erect_sphere_cp,        &(mp->distance) ); i++; // Convert spherical to equirect
+        }
     else if(pn->format == _orthographic)
-    {
-      SetDesc(stack[i],   sphere_tp_orthographic, &(mp->distance) ); i++; // Convert fisheye orthographic to spherical
-      SetDesc(stack[i],   erect_sphere_tp,        &(mp->distance) ); i++; // Convert spherical to equirect
-    }
+        {
+            SetDesc(stack[i],   sphere_tp_orthographic, &(mp->distance) ); i++; // Convert fisheye orthographic to spherical
+            SetDesc(stack[i],   erect_sphere_tp,        &(mp->distance) ); i++; // Convert spherical to equirect
+        }
     else if(pn->format == _mercator)
-    {
-      SetDesc(stack[i],   erect_mercator,         &(mp->distance) ); i++; // Convert mercator to equirect
-    }
+        {
+            SetDesc(stack[i],   erect_mercator,         &(mp->distance) ); i++; // Convert mercator to equirect
+        }
     else if(pn->format == _millercylindrical)
-    {
-      SetDesc(stack[i],   erect_millercylindrical, &(mp->distance) ); i++; // Convert miller to equirect
-    }
+        {
+            SetDesc(stack[i],   erect_millercylindrical, &(mp->distance) ); i++; // Convert miller to equirect
+        }
     else if(pn->format == _panini)
-    {
-    SetDesc(stack[i],     erect_panini,           &(mp->distance) ); i++; // Convert panini to sphere
-    }
+        {
+            SetDesc(stack[i],     erect_panini,           &(mp->distance) ); i++; // Convert panini to sphere
+        }
     else if(pn->format == _equipanini)
-    {
-    SetDesc(stack[i],     erect_equipanini,           &(mp->distance) ); i++; // Convert equipanini to sphere
-    }
+        {
+            SetDesc(stack[i],     erect_equipanini,           &(mp->distance) ); i++; // Convert equipanini to sphere
+        }
     else if(pn->format == _architectural)
-    {
-      SetDesc(stack[i],   erect_arch,             &(mp->distance) ); i++; // Convert arch to sphere
-    }
+        {
+            SetDesc(stack[i],   erect_arch,             &(mp->distance) ); i++; // Convert arch to sphere
+        }
     else if(pn->format == _lambert)
-    {
-      SetDesc(stack[i],   erect_lambert,          &(mp->distance) ); i++; // Convert lambert to equirect
-    }
+        {
+            SetDesc(stack[i],   erect_lambert,          &(mp->distance) ); i++; // Convert lambert to equirect
+        }
     else if(pn->format == _lambertazimuthal)
-    {
-      SetDesc(stack[i],   erect_lambertazimuthal, &(mp->distance) ); i++; // Convert lambert to equirect
-    }
+        {
+            SetDesc(stack[i],   erect_lambertazimuthal, &(mp->distance) ); i++; // Convert lambert to equirect
+        }
     else if(pn->format == _trans_mercator)
-    {
-      SetDesc(stack[i],   erect_transmercator,    &(mp->distance)  ); i++; // Convert transverse mercator to equirect
-    }
+        {
+            SetDesc(stack[i],   erect_transmercator,    &(mp->distance)  ); i++; // Convert transverse mercator to equirect
+        }
     else if(pn->format == _stereographic)
-    {
-      SetDesc(stack[i],   erect_stereographic,    &(mp->distance) ); i++;  // Convert stereographic to equirect
-    }
+        {
+            SetDesc(stack[i],   erect_stereographic,    &(mp->distance) ); i++;  // Convert stereographic to equirect
+        }
     else if(pn->format == _sinusoidal)
-    {
-      SetDesc(stack[i],   erect_sinusoidal,       &(mp->distance) ); i++; // Convert sinusoidal to equirect
-    }
+        {
+            SetDesc(stack[i],   erect_sinusoidal,       &(mp->distance) ); i++; // Convert sinusoidal to equirect
+        }
     else if(pn->format == _albersequalareaconic)
-    {
-      SetDesc(stack[i],   erect_albersequalareaconic,     mp  ); i++; // Convert albersequalareaconic to equirect
-    }
+        {
+            SetDesc(stack[i],   erect_albersequalareaconic,     mp  ); i++; // Convert albersequalareaconic to equirect
+        }
     else if(pn->format == _biplane)
-    {
-      SetDesc(stack[i], erect_biplane, mp ); i++;  // Convert biplane to equirect
-    }
+        {
+            SetDesc(stack[i], erect_biplane, mp ); i++;  // Convert biplane to equirect
+        }
     else if(pn->format == _triplane)
-    {
-      SetDesc(stack[i], erect_triplane, mp ); i++;  // Convert triplane to equirect
-    }
+        {
+            SetDesc(stack[i], erect_triplane, mp ); i++;  // Convert triplane to equirect
+        }
     else if(pn->format == _equirectangular) 
-    {
-      // no conversion needed     
-    } else {
-      PrintError("Projection type %d not supported, using equirectangular", pn->format);
+        {
+            // no conversion needed     
+        } else {
+        PrintError("Projection type %d not supported, using equirectangular", pn->format);
     }
 
-#ifdef MOSAIC_XYZ
-    if (im->cP.tilt) {
-      SetDesc(stack[i], plane_transfer_to_camera, mp);   i++;
+    if (im->cP.trans) {
+        SetDesc(stack[i], plane_transfer_to_camera, mp);   i++;
     }    
-#endif
-    // 
 
     SetDesc(  stack[i],   rotate_erect,           mp->rot         ); i++; // Rotate equirect. image horizontally
     SetDesc(  stack[i],   sphere_tp_erect,        &(mp->distance) ); i++; // Convert spherical image to equirect.
     SetDesc(  stack[i],   persp_sphere,           mp->perspect    ); i++; // Perspective Control spherical Image
 
     if(im->format      == _rectilinear)                                    // rectilinear image
-    {
-      SetDesc(stack[i],   rect_sphere_tp,         &(mp->distance) ); i++; // Convert rectilinear to spherical
-    }
+        {
+            SetDesc(stack[i],   rect_sphere_tp,         &(mp->distance) ); i++; // Convert rectilinear to spherical
+        }
     else if(im->format == _panorama)                                   //  pamoramic image
-    {
-      SetDesc(stack[i],   pano_sphere_tp,         &(mp->distance) ); i++; // Convert panoramic to spherical
-    }
+        {
+            SetDesc(stack[i],   pano_sphere_tp,         &(mp->distance) ); i++; // Convert panoramic to spherical
+        }
     else if(im->format == _equirectangular)                            //  equirectangular image
-    {
-      SetDesc(stack[i],   erect_sphere_tp,        &(mp->distance) ); i++; // Convert equirectangular to spherical
-    }
+        {
+            SetDesc(stack[i],   erect_sphere_tp,        &(mp->distance) ); i++; // Convert equirectangular to spherical
+        }
 
     SetDesc(  stack[i],   resize,                 mp->scale       ); i++; // Scale image
 
     if( im->cP.radial )
-    {
-      switch( im->cP.correction_mode & 3 )
-      {
-        case correction_mode_radial:    SetDesc(stack[i],radial,mp->rad);     i++; break;
-        case correction_mode_vertical:  SetDesc(stack[i],vertical,mp->rad);   i++; break;
-        case correction_mode_deregister:SetDesc(stack[i],deregister,mp->rad); i++; break;
-      }
-    }
-#ifndef MOSAIC_XYZ
+        {
+            switch( im->cP.correction_mode & 3 )
+                {
+                case correction_mode_radial:    SetDesc(stack[i],radial,mp->rad);     i++; break;
+                case correction_mode_vertical:  SetDesc(stack[i],vertical,mp->rad);   i++; break;
+                case correction_mode_deregister:SetDesc(stack[i],deregister,mp->rad); i++; break;
+                }
+        }
     if (im->cP.tilt) {
-      SetDesc(stack[i],   tiltInverse,                   mp);   i++;
+        SetDesc(stack[i],   tiltInverse,                   mp);   i++;
     }
-#endif
 
     if (mp->vertical != 0.0)
-    {
-      SetDesc(stack[i],   vert,                   &(mp->vertical));   i++;
-    }
+        {
+            SetDesc(stack[i],   vert,                   &(mp->vertical));   i++;
+        }
     if (mp->horizontal != 0.0)
-    {
-      SetDesc(stack[i],   horiz,                  &(mp->horizontal)); i++;
-    }
+        {
+            SetDesc(stack[i],   horiz,                  &(mp->horizontal)); i++;
+        }
     if( im->cP.shear )
-    {
-      SetDesc( stack[i],  shear,                  mp->shear       ); i++;
-    }
+        {
+            SetDesc( stack[i],  shear,                  mp->shear       ); i++;
+        }
 
     stack[i].func  = (trfn)NULL;
 
-// print stack for debugging
+    // print stack for debugging
 #if 0
     printf( "Rotate params: %lg  %lg\n" , mp->rot[0], mp->rot[1]);
     printf( "Distance     : %lg\n" , mp->distance);
     printf( "Perspect params: %lg  %lg  %lg\n",a, beta , gammar );      
     if(aP->format       == _rectilinear)                                    // rectilinear image
-    {
-      printf( "Rectilinear\n" );      
-    }
+        {
+            printf( "Rectilinear\n" );      
+        }
     else if (aP->format     == _panorama)                                   //  pamoramic image
-    {
-      printf( "Panorama\n" );
-    }
+        {
+            printf( "Panorama\n" );
+        }
     else
-    {
-      printf( "Fisheye\n" );      
-    }
+        {
+            printf( "Fisheye\n" );      
+        }
 
     printf( "Scaling     : %lg\n" , mp->scale[0]);
 
     if(  aP->correct )
-    {
-      printf( "Correct:\n" );     
-      if( aP->c_prefs.tilt )
-      {
-        printf( "Tilt: %lg\n", mp->tilt );    
-      }
-      if( aP->c_prefs.shear )
-      {
-        printf( "Shear: %lg\n", mp->shear );    
-      }
-      if ( aP->c_prefs.horizontal )
-      {
-        printf( "horiz:%lg\n", mp->horizontal );  
-      }
-      if (  aP->c_prefs.vertical)
-      {
-        printf( "vert:%lg\n", mp->vertical );  
-      }
-      if( aP->c_prefs.radial )
-      {
-        printf( "Polynomial:\n" );      
-        if( aP->c_prefs.isScanningSlit )
         {
-          printf( "Scanning Slit:\n" );   
+            printf( "Correct:\n" );     
+            if( aP->c_prefs.tilt )
+                {
+                    printf( "Tilt: %lg\n", mp->tilt );    
+                }
+            if( aP->c_prefs.shear )
+                {
+                    printf( "Shear: %lg\n", mp->shear );    
+                }
+            if ( aP->c_prefs.horizontal )
+                {
+                    printf( "horiz:%lg\n", mp->horizontal );  
+                }
+            if (  aP->c_prefs.vertical)
+                {
+                    printf( "vert:%lg\n", mp->vertical );  
+                }
+            if( aP->c_prefs.radial )
+                {
+                    printf( "Polynomial:\n" );      
+                    if( aP->c_prefs.isScanningSlit )
+                        {
+                            printf( "Scanning Slit:\n" );   
+                        }
+                    else
+                        {
+                            printf( "Radial:\n" );      
+                            printf( "Params: %lg %lg %lg %lg %lg\n", mp->rad[0],mp->rad[1],mp->rad[2],mp->rad[3],mp->rad[4] );      
+                        }
+                }
         }
-        else
-        {
-          printf( "Radial:\n" );      
-          printf( "Params: %lg %lg %lg %lg %lg\n", mp->rad[0],mp->rad[1],mp->rad[2],mp->rad[3],mp->rad[4] );      
-        }
-      }
-    }
 
 #endif
 }
 
-void PrintMakeParams(char *msg, struct MakeParams *mp, Image *im)
-{
-  printf("-------------%s\n", msg);
-  printf("distnace %f\n", mp->distance);
-  printf("shear[0] %f\n", mp->shear[0]);
-  printf("shear[1] %f\n", mp->shear[1]);
-    printf("rot[0] %f\n", mp->rot[0]);
-    printf("rot[1] %f\n", mp->rot[1]);
-  printf("tilt[0] %f\n", mp->tilt[0]);
-  printf("tilt[1] %f\n", mp->tilt[1]);
-  printf("tilt[2] %f\n", mp->tilt[2]);
-  printf("tilt[3] %f\n", mp->tilt[3]);
 
-  printf("mp->horizontal %f\n", mp->horizontal);
-  printf("mp->vertical %f\n", mp->vertical);
-  printf(">>>Image format %d\n", (int)im->format);
-  printf(">>>im->cP.shear %d\n", im->cP.shear);
-  printf(">>>im->cP.tilt %d\n", im->cP.tilt);
-  printf(">>>im->cP.tilt_x %f\n", im->cP.tilt_x);
-  printf(">>>im->cP.tilt_y %f\n", im->cP.tilt_y);
-  printf(">>>im->cP.tilt_z %f\n", im->cP.tilt_z);
-  printf(">>>im->cP.tilt_scale %f\n", im->cP.tilt_scale);
 
-
-}
-
-
 // Set inverse Makeparameters depending on adjustprefs, color and source image
 
 void  SetInvMakeParams( struct fDesc *stack, struct MakeParams *mp, Image *im , Image *pn, int color )
 {
 
-  int     i;
-  double    a,b;              // field of view in rad
-  double      tx,ty,tpara;
+    int     i;
+    double    a,b;              // field of view in rad
+    double      tx,ty,tpara;
 
-  a =  DEG_TO_RAD( im->hfov );  // field of view in rad   
-  b =  DEG_TO_RAD( pn->hfov );
+    a =  DEG_TO_RAD( im->hfov );  // field of view in rad   
+    b =  DEG_TO_RAD( pn->hfov );
 
+    mp->im = im;
+    mp->pn = pn;
 
-  mp->im = im;
-  mp->pn = pn;
-  SetMatrix( DEG_TO_RAD( im->pitch ), 
-             0.0, 
-             DEG_TO_RAD( im->roll ), 
-             mp->mt, 
-             1 );
+    SetMatrix( DEG_TO_RAD( im->pitch ), 
+               0.0, 
+               DEG_TO_RAD( im->roll ), 
+               mp->mt, 
+               1 );
 
-  // dangelo: added mercator, sinusoidal and stereographic projection
-  switch (pn->format)
-    {
-    case _rectilinear:
-      mp->distance        = (double) pn->width / (2.0 * tan(b/2.0));
-      break;
-    case _equirectangular:
-    case _fisheye_ff:
-    case _fisheye_circ:
-    case _panorama:
-    case _lambert:
-    case _mercator:
-    case _millercylindrical:
-    case _sinusoidal:
-    case _mirror:
-      // horizontal pixels per rads
-      mp->distance        = ((double) pn->width) / b;
-      break;
-    case _lambertazimuthal:
-      tpara = 1;
-      lambertazimuthal_erect(b/2.0, 0.0, &tx, &ty, & tpara);
-      mp->distance = pn->width/(2.0*tx);
-      break;
-    case _panini:
-      tpara = 1;
-      panini_erect(b/2.0, 0.0, &tx, &ty, & tpara);
-      mp->distance = pn->width/(2.0*tx);
-      break;
-    case _equipanini:
-      tpara = 1;
-      equipanini_erect(b/2.0, 0.0, &tx, &ty, & tpara);
-      mp->distance = pn->width/(2.0*tx);
-      break;
-    case _architectural:
-      tpara = 1;
-      arch_erect(b/2.0, 0.0, &tx, &ty, & tpara);
-      mp->distance = pn->width/(2.0*tx);
-      break;
-    case _stereographic:
-      tpara = 1;
-      stereographic_erect(b/2.0, 0.0, &tx, &ty, & tpara);
-      mp->distance = pn->width/(2.0*tx);
-      break;
-    case _trans_mercator:
-      tpara = 1;
-      transmercator_erect(b/2.0, 0.0, &tx, &ty, & tpara);
-      mp->distance = pn->width/(2.0*tx);
-      break;
-    case _albersequalareaconic:
-      mp->distance = 1.0;
-      //albersequalareaconic_erect(1.924913116, -PI/2.0, &tx, &ty, mp);  //b/2.0
-      albersequalareaconic_distance(&tx, mp);
-      mp->distance = pn->width/(2.0*tx);
-      break;
-    case _equisolid:
-      mp->distance  = (double) pn->width / (4.0 * sin(b/4.0));
-      break;
-    case _orthographic:
-      mp->distance  = (double) pn->width / (2.0 * sin(b/2.0));
-      break;
-    case _biplane:
-      biplane_distance(pn->width,b,mp);
-      break;
-    case _triplane:
-      triplane_distance(pn->width,b,mp);
-      break;    default:
-      // unknown
-      PrintError ("SetInvMakeParams: Unsupported panorama projection");
-      // no way to report an error back to the caller...
-      mp->distance = 1;
-      break;
-    }
+    // dangelo: added mercator, sinusoidal and stereographic projection
+    switch (pn->format)
+        {
+        case _rectilinear:
+            mp->distance        = (double) pn->width / (2.0 * tan(b/2.0));
+            break;
+        case _equirectangular:
+        case _fisheye_ff:
+        case _fisheye_circ:
+        case _panorama:
+        case _lambert:
+        case _mercator:
+        case _millercylindrical:
+        case _sinusoidal:
+        case _mirror:
+            // horizontal pixels per rads
+            mp->distance        = ((double) pn->width) / b;
+            break;
+        case _lambertazimuthal:
+            tpara = 1;
+            lambertazimuthal_erect(b/2.0, 0.0, &tx, &ty, & tpara);
+            mp->distance = pn->width/(2.0*tx);
+            break;
+        case _panini:
+            tpara = 1;
+            panini_erect(b/2.0, 0.0, &tx, &ty, & tpara);
+            mp->distance = pn->width/(2.0*tx);
+            break;
+        case _equipanini:
+            tpara = 1;
+            equipanini_erect(b/2.0, 0.0, &tx, &ty, & tpara);
+            mp->distance = pn->width/(2.0*tx);
+            break;
+        case _architectural:
+            tpara = 1;
+            arch_erect(b/2.0, 0.0, &tx, &ty, & tpara);
+            mp->distance = pn->width/(2.0*tx);
+            break;
+        case _stereographic:
+            tpara = 1;
+            stereographic_erect(b/2.0, 0.0, &tx, &ty, & tpara);
+            mp->distance = pn->width/(2.0*tx);
+            break;
+        case _trans_mercator:
+            tpara = 1;
+            transmercator_erect(b/2.0, 0.0, &tx, &ty, & tpara);
+            mp->distance = pn->width/(2.0*tx);
+            break;
+        case _albersequalareaconic:
+            mp->distance = 1.0;
+            //albersequalareaconic_erect(1.924913116, -PI/2.0, &tx, &ty, mp);  //b/2.0
+            albersequalareaconic_distance(&tx, mp);
+            mp->distance = pn->width/(2.0*tx);
+            break;
+        case _equisolid:
+            mp->distance  = (double) pn->width / (4.0 * sin(b/4.0));
+            break;
+        case _orthographic:
+            mp->distance  = (double) pn->width / (2.0 * sin(b/2.0));
+            break;
+        case _biplane:
+            biplane_distance(pn->width,b,mp);
+            break;
+        case _triplane:
+            triplane_distance(pn->width,b,mp);
+            break;    default:
+            // unknown
+            PrintError ("SetInvMakeParams: Unsupported panorama projection");
+            // no way to report an error back to the caller...
+            mp->distance = 1;
+            break;
+        }
 
-  // calculate final scaling factor, that reverses the mp->distance
-  // scaling and applies the required output scaling factor
-  switch (im->format)
-    {
-    case _rectilinear:
-      // calculate distance for this projection
-      mp->scale[0] = (double) im->width / (2.0 * tan(a/2.0)) / mp->distance;
-      break;
-    case _equirectangular:
-    case _panorama:
-    case _fisheye_ff:
-    case _fisheye_circ:
-    case _mercator:
-    case _sinusoidal:
-      mp->scale[0] = ((double) im->width) / a / mp->distance;
-      break;
-    case _equisolid:
-    case _mirror:
-      mp->scale[0] = (double) im->width / (4.0 * sin(a/4.0)) / mp->distance;
-      break;
-    case _orthographic:
-      mp->scale[0] = (double) im->width / (2.0 * sin(a/2.0)) / mp->distance;
-      break;
-    case _stereographic:
-      mp->scale[0] = (double) im->width / (4.0 * tan(a/4.0)) / mp->distance;
-      break;
-    default:
-      PrintError ("SetInvMakeParams: Unsupported input image projection");
-      // no way to report an error back to the caller...
-      mp->scale[0] = 1;
-      break;
-    }
-  mp->scale[1]    = mp->scale[0];
+    // calculate final scaling factor, that reverses the mp->distance
+    // scaling and applies the required output scaling factor
+    switch (im->format)
+        {
+        case _rectilinear:
+            // calculate distance for this projection
+            mp->scale[0] = (double) im->width / (2.0 * tan(a/2.0)) / mp->distance;
+            break;
+        case _equirectangular:
+        case _panorama:
+        case _fisheye_ff:
+        case _fisheye_circ:
+        case _mercator:
+        case _sinusoidal:
+            mp->scale[0] = ((double) im->width) / a / mp->distance;
+            break;
+        case _equisolid:
+        case _mirror:
+            mp->scale[0] = (double) im->width / (4.0 * sin(a/4.0)) / mp->distance;
+            break;
+        case _orthographic:
+            mp->scale[0] = (double) im->width / (2.0 * sin(a/2.0)) / mp->distance;
+            break;
+        case _stereographic:
+            mp->scale[0] = (double) im->width / (4.0 * tan(a/4.0)) / mp->distance;
+            break;
+        default:
+            PrintError ("SetInvMakeParams: Unsupported input image projection");
+            // no way to report an error back to the caller...
+            mp->scale[0] = 1;
+            break;
+        }
+    mp->scale[1]    = mp->scale[0];
 
-  mp->shear[0]  = im->cP.shear_x / im->height;
-  mp->shear[1]  = im->cP.shear_y / im->width;
+    mp->shear[0]  = im->cP.shear_x / im->height;
+    mp->shear[1]  = im->cP.shear_y / im->width;
   
-  //PrintMakeParams("Inverse 10", mp,im);
-#ifdef MOSAIC_XYZ
-  mp->tilt[0] = im->cP.tilt_x;
-  mp->tilt[1] = im->cP.tilt_y;
-  mp->tilt[2] = im->cP.tilt_z;
-  mp->tilt[3] = im->cP.tilt_scale;
-#else
+
   mp->tilt[0] = DEG_TO_RAD(im->cP.tilt_x);
   mp->tilt[1] = DEG_TO_RAD(im->cP.tilt_y);
   mp->tilt[2] = DEG_TO_RAD(im->cP.tilt_z);
   mp->tilt[3] = im->cP.tilt_scale;
-#endif
+  
+  mp->trans[0] = im->cP.trans_x;
+  mp->trans[1] = im->cP.trans_y;
+  mp->trans[2] = im->cP.trans_z;
 
-  //  PrintMakeParams("Inverse 20",mp,im);
+  mp->test[0] = im->cP.test_p0;
+  mp->test[1] = im->cP.test_p1;
+  mp->test[2] = im->cP.test_p2;
+  mp->test[3] = im->cP.test_p3;
 
+  //  panoAdjustPrintMakeParams("Inverse 20",mp,im);
+
   mp->scale[0] = 1.0 / mp->scale[0];
   mp->scale[1]  = mp->scale[0];
   mp->horizontal  = -im->cP.horizontal_params[color];
@@ -1229,7 +1223,7 @@
   mp->perspect[0] = (void*)(mp->mt);
   mp->perspect[1] = (void*)&(mp->distance);
 
-  //  PrintMakeParams("Invert 30",mp,im);
+  //  panoAdjustPrintMakeParams("Invert 30",mp,im);
 
   i = 0;  // Stack counter
     
@@ -1249,12 +1243,10 @@
     SetDesc(stack[i],vert,        &(mp->vertical));   i++;
   }
 
-#ifndef MOSAIC_XYZ
   if( im->cP.tilt )
   {
     SetDesc( stack[i],tiltForward,      mp   ); i++;
   }
-#endif
 
   // Perform radial correction
 
@@ -1304,12 +1296,10 @@
   SetDesc(  stack[i], erect_sphere_tp,  &(mp->distance) ); i++; // Convert spherical image to equirect.
   SetDesc(  stack[i], rotate_erect,   mp->rot     ); i++; // Rotate equirect. image horizontally
 
-#ifdef MOSAIC_XYZ
-  if( im->cP.tilt )
+  if( im->cP.trans )
   {
     SetDesc( stack[i], plane_transfer_from_camera,      mp   ); i++;
   }
-#endif
 
   // THESE ARE ALL FORWARD transforms
   if(pn->format == _rectilinear)                  // rectilinear panorama
@@ -1419,7 +1409,7 @@
         mp->horizontal = 0;
     }
 
-	if(im->cP.vertical)
+        if(im->cP.vertical)
     {
         mp->vertical = im->cP.vertical_params[color];
     }
@@ -1428,164 +1418,164 @@
         mp->vertical = 0;
     }
 
-	if( (im->selection.left != 0) || (im->selection.top != 0) || (im->selection.bottom != 0) || (im->selection.right != 0) )
+        if( (im->selection.left != 0) || (im->selection.top != 0) || (im->selection.bottom != 0) || (im->selection.right != 0) )
     {
         if(im->cP.cutFrame)
         {
-			imSel.width = im->selection.right  - im->selection.left;
-			imSel.height = im->selection.bottom - im->selection.top;
+                        imSel.width = im->selection.right  - im->selection.left;
+                        imSel.height = im->selection.bottom - im->selection.top;
 
-			mp->horizontal += (im->selection.right  + im->selection.left - im->width)/2.0;
-			mp->vertical   += (im->selection.bottom + im->selection.top  - im->height)/2.0;
+                        mp->horizontal += (im->selection.right  + im->selection.left - im->width)/2.0;
+                        mp->vertical   += (im->selection.bottom + im->selection.top  - im->height)/2.0;
 
-			imSel.cP.horizontal_params[color] = mp->horizontal;
-			imSel.cP.vertical_params[color]   = mp->vertical;
+                        imSel.cP.horizontal_params[color] = mp->horizontal;
+                        imSel.cP.vertical_params[color]   = mp->vertical;
         }
     }
 
-	SetInvMakeParams( stack, mp, &imSel, pn, color );
+        SetInvMakeParams( stack, mp, &imSel, pn, color );
 }
-	
+        
 
 
 // Add an alpha channel to the image, assuming rectangular or circular shape
 // subtract frame 
 
 void addAlpha( Image *im ){
-	register int 		x,y,c1;
-	int			framex, framey;
-	register unsigned char	*src;
-	
-	src = *(im->data);
-	framex = 0; framey = 0;
-	
-	if( im->cP.cutFrame ){
-		if( im->cP.frame < 0 || im->cP.fwidth < 0 || im->cP.fheight < 0 ){	// Use supplied alpha channel
-			return;
-		}
-		
-		if( im->cP.frame != 0 ){
-			framex = (im->width/2 	> im->cP.frame ? im->cP.frame : 0);
-			framey = (im->height/2 	> im->cP.frame ? im->cP.frame : 0);
-		}
-		else{
-			if( im->width > im->cP.fwidth )
-				framex = (im->width - im->cP.fwidth) / 2;
-			if( im->height > im->cP.fheight )
-				framey = (im->height - im->cP.fheight) / 2;
-		}
-	}
+        register int            x,y,c1;
+        int                     framex, framey;
+        register unsigned char  *src;
+        
+        src = *(im->data);
+        framex = 0; framey = 0;
+        
+        if( im->cP.cutFrame ){
+                if( im->cP.frame < 0 || im->cP.fwidth < 0 || im->cP.fheight < 0 ){      // Use supplied alpha channel
+                        return;
+                }
+                
+                if( im->cP.frame != 0 ){
+                        framex = (im->width/2   > im->cP.frame ? im->cP.frame : 0);
+                        framey = (im->height/2  > im->cP.frame ? im->cP.frame : 0);
+                }
+                else{
+                        if( im->width > im->cP.fwidth )
+                                framex = (im->width - im->cP.fwidth) / 2;
+                        if( im->height > im->cP.fheight )
+                                framey = (im->height - im->cP.fheight) / 2;
+                }
+        }
 
 
-	if( im->bitsPerPixel == 32 || im->bitsPerPixel == 64 ) // leave 24/48 bit images unchanged
-	{
-		if( im->format != _fisheye_circ )		// Rectangle valid
-		{
-			int yend = im->height - framey;
-			int xend = im->width  - framex;
-			
-			if( im->bitsPerPixel == 32 )
-			{
-				if( 0 != framey || 0 != framex )
-				{
-					for(y = 0; y < im->height; y++)
-					{
-						c1 = y * im->bytesPerLine;
-						for(x = 0; x < im->width; x++)
-							src[ c1 + 4 * x ] = 0;
-					}
-				}
-				for(y = framey; y < yend; y++)
-				{
-					c1 = y * im->bytesPerLine;
-					for(x = framex; x < xend; x++)
-						src[ c1 + 4 * x ] = UCHAR_MAX;
-				}
-			}
-			else // im->bitsPerPixel == 64
-			{
-				if( 0 != framey || 0 != framex )
-				{
-					for(y = 0; y < im->height; y++)
-					{
-						c1 = y * im->bytesPerLine;
-						for(x = 0; x < im->width; x++)
-							*((USHORT*)(src + c1 + 8 * x )) = 0;
-					}
-				}
-				for(y = framey; y < yend; y++)
-				{
-					c1 = y * im->bytesPerLine;
-					for(x = framex; x < xend; x++)
-						*((USHORT*)(src + c1 + 8 * x )) = USHRT_MAX;
-				}
-			}
-		}
-		else if( im->format == _fisheye_circ ) // Circle valid
-		{
-			int topCircle 	= ( im->height - im->width ) / 2; 	// top of circle
-			int botCircle 	= topCircle + im->width ;			// bottom of circle
-			int r			= ( im->width / 2 );				// radius of circle
-			int x1, x2, h;
-			
-			if( im->bitsPerPixel == 32 )
-			{
-				for(y = 0; y < im->height  ; y++) 
-				{
-					if( (y < topCircle) || (y > botCircle) )  // Always invalid
-					{
-						for(x = 0; x < im->width; x++)
-							src[y * im->bytesPerLine + 4 * x] = 0;
-					}
-					else
-					{
-						h 	=	y - im->height/2;
-						if( h*h > r*r ) h = r;
+        if( im->bitsPerPixel == 32 || im->bitsPerPixel == 64 ) // leave 24/48 bit images unchanged
+        {
+                if( im->format != _fisheye_circ )               // Rectangle valid
+                {
+                        int yend = im->height - framey;
+                        int xend = im->width  - framex;
+                        
+                        if( im->bitsPerPixel == 32 )
+                        {
+                                if( 0 != framey || 0 != framex )
+                                {
+                                        for(y = 0; y < im->height; y++)
+                                        {
+                                                c1 = y * im->bytesPerLine;
+                                                for(x = 0; x < im->width; x++)
+                                                        src[ c1 + 4 * x ] = 0;
+                                        }
+                                }
+                                for(y = framey; y < yend; y++)
+                                {
+                                        c1 = y * im->bytesPerLine;
+                                        for(x = framex; x < xend; x++)
+                                                src[ c1 + 4 * x ] = UCHAR_MAX;
+                                }
+                        }
+                        else // im->bitsPerPixel == 64
+                        {
+                                if( 0 != framey || 0 != framex )
+                                {
+                                        for(y = 0; y < im->height; y++)
+                                        {
+                                                c1 = y * im->bytesPerLine;
+                                                for(x = 0; x < im->width; x++)
+                                                        *((USHORT*)(src + c1 + 8 * x )) = 0;
+                                        }
+                                }
+                                for(y = framey; y < yend; y++)
+                                {
+                                        c1 = y * im->bytesPerLine;
+                                        for(x = framex; x < xend; x++)
+                                                *((USHORT*)(src + c1 + 8 * x )) = USHRT_MAX;
+                                }
+                        }
+                }
+                else if( im->format == _fisheye_circ ) // Circle valid
+                {
+                        int topCircle   = ( im->height - im->width ) / 2;       // top of circle
+                        int botCircle   = topCircle + im->width ;                       // bottom of circle
+                        int r                   = ( im->width / 2 );                            // radius of circle
+                        int x1, x2, h;
+                        
+                        if( im->bitsPerPixel == 32 )
+                        {
+                                for(y = 0; y < im->height  ; y++) 
+                                {
+                                        if( (y < topCircle) || (y > botCircle) )  // Always invalid
+                                        {
+                                                for(x = 0; x < im->width; x++)
+                                                        src[y * im->bytesPerLine + 4 * x] = 0;
+                                        }
+                                        else
+                                        {
+                                                h       =       y - im->height/2;
+                                                if( h*h > r*r ) h = r;
 
-						x1 = (int) (r - sqrt( r*r - h*h ));
-						if( x1 < 0 ) x1 = 0;
-						x2 = (int) (r + sqrt( r*r - h*h ));
-						if( x2 > im->width ) x2 = im->width;
-			
-						for(x = 0; x < x1; x++)
-							src[y * im->bytesPerLine + 4 * x] = 0;
-						for(x = x1; x < x2; x++)
-							src[y * im->bytesPerLine + 4 * x] = UCHAR_MAX;
-						for(x = x2; x < im->width; x++)
-							src[y * im->bytesPerLine + 4 * x] = 0;
-					}
-				}
-			}
-			else // im->bitsPerPixel == 64
-			{
-				for(y = 0; y < im->height  ; y++) 
-				{
-					if( (y < topCircle) || (y > botCircle) )  // Always invalid
-					{
-						for(x = 0; x < im->width; x++)
-							*((USHORT*)(src + y * im->bytesPerLine + 8 * x)) = 0;
-					}
-					else
-					{
-						h 	=	y - im->height/2;
-						if( h*h > r*r ) h = r;
+                                                x1 = (int) (r - sqrt( r*r - h*h ));
+                                                if( x1 < 0 ) x1 = 0;
+                                                x2 = (int) (r + sqrt( r*r - h*h ));
+                                                if( x2 > im->width ) x2 = im->width;
+                        
+                                                for(x = 0; x < x1; x++)
+                                                        src[y * im->bytesPerLine + 4 * x] = 0;
+                                                for(x = x1; x < x2; x++)
+                                                        src[y * im->bytesPerLine + 4 * x] = UCHAR_MAX;
+                                                for(x = x2; x < im->width; x++)
+                                                        src[y * im->bytesPerLine + 4 * x] = 0;
+                                        }
+                                }
+                        }
+                        else // im->bitsPerPixel == 64
+                        {
+                                for(y = 0; y < im->height  ; y++) 
+                                {
+                                        if( (y < topCircle) || (y > botCircle) )  // Always invalid
+                                        {
+                                                for(x = 0; x < im->width; x++)
+                                                        *((USHORT*)(src + y * im->bytesPerLine + 8 * x)) = 0;
+                                        }
+                                        else
+                                        {
+                                                h       =       y - im->height/2;
+                                                if( h*h > r*r ) h = r;
 
-						x1 = (int) (r - sqrt( r*r - h*h ));
-						if( x1 < 0 ) x1 = 0;
-						x2 = (int) (r + sqrt( r*r - h*h ));
-						if( x2 > im->width ) x2 = im->width;
-			
-						for(x = 0; x < x1; x++)
-							*((USHORT*)(src + y * im->bytesPerLine + 8 * x)) = 0;
-						for(x = x1; x < x2; x++)
-							*((USHORT*)(src + y * im->bytesPerLine + 8 * x)) = USHRT_MAX;
-						for(x = x2; x < im->width; x++)
-							*((USHORT*)(src + y * im->bytesPerLine + 8 * x)) = 0;
-					}
-				}
-			}
-		} // mode
-	}	// pixelsize
+                                                x1 = (int) (r - sqrt( r*r - h*h ));
+                                                if( x1 < 0 ) x1 = 0;
+                                                x2 = (int) (r + sqrt( r*r - h*h ));
+                                                if( x2 > im->width ) x2 = im->width;
+                        
+                                                for(x = 0; x < x1; x++)
+                                                        *((USHORT*)(src + y * im->bytesPerLine + 8 * x)) = 0;
+                                                for(x = x1; x < x2; x++)
+                                                        *((USHORT*)(src + y * im->bytesPerLine + 8 * x)) = USHRT_MAX;
+                                                for(x = x2; x < im->width; x++)
+                                                        *((USHORT*)(src + y * im->bytesPerLine + 8 * x)) = 0;
+                                        }
+                                }
+                        }
+                } // mode
+        }       // pixelsize
 }
 
 
@@ -1600,158 +1590,158 @@
 double distanceComponents[2];
 
 double distSphere( int num ){
-	double 		x, y ; 	// Coordinates of control point in panorama
-	double		w2, h2;
-	int j;
-	Image sph;
-	int n[2];
-	struct 	MakeParams	mp;
-	struct  fDesc        	stack[15];
-	CoordInfo b[2];
-	CoordInfo cp;
-	double lat[2], lon[2];  // latitude & longitude
-	double dlon;
-	double dangle;
-	double dist;
-	double radiansToPixelsFactor;
+        double          x, y ;  // Coordinates of control point in panorama
+        double          w2, h2;
+        int j;
+        Image sph;
+        int n[2];
+        struct  MakeParams      mp;
+        struct  fDesc           stack[15];
+        CoordInfo b[2];
+        CoordInfo cp;
+        double lat[2], lon[2];  // latitude & longitude
+        double dlon;
+        double dangle;
+        double dist;
+        double radiansToPixelsFactor;
 
-	// Factor to convert angular error in radians to equivalent in pixels
-	
-	radiansToPixelsFactor = g->pano.width / (g->pano.hfov * (PI/180.0));
-	
-	// Get image position in imaginary spherical image
-	
-	SetImageDefaults( &sph );
-	
-	sph.width 			= 360;
-	sph.height 			= 180;
-	sph.format			= _equirectangular;
-	sph.hfov			= 360.0;
-	
-	n[0] = g->cpt[num].num[0];
-	n[1] = g->cpt[num].num[1];
-	
-	// Calculate coordinates using equirectangular mapping to get longitude/latitude
+        // Factor to convert angular error in radians to equivalent in pixels
+        
+        radiansToPixelsFactor = optInfo->pano.width / (optInfo->pano.hfov * (PI/180.0));
+        
+        // Get image position in imaginary spherical image
+        
+        SetImageDefaults( &sph );
+        
+        sph.width                       = 360;
+        sph.height                      = 180;
+        sph.format                      = _equirectangular;
+        sph.hfov                        = 360.0;
+        
+        n[0] = optInfo->cpt[num].num[0];
+        n[1] = optInfo->cpt[num].num[1];
+        
+        // Calculate coordinates using equirectangular mapping to get longitude/latitude
 
-	for(j=0; j<2; j++){
-		SetInvMakeParams( stack, &mp, &g->im[ n[j] ], &sph, 0 );
-		
-		h2 	= (double)g->im[ n[j] ].height / 2.0 - 0.5;
-		w2	= (double)g->im[ n[j] ].width  / 2.0 - 0.5;
-		
-		
-		execute_stack_new( 	(double)g->cpt[num].x[j] - w2,		// cartesian x-coordinate src
-						(double)g->cpt[num].y[j] - h2,		// cartesian y-coordinate src
-						&x, &y, stack);
+        for(j=0; j<2; j++){
+                SetInvMakeParams( stack, &mp, &optInfo->im[ n[j] ], &sph, 0 );
+                
+                h2      = (double)optInfo->im[ n[j] ].height / 2.0 - 0.5;
+                w2      = (double)optInfo->im[ n[j] ].width  / 2.0 - 0.5;
+                
+                
+                execute_stack_new(      (double)optInfo->cpt[num].x[j] - w2,            // cartesian x-coordinate src
+                                                (double)optInfo->cpt[num].y[j] - h2,            // cartesian y-coordinate src
+                                                &x, &y, stack);
 
-		x = DEG_TO_RAD( x ); 
-		y = DEG_TO_RAD( y ) + PI/2.0;
+                x = DEG_TO_RAD( x ); 
+                y = DEG_TO_RAD( y ) + PI/2.0;
 
-		// x is now in the range -PI to +PI, and y is 0 to PI
-		lat[j] = y;
-		lon[j] = x;
+                // x is now in the range -PI to +PI, and y is 0 to PI
+                lat[j] = y;
+                lon[j] = x;
 
-		b[j].x[0] =   sin(x) * sin( y );
-		b[j].x[1] =   cos( y );
-		b[j].x[2] = - cos(x) * sin(y);
-	}
+                b[j].x[0] =   sin(x) * sin( y );
+                b[j].x[1] =   cos( y );
+                b[j].x[2] = - cos(x) * sin(y);
+        }
 
-	dlon = lon[0]-lon[1];
-	if (dlon < -PI) dlon += 2.0*PI;
-	if (dlon > PI) dlon -= 2.0*PI;
-	distanceComponents[0] = (dlon*sin(0.5*(lat[0]+lat[1]))) * radiansToPixelsFactor;
-	distanceComponents[1] = (lat[0]-lat[1]) * radiansToPixelsFactor;
+        dlon = lon[0]-lon[1];
+        if (dlon < -PI) dlon += 2.0*PI;
+        if (dlon > PI) dlon -= 2.0*PI;
+        distanceComponents[0] = (dlon*sin(0.5*(lat[0]+lat[1]))) * radiansToPixelsFactor;
+        distanceComponents[1] = (lat[0]-lat[1]) * radiansToPixelsFactor;
 
-	// The original acos formulation (acos(SCALAR_PRODUCT(&b[0],&b[1]))
-	// is inaccurate for angles near 0, because it essentially requires finding eps
-	// based on the value of 1-eps^2/2.  The asin formulation is much more
-	// accurate under these conditions.
+        // The original acos formulation (acos(SCALAR_PRODUCT(&b[0],&b[1]))
+        // is inaccurate for angles near 0, because it essentially requires finding eps
+        // based on the value of 1-eps^2/2.  The asin formulation is much more
+        // accurate under these conditions.
 
-	CROSS_PRODUCT(&b[0],&b[1],&cp);
-	dangle = asin(ABS_VECTOR(&cp));
-	if (SCALAR_PRODUCT(&b[0],&b[1]) < 0.0) dangle = PI - dangle;
-	dist = dangle * radiansToPixelsFactor;
-	
-	// Diagnostics to help debug various calculation errors.
-	// Do not delete this code --- it has been needed surprisingly often.
-#if 0	
-	{	double olddist;
-		olddist = acos( SCALAR_PRODUCT( &b[0], &b[1] ) ) * radiansToPixelsFactor;
-//		if (adjustLogFile != 0 && abs(dist-olddist) > 1.0) {
-		if (adjustLogFile != 0 && num < 5) {
-			fprintf(adjustLogFile,"***** DIST ***** dCoord = %g %g, lonlat0 = %g %g, lonlat1 = %g %g, dist=%g, olddist=%g, sumDcoordSq=%g, distSq=%g\n",
-								  distanceComponents[0],distanceComponents[1],lon[0],lat[0],lon[1],lat[1],dist,olddist,
-								  distanceComponents[0]*distanceComponents[0]+distanceComponents[1]*distanceComponents[1],dist*dist);
-		}
-	}
+        CROSS_PRODUCT(&b[0],&b[1],&cp);
+        dangle = asin(ABS_VECTOR(&cp));
+        if (SCALAR_PRODUCT(&b[0],&b[1]) < 0.0) dangle = PI - dangle;
+        dist = dangle * radiansToPixelsFactor;
+        
+        // Diagnostics to help debug various calculation errors.
+        // Do not delete this code --- it has been needed surprisingly often.
+#if 0   
+        {       double olddist;
+                olddist = acos( SCALAR_PRODUCT( &b[0], &b[1] ) ) * radiansToPixelsFactor;
+//              if (adjustLogFile != 0 && abs(dist-olddist) > 1.0) {
+                if (adjustLogFile != 0 && num < 5) {
+                        fprintf(adjustLogFile,"***** DIST ***** dCoord = %g %g, lonlat0 = %g %g, lonlat1 = %g %g, dist=%g, olddist=%g, sumDcoordSq=%g, distSq=%g\n",
+                                                                  distanceComponents[0],distanceComponents[1],lon[0],lat[0],lon[1],lat[1],dist,olddist,
+                                                                  distanceComponents[0]*distanceComponents[0]+distanceComponents[1]*distanceComponents[1],dist*dist);
+                }
+        }
 #endif
 
-	return dist;
+        return dist;
 }
 
 
 
 void pt_getXY(int n, double x, double y, double *X, double *Y){
-	struct 	MakeParams	mp;
-	struct  fDesc        	stack[15];
-	double h2,w2;
+        struct  MakeParams      mp;
+        struct  fDesc           stack[15];
+        double h2,w2;
 
-	SetInvMakeParams( stack, &mp, &g->im[ n ], &g->pano, 0 );
-	h2 	= (double)g->im[ n ].height / 2.0 - 0.5;
-	w2	= (double)g->im[ n ].width  / 2.0 - 0.5;
+        SetInvMakeParams( stack, &mp, &optInfo->im[ n ], &optInfo->pano, 0 );
+        h2      = (double)optInfo->im[ n ].height / 2.0 - 0.5;
+        w2      = (double)optInfo->im[ n ].width  / 2.0 - 0.5;
 
 
-	execute_stack_new( 	x - w2,	y - h2,	X, Y, stack);
+        execute_stack_new(      x - w2, y - h2, X, Y, stack);
 }
 
 // Return distance of points from a line
 // The line through the two farthest apart points is calculated
 // Returned is the sum distance squared of the other two points from the line
 double distsqLine(int N0, int N1){
-	double x[4],y[4], del, delmax, A, B, C, mu, d0, d1;
-	int n0, n1, n2=-1, n3=-1, i, k;
+        double x[4],y[4], del, delmax, A, B, C, mu, d0, d1;
+        int n0, n1, n2=-1, n3=-1, i, k;
 
-	pt_getXY(g->cpt[N0].num[0], (double)g->cpt[N0].x[0], (double)g->cpt[N0].y[0], &x[0], &y[0]);
-	pt_getXY(g->cpt[N0].num[1], (double)g->cpt[N0].x[1], (double)g->cpt[N0].y[1], &x[1], &y[1]);
-	pt_getXY(g->cpt[N1].num[0], (double)g->cpt[N1].x[0], (double)g->cpt[N1].y[0], &x[2], &y[2]);
-	pt_getXY(g->cpt[N1].num[1], (double)g->cpt[N1].x[1], (double)g->cpt[N1].y[1], &x[3], &y[3]);
+        pt_getXY(optInfo->cpt[N0].num[0], (double)optInfo->cpt[N0].x[0], (double)optInfo->cpt[N0].y[0], &x[0], &y[0]);
+        pt_getXY(optInfo->cpt[N0].num[1], (double)optInfo->cpt[N0].x[1], (double)optInfo->cpt[N0].y[1], &x[1], &y[1]);
+        pt_getXY(optInfo->cpt[N1].num[0], (double)optInfo->cpt[N1].x[0], (double)optInfo->cpt[N1].y[0], &x[2], &y[2]);
+        pt_getXY(optInfo->cpt[N1].num[1], (double)optInfo->cpt[N1].x[1], (double)optInfo->cpt[N1].y[1], &x[3], &y[3]);
 
-	delmax = 0.0;
-	n0 = 0; n1 = 1;
+        delmax = 0.0;
+        n0 = 0; n1 = 1;
 
-	for(i=0; i<4; i++){
-		for(k=i+1; k<4; k++){
-			del = (x[i]-x[k])*(x[i]-x[k])+(y[i]-y[k])*(y[i]-y[k]);
-			if(del>delmax){
-				n0=i; n1=k; delmax=del;
-			}
-		}
-	}
-	if(delmax==0.0) return 0.0;
+        for(i=0; i<4; i++){
+                for(k=i+1; k<4; k++){
+                        del = (x[i]-x[k])*(x[i]-x[k])+(y[i]-y[k])*(y[i]-y[k]);
+                        if(del>delmax){
+                                n0=i; n1=k; delmax=del;
+                        }
+                }
+        }
+        if(delmax==0.0) return 0.0;
 
-	for(i=0; i<4; i++){
-		if(i!= n0 && i!= n1){
-			n2 = i;
-			break;
-		}
-	}
-	for(i=0; i<4; i++){
-		if(i!= n0 && i!= n1 && i!=n2){
-			n3 = i;
-		}
-	}
+        for(i=0; i<4; i++){
+                if(i!= n0 && i!= n1){
+                        n2 = i;
+                        break;
+                }
+        }
+        for(i=0; i<4; i++){
+                if(i!= n0 && i!= n1 && i!=n2){
+                        n3 = i;
+                }
+        }
 
 
-	A=y[n1]-y[n0]; B=x[n0]-x[n1]; C=y[n0]*(x[n1]-x[n0])-x[n0]*(y[n1]-y[n0]);
+        A=y[n1]-y[n0]; B=x[n0]-x[n1]; C=y[n0]*(x[n1]-x[n0])-x[n0]*(y[n1]-y[n0]);
 
-	mu=1.0/sqrt(A*A+B*B);
+        mu=1.0/sqrt(A*A+B*B);
 
-	d0 = (A*x[n2]+B*y[n2]+C)*mu;
-	d1 = (A*x[n3]+B*y[n3]+C)*mu;
-	distanceComponents[0] = d0;
-	distanceComponents[1] = d1;
+        d0 = (A*x[n2]+B*y[n2]+C)*mu;
+        d1 = (A*x[n3]+B*y[n3]+C)*mu;
+        distanceComponents[0] = d0;
+        distanceComponents[1] = d1;
 
-	return d0*d0 + d1*d1;
+        return d0*d0 + d1*d1;
 
 }
 
@@ -1761,87 +1751,87 @@
 
 double rectDistSquared( int num ) 
 {
-	double 		x[2], y[2]; 				// Coordinates of control point in panorama
-	double		w2, h2;
-	int j, n[2];
-	double result;
+        double          x[2], y[2];                             // Coordinates of control point in panorama
+        double          w2, h2;
+        int j, n[2];
+        double result;
 
-	struct 	MakeParams	mp;
-	struct  fDesc        	stack[15];
+        struct  MakeParams      mp;
+        struct  fDesc           stack[15];
 
-	
+        
 
-	n[0] = g->cpt[num].num[0];
-	n[1] = g->cpt[num].num[1];
-	
-	// Calculate coordinates x/y in panorama
+        n[0] = optInfo->cpt[num].num[0];
+        n[1] = optInfo->cpt[num].num[1];
+        
+        // Calculate coordinates x/y in panorama
 
-	for(j=0; j<2; j++)
-	{
-		SetInvMakeParams( stack, &mp, &g->im[ n[j] ], &g->pano, 0 );
-		
-		h2 	= (double)g->im[ n[j] ].height / 2.0 - 0.5;
-		w2	= (double)g->im[ n[j] ].width  / 2.0 - 0.5;
-		
+        for(j=0; j<2; j++)
+        {
+                SetInvMakeParams( stack, &mp, &optInfo->im[ n[j] ], &optInfo->pano, 0 );
+                
+                h2      = (double)optInfo->im[ n[j] ].height / 2.0 - 0.5;
+                w2      = (double)optInfo->im[ n[j] ].width  / 2.0 - 0.5;
+                
 
-		execute_stack_new( 	(double)g->cpt[num].x[j] - w2,		// cartesian x-coordinate src
-						(double)g->cpt[num].y[j] - h2,		// cartesian y-coordinate src
-						&x[j], &y[j], stack);
-		// test to check if inverse works
+                execute_stack_new(      (double)optInfo->cpt[num].x[j] - w2,            // cartesian x-coordinate src
+                                                (double)optInfo->cpt[num].y[j] - h2,            // cartesian y-coordinate src
+                                                &x[j], &y[j], stack);
+                // test to check if inverse works
 #if 0
-		{
-			double xt, yt;
-			struct 	MakeParams	mtest;
-			struct  fDesc 		stacktest[15];
-			SetMakeParams( stacktest, &mtest, &g->im[ n[j] ], &g->pano, 0 );
-			execute_stack_new( 	x[j],		// cartesian x-coordinate src
-							y[j],		// cartesian y-coordinate src
-						&xt, &yt, stacktest);
-			
-			printf("x= %lg,	y= %lg,  xb = %lg, yb = %lg \n", g->cpt[num].x[j], g->cpt[num].y[j], xt+w2, yt+h2);  
-			
-		}
+                {
+                        double xt, yt;
+                        struct  MakeParams      mtest;
+                        struct  fDesc           stacktest[15];
+                        SetMakeParams( stacktest, &mtest, &optInfo->im[ n[j] ], &optInfo->pano, 0 );
+                        execute_stack_new(      x[j],           // cartesian x-coordinate src
+                                                        y[j],           // cartesian y-coordinate src
+                                                &xt, &yt, stacktest);
+                        
+                        printf("x= %lg, y= %lg,  xb = %lg, yb = %lg \n", optInfo->cpt[num].x[j], optInfo->cpt[num].y[j], xt+w2, yt+h2);  
+                        
+                }
 #endif
-	}
-	
-	
-//	printf("Coordinates 0:   %lg:%lg	1:	%lg:%lg\n",x[0] + g->pano->width/2,y[0]+ g->pano->height/2, x[1] + g->pano->width/2,y[1]+ g->pano->height/2);
+        }
+        
+        
+//      printf("Coordinates 0:   %lg:%lg        1:      %lg:%lg\n",x[0] + g->pano->width/2,y[0]+ g->pano->height/2, x[1] + g->pano->width/2,y[1]+ g->pano->height/2);
 
 
-	// take care of wrapping and points at edge of panorama
-	
-	if( g->pano.hfov == 360.0 )
-	{
-		double delta = abs( x[0] - x[1] );
-		
-		if( delta > g->pano.width / 2 )
-		{
-			if( x[0] < x[1] )
-				x[0] += g->pano.width;
-			else
-				x[1] += g->pano.width;
-		}
-	}
+        // take care of wrapping and points at edge of panorama
+        
+        if( optInfo->pano.hfov == 360.0 )
+        {
+                double delta = abs( x[0] - x[1] );
+                
+                if( delta > optInfo->pano.width / 2 )
+                {
+                        if( x[0] < x[1] )
+                                x[0] += optInfo->pano.width;
+                        else

@@ Diff output truncated at 100000 characters. @@

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

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

From: <dmg@us...> - 2009-09-26 05:57

Revision: 1081
          http://panotools.svn.sourceforge.net/panotools/?rev=1081&view=rev
Author:   dmg
Date:     2009-09-26 05:57:07 +0000 (Sat, 26 Sep 2009)

Log Message:
-----------
commented debugging

Modified Paths:
--------------
    trunk/libpano/ChangeLog
    trunk/libpano/parser.c

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2009-09-26 05:34:37 UTC (rev 1080)
+++ trunk/libpano/ChangeLog	2009-09-26 05:57:07 UTC (rev 1081)
@@ -1,4 +1,8 @@
 2009-09-25    <dmg@...>
+	
+	* parser.c (ReadImageDescription): Removed a debugging printf I forgot
+	
+2009-09-25    <dmg@...>
 
 	* correct.c (SetCorrectDefaults): Initialized values of new parameters.
 

Modified: trunk/libpano/parser.c
===================================================================
--- trunk/libpano/parser.c	2009-09-26 05:34:37 UTC (rev 1080)
+++ trunk/libpano/parser.c	2009-09-26 05:57:07 UTC (rev 1081)
@@ -1894,7 +1894,7 @@
     memcpy( imPtr,  &im, sizeof(Image) );
     memcpy( sPtr,   &sBuf, sizeof(stBuf ) );
 
-    panoPrintImage("After read image", imPtr);
+    //    panoPrintImage("After read image", imPtr);
 
     return 0;
 }


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

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

From: <brunopostle@us...> - 2009-09-26 20:41

Revision: 1083
          http://panotools.svn.sourceforge.net/panotools/?rev=1083&view=rev
Author:   brunopostle
Date:     2009-09-26 20:41:15 +0000 (Sat, 26 Sep 2009)

Log Message:
-----------
auto-generated ChangeLog.svn file

Modified Paths:
--------------
    trunk/libpano/Makefile.am

Added Paths:
-----------
    trunk/libpano/ChangeLog.svn

Added: trunk/libpano/ChangeLog.svn
===================================================================
--- trunk/libpano/ChangeLog.svn	                        (rev 0)
+++ trunk/libpano/ChangeLog.svn	2009-09-26 20:41:15 UTC (rev 1083)
@@ -0,0 +1,3166 @@
+2009-09-26  dmg
+
+	* [r1082] parser.c: commented debugging
+	* [r1081] ChangeLog, parser.c: commented debugging
+	* [r1080] ChangeLog, PTcommon.c, PTcommon.h, adjust.c, adjust.h,
+	  correct.c, filter.h, math.c, panorama.h, parser.c: Now both types of
+	  tilt/mosaic modes live happily together, new test parms
+
+2009-09-22  dangelo
+
+	* [r1079] ChangeLog, adjust.c, filter.h, math.c: Mosaic mode based on
+	  camera position (not compiled by default).
+
+2009-09-21  kornelbenko
+
+	* [r1078] CMakeLists.txt, tools/CMakeLists.txt: Added needed libraries
+	  to create tools
+
+2009-09-20  brunopostle
+
+	* [r1077] ChangeLog: update ChangeLog
+	* [r1076] Makefile.am, man/Makefile.am, tests/Makefile.am,
+	  tests/simpleStitch/Makefile.am, tests/simpleTiff16/Makefile.am,
+	  tools/Makefile.am: The cmake stuff should be available in the
+	  automake tarball
+	* [r1075] CMakeLists.txt, Makefile.am: Bump soname to 2:0:0 for real
+	  this time
+
+2009-09-20  kornelbenko
+
+	* [r1074] CMakeLists.txt, ChangeLog: creation of static pano13 library
+	  too
+	* [r1073] CMakeLists.txt: white space
+
+2009-09-19  kornelbenko
+
+	* [r1072] ChangeLog, tools/CMakeLists.txt: Don't compile
+	  PTAInterpolate if no JAVA, it uses writeProject() from
+	  ptpicker.c
+	* [r1071] CMakeLists.txt: use javastub.c if noa java available
+
+2009-09-19  jim0watters
+
+	* [r1070] ChangeLog, PTcommon.c: fixed getROI to not clip the nadir
+	  and zenith shots when outputting as cropped tiffs.
+
+2009-09-19  kornelbenko
+
+	* [r1069] CMakeLists.txt, ChangeLog, tests/CMakeLists.txt,
+	  tests/simpleStitch/CMakeLists.txt,
+	  tests/simpleTiff16/CMakeLists.txt: Enable test of our only two
+	  simple tests.
+	  
+	  In build-tree one has first to call "make".
+	  After this one may call "make test" to actually execute the tests.
+	* [r1068] CMakeLists.txt, ChangeLog: Add installation of
+	  lib/pkgconfig/libpano13.pc
+	* [r1067] CMakeLists.txt, ChangeLog, tools/CMakeLists.txt: Added tools
+	  directory
+
+2009-09-19  dmg
+
+	* [r1066] CMakeLists.txt, ChangeLog: 2009-09-18 <dmg@...>
+	  
+	  * CMakeLists.txt: Moved wx-widgets into Windows-only part
+
+2009-09-19  tksharpless
+
+	* [r1065] CMakeLists.txt: CMakeLists.txt now requires version 2.6
+
+2009-09-18  kornelbenko
+
+	* [r1064] CMakeLists.txt: Create symbolic links to libpano13.so
+
+2009-09-18  jim0watters
+
+	* [r1063] doc/Optimize.txt, doc/stitch.txt: Update the optimize and
+	  stitch scripts to document Tilt.
+
+2009-09-18  kornelbenko
+
+	* [r1062] CMakeLists.txt, man/CMakeLists.txt: Added installation of
+	  manuals
+
+2009-09-18  dmg
+
+	* [r1060] doc/developmentPolicy.txt: added sentence on mailing list to
+	  policy draft
+	* [r1059] ChangeLog: 2009-09-18 <dmg@...>
+	  
+	  * doc/developmentPolicy.txt: Added file with a draft of a policy
+	  for development of libpano
+	* [r1058] doc/developmentPolicy.txt: 2009-09-18 <dmg@...>
+	  
+	  * doc/developmentPolicy.txt: Added file with a draft of a policy
+	  for development of libpano
+	* [r1057] CMakeLists.txt, ChangeLog, ptpicker.c: 009-09-18
+	  <dmg@...>
+	  
+	  Patch submitted by Kornel Benko
+	  
+	  * ptpicker.c: Casted some values in printf to avoid compiler
+	  warnings.
+	  
+	  * CMakeLists.txt: As allways one has to call cmake
+	  -DCPACK_BINARY_DEB:BOOL=ON to create a package (debian/ubuntu in
+	  this example)
+	  
+	  make package creates then the package libpano13-2.9.15-Linux.deb.
+	  (Values automatically taken from configure.ac) The package will
+	  install the header-files and the (shared) libpano13 library.
+
+2009-09-18  jim0watters
+
+	* [r1056] ChangeLog, PTcommon.c: Fix crash if script p line has
+	  n"TIFF_m" without any other options for tiff
+
+2009-09-17  jim0watters
+
+	* [r1055] adjust.c: correct the default value for tiltScale optVars to
+	  0, like all optVars.
+	* [r1054] ChangeLog: adjust.c: Add tiltZ and tiltScale to list being
+	  set to default values
+	  math.c Move variable initialization to the beginning of code block
+	  for MSSC compiler.
+
+2009-09-17  jim0Watters
+
+	* [r1053] adjust.c: Add tiltZ and tiltScale to list being set to
+	  default values.
+
+2009-09-17  jim0watters
+
+	* [r1052] math.c: Move variable initialization to the beginning of
+	  code block for MSSC compiler.
+
+2009-09-17  dmg
+
+	* [r1051] ChangeLog, parser.c: 2009-09-17 <dmg@...>
+	  
+	  * parser.c: Fail if Ts parameter is set to zero
+
+2009-09-16  dmg
+
+	* [r1050] ChangeLog, PTcommon.c, correct.c, parser.c: 2009-09-16
+	  <dmg@...>
+	  
+	  * correct.c (correct): Removed debugging code that I introduced
+	  early. I suspect correct is no longer needed. Thanks to Jim
+	  (again) for catching this.
+	  
+	  * parser.c (ReadCoordinates): Removed bogus case switch (thanks to
+	  Jim Watters for catching this!)
+	  
+	  * PTcommon.c: Changed use of NDEBUG to a new preprocessor define
+	  called PANO_TEST_INVERSE
+
+2009-09-16  brunopostle
+
+	* [r1048] ChangeLog: Update ChangeLog for likely beta2
+
+2009-09-14  brunopostle
+
+	* [r1047] tests/panoAutomateTest.pl,
+	  tests/simpleStitch/reference/Makefile.am,
+	  tests/simpleTiff16/reference/Makefile.am: Put missing test case
+	  files in tarball (Andreas Metzler)
+	* [r1046] Makefile.am: switch soname back to 1:0:0 as ABI hasn't
+	  really changed
+
+2009-09-14  dmg
+
+	* [r1045] ChangeLog, configure.ac: 2009-09-14 <dmg@...>
+	  
+	  * configure.ac: Added support for kfreebsd. Patch created by
+	  Debian upstream maintainer Cyril Brulebois
+
+2009-09-10  dmg
+
+	* [r1044] ChangeLog, PTcommon.c, adjust.c, correct.c, filter.h,
+	  math.c, panorama.h, parser.c, pt_stdint.h: 2009-09-09 <dmg@...>
+	  
+	  * PTcommon.c, panorama.h, pt_stdint.h, math.c, adjust.c
+	  PTcommon.c, filter.h, parser.c, correct.c: Integrated Dev"s
+	  implementation of tilt, extended to support rotation of the camera
+	  before independent of roll,pitch,yaw. The new parameters are:
+	  Tx,Ty,Tz,Ts (tilt on x axis, y axis, z axis, and scaling of field
+	  of view in the transformation). Supported by PTmender and
+	  PToptimizer
+
+2009-09-03  brunopostle
+
+	* [r1042] ChangeLog: Update ChangeLog with svn2cl
+	* [r1041] Makefile.am, configure.ac, version.h: Bump version and
+	  soname
+	* [r1040] adjust.h, parser.c: Fixes for implicit declarations
+	  (Stanislav Brabec)
+	* [r1039] Makefile.am, configure.ac, libpano13.pc.in: Add a pkgconfig
+	  support with a libpano13.pc file (Andreas Metzler)
+
+2009-08-18  dmg
+
+	* [r1037] ChangeLog: Forgot to update changelog
+	* [r1036] parser.c: Tried to fix the setlocale thing
+
+2009-08-14  dmg
+
+	* [r1033] ChangeLog, PTcommon.c, adjust.c, filter.h, math.c,
+	  tests/simpleStitch/reference/tiff_m0000.tif,
+	  tests/simpleStitch/reference/tiff_m_cropped0000.tif,
+	  tests/simpleStitch/reference/tiff_m_cropped0001.tif,
+	  tests/simpleTiff16/reference/tiff_m0000.tif,
+	  tests/simpleTiff16/reference/tiff_m_cropped0000.tif: 2009-08-14
+	  <dmg@...>
+	  
+	  * Updated tests cases to reflect the slight change in the
+	  boundaries of the ROI.
+	  
+	  * adjust.c, math.c, filter.h: The inverse of shear was broken. I
+	  have added a shearInv function that takes care of this bug.
+	  
+	  * PTcommon.c (getROI): Improved its computation of its edges to
+	  make it err on the outside rather than on the inside of the actual
+	  area. I have also added code to test the inverse computations for
+	  any particular function.
+	* [r1031] ChangeLog, PTcommon.c, tests/panoAutomateTest.pl,
+	  tests/simpleStitch/reference/tiff_m_uncropped0000.tif,
+	  tests/simpleStitch/reference/tiff_m_uncropped0001.tif,
+	  tests/simpleTiff16/reference/tiff_m0000.tif,
+	  tests/simpleTiff16/reference/tiff_m_uncropped0000.tif,
+	  tests/simpleTiff16/temp.txt: 2009-08-13 <dmg@...>
+	  
+	  * PTcommon.c (panoCreatePanorama): Added support for uncropped
+	  TIFF_m, but only when it is not circular fisheye
+	  
+	  * tests/panoAutomateTest.pl (Compare_Images): Added support for
+	  uncropped and cropped images.
+	  
+	  * Updated tests
+	* [r1030] tests/simpleStitch/reference/tiff_m0000.tif,
+	  tests/simpleStitch/reference/tiff_m0001.tif: i need actual files,
+	  not symlinks
+	* [r1029] tests/simpleStitch/reference/tiff_m0000.tif,
+	  tests/simpleStitch/reference/tiff_m0001.tif: finished renaming files
+	* [r1028] tests/simpleStitch/reference/tiff_m0000.tif,
+	  tests/simpleStitch/reference/tiff_m0001.tif,
+	  tests/simpleStitch/reference/tiff_m_uncropped0000.tif,
+	  tests/simpleStitch/reference/tiff_m_uncropped0001.tif: renaming some
+	  files part 2, has to be done in different commits
+	* [r1027] tests/simpleStitch/reference/tiff_m_cropped0000.tif,
+	  tests/simpleStitch/reference/tiff_m_cropped0001.tif: renaming some
+	  files, has to be done in different commits
+
+2009-08-04  tksharpless
+
+	* [r1021] CMakeLists.txt: Add Bruno's patch for Linux to
+	  CMakeLists.txt
+	* [r1020] CMakeLists.txt: Improved version of previous mod to
+	  CMakeLists.txt
+	* [r1019] CMakeLists.txt: Can define HUGIN_BASE_DIR on the CMake
+	  commandline to locate the Hugin source root (by default it must be
+	  next to the libpano source root and be called hugin).
+	* [r1018] CMakeLists.txt: Added CMakeLists.txt to build libpano13
+	  (only) in the Hugin build environment. Works with MSVC 2008 Exp. &
+	  Hugin SDK on WinVista. Please test elsewhere. Also untested is the
+	  option of including support for the Java utilities (left out by
+	  default).
+
+2009-08-01  dmg
+
+	* [r1017] ChangeLog, parser.c: 2009-08-01 <dmg@...>
+	  
+	  * parser.c: on discussion with Tom Modes I made sure that parser
+	  saves and restores the locale.
+
+2009-06-11  brunopostle
+
+	* [r992] adjust.c: Fix "Unsupported panorama projection" warning when
+	  opening a project with a recent projection (Yuval Levy).
+	  https://sourceforge.net/tracker/?func=detail&atid=550441&aid=2803939&group_id=77506
+
+2009-05-01  brunopostle
+
+	* [r966] ChangeLog: Update ChangeLog for 2.9.14_rc1
+	* [r965] man/Makefile.am, man/PTAInterpolate.pod, man/PToptimizer.1,
+	  man/PToptimizer.pod: man page for PTAInterpolate
+	* [r964] Makefile.am: ABI has changed since 2.9.12, bump soname
+	  (Andreas Metzler)
+
+2009-04-30  brunopostle
+
+	* [r963] math.c: Fix albers equal area conic division by zero error
+	  (Guido Kohlmeyer)
+
+2009-04-25  brunopostle
+
+	* [r960] man/PTblender.1, man/PTcrop.1, man/PTinfo.1, man/PTmasker.1,
+	  man/PTmender.1, man/PToptimizer.1, man/PTroller.1, man/PTtiff2psd.1,
+	  man/PTtiffdump.1, man/PTuncrop.1, man/panoinfo.1: Update VERSION in
+	  man pages (Andreas Metzler)
+
+2009-03-03  brunopostle
+
+	* [r955] ChangeLog: update
+
+2009-02-23  brunopostle
+
+	* [r953] adjust.c, remap.c: Apply MAX_FISHEYE_FOV only if both hfov
+	  and vfov match
+	* [r952] README.linux, README.windows, filter.h: reset MAX_FISHEYE_FOV
+	  to 179 degrees (was 720)
+
+2009-02-12  brunopostle
+
+	* [r949] man/Makefile.am: Don't do pointless chmod a+r after
+	  installing man pages
+
+2009-02-10  jim0watters
+
+	* [r948] parser.c: add missing case statements
+
+2009-02-08  brunopostle
+
+	* [r945] filter.c: Don't include unistd.h on Windows, bug #2577715
+
+2009-02-05  brunopostle
+
+	* [r944] ChangeLog: update ChangeLog
+	* [r943] configure.ac, version.h: bump version to 2.9.14, sources
+	  conflicted as to whether previous version was 2.9.12 or 2.9.13
+	* [r942] m4/ax_check_graphics.m4: close bugs #1236502 & #1599376 -lm
+	  required for libpng
+	* [r941] Makefile.am, README.linux, makefile.linux: Remove
+	  unmaintained makefile.linux
+	* [r940] ColourBrightness.c, filter.c, pttiff.h: patch fixes implicit
+	  declaration warnings, which may lead to
+	  crashes. patch #2163691 (Stanislav Brabec)
+
+2009-02-04  brunopostle
+
+	* [r939] filter.c, filter.h: Fix of invalid write() calls, which don't
+	  appear to be used anyway. patch #2163669 (Stanislav Brabec)
+	* [r938] parser.c: four variables have been added to "C" lines:
+	  * c - control point number;
+	  * D, Dx, Dy - a control point error (value and orthogonal
+	  components).
+	  It is useful for the analysis of results of PToptimizer operation
+	  and the
+	  subsequent removal of "bad" control points. Patch #2118807 (Iouri
+	  Ivliev)
+	* [r937] parser.c: Existing implementation of WriteResults function
+	  uses two intermediate buffers
+	  for sprintf(3) and a considerable quantity of strcat(3) calls for
+	  copying data
+	  in the target buffer. This patch removes all strcat(3) calls and
+	  fulfils
+	  sprintf(3) in the target buffer directly. Patch #2118807 (Iouri
+	  Ivliev)
+
+2009-02-02  dangelo
+
+	* [r936] adjust.c, filter.h, panorama.h, parser.c, queryfeature.c:
+	  forgot to add some more files touched by the bi/triplane projection
+	* [r935] ChangeLog: correct Changelog entry
+	* [r934] ChangeLog, math.c: equirect -> rectilinear transform: reject
+	  points behind the camera
+	  applied patch with biplane and triplane projections.
+
+2009-02-02  brunopostle
+
+	* [r933] ChangeLog, man/.cvsignore,
+	  tests/simpleStitch/reference/.cvsignore,
+	  tests/simpleTiff16/.cvsignore,
+	  tests/simpleTiff16/reference/.cvsignore, tools/.cvsignore:
+	  housekeeping
+
+2009-02-01  brunopostle
+
+	* [r932] tools/PTmasker.c: fix for invalid format specification, bug
+	  #2163676 (Stanislav Brabec)
+	* [r931] configure.ac, m4/ax_check_java.m4: autotools cross-compile
+	  support, bug #2491104 (Diego E. Petteno)
+	* [r930] f2c.h, jpegicc.c, jpegicc.h, rgbe.c, rgbe.h: Fix vague
+	  licensing, bug #1877526 (Cyril Brulebois)
+	* [r929] Makefile.am, configure.ac, man, man/Makefile.am,
+	  man/PTblender.1, man/PTblender.pod, man/PTcrop.1, man/PTcrop.pod,
+	  man/PTinfo.1, man/PTinfo.pod, man/PTmasker.1, man/PTmasker.pod,
+	  man/PTmender.1, man/PTmender.pod, man/PToptimizer.1,
+	  man/PToptimizer.pod, man/PTroller.1, man/PTroller.pod,
+	  man/PTtiff2psd.1, man/PTtiff2psd.pod, man/PTtiffdump.1,
+	  man/PTtiffdump.pod, man/PTuncrop.1, man/PTuncrop.pod,
+	  man/panoinfo.1, man/panoinfo.pod: add missing manpages bug #1877534
+	  (Cyril Brulebois)
+	* [r928] configure.ac, tests/simpleStitch/Makefile.am,
+	  tests/simpleStitch/reference/Makefile.am,
+	  tests/simpleTiff16/Makefile.am,
+	  tests/simpleTiff16/reference/Makefile.am: Don't ship .svn dirs in
+	  tarball bug #1861174 (Cyril Brulebois)
+	* [r927] Makefile.am, PixMap.c, PixMap.h, README.mac, makefile.mac,
+	  pict.c: Remove GPL incompatible files (bug #1861841), this removes
+	  mac classic support
+	  and hopefully doesn't break anything in OS X.
+	* [r926] bootstrap: support libtool-2.0 bug #2011492
+
+2009-01-17  brunopostle
+
+	* [r924] ChangeLog, math.c: fix reverse calculation for pannini
+	  (Thomas Modes)
+
+2009-01-08  brunopostle
+
+	* [r923] queryfeature.c: maximum field of view for pannini should be
+	  equivalent to related projections
+
+2009-01-03  dmg
+
+	* [r921] ChangeLog, adjust.c, filter.h, math.c, panorama.h, parser.c,
+	  queryfeature.c: 2009-01-02 dmg <dmg@...>
+	  
+	  * * adjust.c, filter.h, math.c, panorama.h, parser.c &
+	  queryfeateature.c:
+	  
+	  Fixed the panini (or should we call it pannini) and renamed
+	  previous projection as equirectangular panini. It might have to
+	  change its name
+
+2008-12-31  jim0watters
+
+	* [r919] queryfeature.c: Add missing projections for
+	  panoProjectionFeaturesQuery c/o Yuv
+	* [r918] ., ChangeLog, adjust.c, doc/Optimize.txt, doc/stitch.txt,
+	  filter.h, math.c, panorama.h, parser.c, queryfeature.c: adjust.c,
+	  filter.h, math.c, panorama.h, parser.c & queryfeateature.c
+	  added mirror, equisolid, orthographic, and stereographic as input
+	  image formats
+	  added equisolid, orthographic, stereographic as output panorama
+	  formats
+	  add some more defines to panorama.h to help image and pano formats
+	* [r917] PTcommon.c, correct.c, filter.c, morpher.c, pt_stdint.h,
+	  pteditor.c, ptpicker.c: Initialize TrformStr structure before use
+
+2008-12-29  dmg
+
+	* [r914] ChangeLog, adjust.c, filter.h, math.c, panorama.h, parser.c,
+	  queryfeature.c: 2008-12-29 dmg <dmg@...>
+	  
+	  * panorama.h, math.c, adjust.c, queryfeature.c, filter.h: Finally
+	  added the architectural.
+	* [r913] ChangeLog, queryfeature.c: 2008-12-29 dmg <dmg@...>
+	  
+	  * queryfeature.c (panoProjectionFeaturesQuery): Added querying
+	  features for panini; this will allow Hugin to use it
+	* [r912] ChangeLog, adjust.c, filter.h, math.c, panorama.h, parser.c,
+	  queryfeature.c: 2008-12-29 dmg <dmg@...>
+	  
+	  * panorama.h, math.c, adjust.c, queryfeature.c, filter.h,
+	  parser.c: Added panini projection. the credit goes to Thomas
+	  Sharpless who rediscovered it, and to Bruno Postle, who did the
+	  original math.
+
+2008-08-11  dmg
+
+	* [r867] bootstrap: Oops, minor error in previous commit
+	* [r866] ChangeLog, bootstrap: 2008-08-11 dmg <dmg@...>
+	  
+	  * bootstrap (have_libtool): Added support for 2.2.* version of
+	  libtool. Patch submitted by Neil Shephard.
+
+2008-03-19  dangelo
+
+	* [r833] file.c: applied patch [ 1917103 ] panoImageRead doesn't read
+	  tiff files
+
+2008-01-28  dangelo
+
+	* [r803] filter.h, sys_common.c: revert const change that broke source
+	  compatability with other apps.
+
+2008-01-26  jim0watters
+
+	* [r802] ChangeLog, filter.h, ptpicker.c, resample.c, sys_common.c,
+	  tools/PTAInterpolate.c: Fix some warning messages
+	  sys_common.c and filter.h Updated printError functions to use Const
+	  char (submitted by Simon Oosthoek)
+
+2008-01-16  jim0watters
+
+	* [r799] PTDialogs.c, TODO, adjust.c, correct.c, filter.c, perspect.c,
+	  remap.c, sys_win.c, version.h: Update Photoshop plugins to have new
+	  dialog with options for
+	* [r798] PTDialogs.c, bmp.c, file.c, libpano.sln, libpano.vcproj,
+	  ptpicker.c, tools/PTAInterpolate.vcproj, tools/PTOptimizer.vcproj,
+	  tools/PTblender.c, tools/PTblender.vcproj, tools/PTcrop.vcproj,
+	  tools/PTinfo.c, tools/PTinfo.vcproj, tools/PTmasker.vcproj,
+	  tools/PTmender.vcproj, tools/PTroller.vcproj,
+	  tools/PTtiff2psd.vcproj, tools/PTtiffdump.vcproj,
+	  tools/PTuncrop.vcproj: Update solution and project files to build
+	  MSWin binaries for either Windows or command prompt. Allows same
+	  source code to be used for command line tools and Photoshop
+	  plug-ins.
+	* [r797] panorama.h: Update solution and project files to build MSWin
+	  binaries for either Windows or command prompt. Allows same source
+	  code to be used for command line tools and Photoshop plug-ins.
+
+2008-01-05  jim0watters
+
+	* [r778] libpano.vcproj: Removed duplicate .def files. Updated project
+	* [r777] ChangeLog, Makefile.am, PTcommon.c, TODO, adjust.c,
+	  correct.c, doc/Optimize.txt, doc/stitch.txt, filter.c, filter.h,
+	  libpano13.def, makefile.linux, makefile.mac, makefile.win32,
+	  morpher.c, pano13.def, pano13.rc, panorama.h, parser.c, pteditor.c,
+	  ptpicker.c, resample.c, sys_X11.h, sys_ansi.h, sys_mac.h, sys_win.c,
+	  sys_win.h, tools/Makefile.am, tools/PToptimizer.c: - Added
+	  FastTransform to the data structures removed as global variable
+	  - Added FastTransform to the dialog.
+	  - Updated the dialogs with some of the newer interpolator. TOTO:
+	  update correct.c, morpher.c, perspective.c, and remap to use
+	  transFormEx instead of the new transform (required to use new
+	  interpolators) Requires adding inverse stacks.
+	  - Fixed PTCorrect bug that had wrong order of operations on the
+	  image stack, Radial, then H & V shift.
+	  - updated the default interpolator to _spline36
+	  - On Windows changed the default location to store parameters file
+	  from app folder to folder and file name
+	  %APPDATA%\Panotools\APPNAME.prf. This should make the plugins Vista
+	  friendly. Changed the default temp file location to %TEMP%
+	* [r776] pano13vcd.def: Removed duplicate .def file
+
+2008-01-03  jim0watters
+
+	* [r772] filter.h: revert update of FoV
+
+2008-01-03  dangelo
+
+	* [r771] ChangeLog, tools/Makefile.am: PTAinterpolate depends on java
+
+2007-12-31  jim0watters
+
+	* [r765] ChangeLog, Makefile.am, PTDialogs.c, README.linux,
+	  README.mac, README.windows, TODO, filter.h, libpano.vcproj,
+	  libpano12.def, libpano13.def, makefile.linux, makefile.mac,
+	  makefile.win32, pano12.def, pano12.rc, pano12vc.def, pano12vcd.def,
+	  pano13.def, pano13.rc, pano13vc.def, pano13vcd.def, queryfeature.h,
+	  sys_X11.c, sys_ansi.c, sys_mac.c, sys_win.c, sys_win.h,
+	  tools/Makefile.am, tools/PTainterpolate.rc, tools/PTblender.rc,
+	  tools/PTcrop.rc, tools/PTinfo.rc, tools/PTmasker.rc,
+	  tools/PTmender.rc, tools/PToptimizer.c, tools/PToptimizer.rc,
+	  tools/PTroller.rc, tools/PTtiff2psd.rc, tools/PTtiffdump.rc,
+	  tools/PTuncrop.rc, tools/panoinfo.c, tools/panoinfo_unix.c,
+	  version.h: Update trunk to be pano13. Create a name separation from
+	  pano12. Swepted many files. Updated version info.
+	* [r763] tools/PTAInterpolate.vcproj, tools/PTOptimizer.vcproj,
+	  tools/PTainterpolate.rc, tools/PTblender.rc, tools/PTblender.vcproj,
+	  tools/PTcrop.rc, tools/PTcrop.vcproj, tools/PTinfo.rc,
+	  tools/PTinfo.vcproj, tools/PTmasker.rc, tools/PTmasker.vcproj,
+	  tools/PTmender.rc, tools/PTmender.vcproj, tools/PToptimizer.rc,
+	  tools/PTroller.rc, tools/PTroller.vcproj, tools/PTtiff2psd.rc,
+	  tools/PTtiff2psd.vcproj, tools/PTtiffdump.rc,
+	  tools/PTtiffdump.vcproj, tools/PTuncrop.rc, tools/PTuncrop.vcproj:
+	  Add resource file to provide version info for each of the helper
+	  tools. Updated project file to include resource. Did not try to
+	  update make file. TODO: Update make file to include resource files
+
+2007-12-30  jim0watters
+
+	* [r762] tools/PTpano12.dsp, tools/PTpano12.vcproj,
+	  tools/PTpano12_readme.txt, tools/ptpano12.cpp, tools/ptpano12.def,
+	  tools/ptpano12.h: Remove PTPano12 from the trunk (pano13 branch).
+	  Its purpose is to report on functions used by calling applications
+	  to pano12.dll to help recreate them. It is not part of the pano13
+	  package. The project can still be found in the panotools12 branch as
+	  PTTrace.
+
+2007-12-29  jim0watters
+
+	* [r761] ChangeLog, file.c, libpano.sln, resample.c, tiff.c,
+	  tools/Makefile.am, tools/PTAInterpolate.c,
+	  tools/PTAInterpolate.vcproj, tools/PTblender.vcproj,
+	  tools/PTmasker.vcproj, tools/makefile.panoinfo.win32,
+	  tools/makefile.ptoptimizer.win32: Added Max Lyons bug fixes to
+	  libpano
+	  Added Max Lyons PTAinterpolate project to replace PTInterpolate
+	  Make file updated but not tested.
+	  Removed duplicate make files for panoinfo and ptoptimizer
+	* [r760] tools/PTStitcher.cpp, tools/PTStitcher.vcproj: Remove
+	  incomplete old test project I started to replace PTStitcher that was
+	  later done with PTMender
+	* [r759] resample.c: reverted some of previous fix.
+	* [r758] resample.c: fix more warnings
+
+2007-12-28  jim0watters
+
+	* [r757] ChangeLog, ColourBrightness.c, PTcommon.c, ZComb.c, adjust.c,
+	  correct.c, file.c, file.h, filter.c, filter.h, fourier.c, hdrfile.c,
+	  libpano.vcproj, metadata.c, pano12vcd.def, parser.c, png.c,
+	  pteditor.c, ptfeather.c, ptpicker.c, ptstitch.c, pttiff.h, remap.c,
+	  resample.c, rgbe.c, tiff.c, tools/PTOptimizer.vcproj,
+	  tools/PTblender.vcproj, tools/PTcrop.vcproj, tools/PTinfo.c,
+	  tools/PTinfo.vcproj, tools/PTmasker.c, tools/PTmasker.vcproj,
+	  tools/PTmender.c, tools/PTmender.vcproj, tools/PTroller.vcproj,
+	  tools/PTtiff2psd.vcproj, tools/PTtiffdump.vcproj,
+	  tools/PTuncrop.vcproj: removed warning suppression from MSVC project
+	  builds
+	  swept many files to remove compiler warnings.
+
+2007-11-25  dangelo
+
+	* [r749] ChangeLog, libpano.vcproj: MSVC: produce libs named
+	  pano13.lib
+
+2007-10-21  dangelo
+
+	* [r742] ChangeLog, parser.c: reset m parameter to 0 if not set in m
+	  line
+
+2007-07-16  jim0watters
+
+	* [r716] sys_win.c: Use correct name to reflect version of pref file.
+
+2007-05-10  dangelo
+
+	* [r706] bootstrap: work with newer version of autoconf
+
+2007-04-24  jim0watters
+
+	* [r698] filter.c, sys_X11.c, sys_ansi.c, sys_mac.c, sys_win.c,
+	  version.h: Separated version number of plugin data structure from
+	  main dll,
+
+2007-04-23  jim0watters
+
+	* [r695] ChangeLog, adjust.c: Update scale[0] to use selected width
+	  and height. Fix issue using crop and fisheye images.
+
+2007-02-05  dangelo
+
+	* [r664] ChangeLog, queryfeature.c: fixed projection limits and names
+
+2007-01-25  dangelo
+
+	* [r661] ChangeLog, queryfeature.c: limit cylindrical VFOV to 179
+	* [r660] ChangeLog, filter.c: bugfix: initialize precalculated
+	  parameters in Image struct
+
+2007-01-24  dangelo
+
+	* [r659] ChangeLog, queryfeature.c: populate projection query
+
+2007-01-23  dangelo
+
+	* [r658] ChangeLog, panorama.h: added internal format id to query
+	  projection function
+	* [r657] file.c:
+	* [r656] ChangeLog, PTcommon.c: check if PTmender output file exist,
+	  delete it to make sure
+	  that overwriting works on all platforms
+
+2007-01-23  dmg
+
+	* [r655] ChangeLog, adjust.c, file.c, filter.h, math.c, panorama.h,
+	  parser.c, queryfeature.c, tiff.c: 2007-01-22 dmg <dmg@...>
+	  
+	  * version.h (VERSION), configure.ac Upgraded to version 2.9.13
+	  
+	  * queryfeature.c (panoProjectionFeaturesQuery): Mercator is 179
+	  vfov max.
+	  
+	  * file.c (CREATED_BY_PSD): This constant needs to be ODD in length
+	  
+	  * queryfeature.c, panorama.h, math.c, adjust.c, filter.h,
+	  parser.c: Added Miller Cylindrical.
+
+2007-01-11  dmg
+
+	* [r653] ChangeLog, panorama.h, queryfeature.c: 2007-01-11 dmg
+	  <dmg@...>
+	  
+	  * queryfeature.c, panorama.h (panoProjectionFormatCount): Added
+	  function.
+	* [r652] ChangeLog, configure.ac, panorama.h, parser.c,
+	  queryfeature.c, tools/panoinfo.c, tools/panoinfo_unix.c, version.h:
+	  2007-01-11 dmg <dmg@...>
+	  
+	  * version.h (VERSION), configure.ac Upgraded to version 2.9.12
+	  
+	  * tools/panoinfo_unix.c: Output features of panos.
+	  
+	  * panorama.h, queryfeature.c: Added functions to query features of
+	  each pano
+	  format as needed by hugin.
+	* [r651] parser.c: Removed debugging printf
+	* [r650] ChangeLog, configure.ac, parser.c, version.h: 2007-01-10 dmg
+	  <dmg@...>
+	  
+	  * 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.
+	* [r649] parser.c: I removed weird-sized tabs from parser.c
+	* [r648] ChangeLog, parser.c: 2007-01-10 dmg <dmg@...>
+	  
+	  * parser.c (readAdjust): Images with i were all done with the
+	  first spec. This change fixes that problem (the parser should be
+	  rewritten)
+	* [r647] ChangeLog, TODO, configure.ac, doc/stitch.txt, parser.c,
+	  version.h: 2007-01-10 dmg <dmg@...>
+	  
+	  * version.h (VERSION), configure.ac Upgraded to version 2.9.10
+	  
+	  * doc/stitch.txt: Updated the file to match latest version.
+	  
+	  * parser.c (readAdjust): Updated parser to accept adjustLine in
+	  the i-line.
+	  (nextWord): Make sure that it eats the closing quotes
+	  (ReadPanoramaDescription): Forked this function from
+	  ReadImageDescription. In the past both images (o and i lines)
+	  and output format (p-line) were read with the same function.
+	  
+	  * TODO (PTmender): Updated the file.
+	* [r646] ChangeLog, PTcommon.c, adjust.c, configure.ac, file.c,
+	  filter.c, filter.h, math.c, panorama.h, parser.c, queryfeature.c,
+	  version.h: 2007-01-10 dmg <dmg@...>
+	  
+	  * version.h (VERSION), configure.ac Upgraded to version 2.9.9
+	  
+	  * queryfeature.c: Updated labels for Lamberts to their full name.
+	  
+	  * parser.c: implemented option P (parameters to projection) as a
+	  multivalue parameted
+	  
+	  * panorama.h: Modified the Image struct to support parameters to
+	  the projection and to support precomputation of values for the
+	  projection (to speed up computation)
+	  
+	  * math.c, parser.c, panorama.h, adjust.c, filter.c,
+	  queryfeature.c: Implemented Albers Conical Equal Area projection.
+	  
+	  Most of these changes submitted by Michael Gross, reviewed and
+	  slightly adapted by me.
+
+2007-01-01  dmg
+
+	* [r645] AUTHORS, ChangeLog, ColourBrightness.c, TODO, ZComb.c,
+	  configure.ac, parser.c, sys_ansi.c, tools/PTmasker.c,
+	  tools/PTmender.c, version.h: 2007-01-01 dmg <dmg@...>
+	  
+	  * version.h (VERSION), configure.ac Upgraded to version 2.9.8
+	  
+	  * parser.c (ParseScript): Added some comments to "z" option
+	  
+	  * sys_ansi.c (PrintErrorIntern): Add an end-of-line if none is
+	  provided (to increase readbility of PrintError, but only when
+	  stdout is used)
+	  
+	  * AUTHORS: Updated my own URL. Order them in lexicographical order
+	  by lastname
+	  
+	  * TODO: Updated file.
+	  
+	  * ZComb.c (ZCOMBLOGFILENAME): Changed name of log file for Zcomb
+	  to something more appropriate.
+	  
+	  * ColourBrightness.c (CorrectImageColourBrigthness): Fixed some
+	  compilation warnings
+	  
+	  * tools/PTmasker.c (main): Added support for focus enhancing (z
+	  option in the old PTstitch script)
+
+2007-01-01  dangelo
+
+	* [r644] AUTHORS: added dmg and myself
+
+2006-12-31  dangelo
+
+	* [r643] ChangeLog, libpano.sln, libpano.vcproj, tools/PTmasker.c,
+	  tools/PTroller.c: fixed default output in PTmasker, compile PTroller
+	  when using MSVC
+	* [r642] tools/PTmasker.vcproj: MSVC build accidentally overwrote
+	  PTblender with PTmasker
+	* [r641] ChangeLog, ColourBrightness.c, PTcommon.c, file.c,
+	  ptstitch.c, queryfeature.c, tiff.c, tools/PTmender.c: fix signed vs
+	  unsigned warnings
+
+2006-12-30  dangelo
+
+	* [r640] ChangeLog: forgot to commit my message
+
+2006-12-27  dmg
+
+	* [r639] ChangeLog, ColourBrightness.c, PTcommon.c, TODO,
+	  configure.ac, filter.c, math.c, metadata.c, metadata.h, ptfeather.c,
+	  ptstitch.c, ptstitch.h, pttiff.h, sys_ansi.c, tiff.c,
+	  tools/PTblender.c, tools/PTmasker.c, tools/PTmender.c, version.h:
+	  2006-12-26 dmg <dmg@...>
+	  
+	  * tiff.c (panoTiffDisplayInfo): Fixed compilation warning
+	  
+	  * version.h (VERSION), configure.ac Upgraded to version 2.9.7.
+	  
+	  * math.c: Cleaned up some of the Lambert related code.
+	  
+	  * tools/PTblender.c: Improved error message
+	  it.
+	  
+	  * ptfeather.c: Improved the feathering algorithm, made sure 16
+	  bits works too.
+	  
+	  * ptstitch.c, ptstitch.h (panoStitchPixelChannelSet): Added
+	  function,
+	  cleanedup panoStitchPixelChannelGet.
+	  
+	  * metadata.c (panoImageBytesPerSample): Added function.
+	  
+	  * tools/PTmasker.c (main): If one file is specified feather it,
+	  otherwise do nothing.
+	  
+	  * tiff.c, pttiff.h: (panoImageDispose): Disposes properly any
+	  memory used by the Image data structure.
+	  
+	  * ColourBrightness.c, PTcommon.c, ptstitch.c, PTcommon.c: replaced
+	  myfree(image.data) with panoImageDispose.
+	  
+	  * filter.c (panoMetadataFree): Set pointers to null once they have
+	  been released.
+	  
+	  2006-12-18 dmg <dmg@...>
+	  
+	  * sys_ansi.c (PrintErrorIntern): The function had a limit of 256
+	  bytes to print, and anything longer created a run time error. I
+	  have changed it to deal with any lenght.
+
+2006-12-21  brunopostle
+
+	* [r636] Makefile.am: Fix 'dist' target
+
+2006-12-18  dangelo
+
+	* [r635] adjust.c, adjust.h, doc/Optimize.txt, parser.c: added huber
+	  m-estimator
+
+2006-12-17  dangelo
+
+	* [r634] ChangeLog, Makefile.am, PTDialogs.c, libpano.vcproj: use
+	  sys_ansi on windows
+	* [r633] ChangeLog, math.c: fixed compilation problems with MSVC
+
+2006-12-16  dmg
+
+	* [r631] ChangeLog, PTcommon.c: 2006-12-15 dmg <dmg@...>
+	  
+	  * PTcommon.c (panoCreatePanorama): A pointer was freed more than
+	  once
+	* [r630] ChangeLog, PTcommon.c, configure.ac, file.c, metadata.c,
+	  tiff.c, tools/PTtiff2psd.c, version.h: 2006-12-15 dmg <dmg@...>
+	  
+	  * version.h (VERSION), configure.ac Upgraded to version 2.9.6.
+	  
+	  * tools/PTtiff2psd.c (PT_TIFF2PSD_USAGE): Updated help message
+	  
+	  * PTcommon.c (panoPSDCreate): Added support for 1 input file only in
+	  the creation of PSDs.
+	  
+	  * tools/PTtiff2psd.c (main): Added support for 1 input file only.
+	  
+	  * tiff.c (readTIFF): Reenable readTIFF and writeTIFF. pteditor
+	  uses them.
+	  
+	  2006-12-14 dmg <dmg@...>
+	  
+	  * file.c: Fixed major problems with PSD logic and PICT tags
+	  
+	  * metadata.c (panoImageFullHeight): Darn. It was returning width
+	  instead of height!
+
+2006-12-15  dangelo
+
+	* [r629] ChangeLog, queryfeature.c: added lambert azimuthal to
+	  queryfeature
+
+2006-12-14  dmg
+
+	* [r628] ChangeLog, ColourBrightness.c: 2006-12-13 dmg <dmg@...>
+	  
+	  * ColourBrightness.c (CorrectFileColourBrightness): Another bug I
+	  introduced when I replaced readTIFF with panoTiffRead. I need
+	  regression testing :(
+
+2006-12-13  dangelo
+
+	* [r627] ChangeLog, Makefile.am: install file.h
+
+2006-12-13  dmg
+
+	* [r626] ChangeLog, adjust.c, math.c: 2006-12-12 dmg <dmg@...>
+	  
+	  * math.c (transmercator_erect): Make sure it returns 0 when the
+	  width is infinite.
+	  
+	  * adjust.c: Updated comments
+	  
+	  * math.c (erect_transmercator): Make sure it only translates
+	  points within the sphere (avoids duplication of the image).
+
+2006-12-12  dmg
+
+	* [r625] ChangeLog, adjust.c, configure.ac, filter.h, math.c,
+	  panorama.h, parser.c, version.h: 2006-12-12 dmg <dmg@...>
+	  
+	  * version.h (VERSION), configure.ac Upgraded to version 2.9.5.
+	  
+	  * queryfeature.c: Added lambert Azimuthal projection
+	  
+	  * math.c (erect_lambert, lambert_erect): Added lambert Azimuthal
+	  projection
+	  
+	  * filter.h: Added Lambert Azimuthal projection
+	  
+	  * panorama.h (enum): Added Lambert Azimuthal projection
+	  
+	  * adjust.c (SetMakeParams, SetInvMakeParams): Added Lambert
+	  Azimuthal projection
+	  
+	  * parser.c (readAdjust,ParseScript): Added Lambert Azimuthal
+	  projection.
+
+2006-12-12  dangelo
+
+	* [r624] ChangeLog: update changelog
+	* [r623] ., ColourBrightness.c, PTcommon.c, libpano.sln,
+	  libpano.vcproj, tools, tools/PTOptimizer.vcproj, tools/PTblender.c,
+	  tools/PTblender.vcproj, tools/PTcrop.c, tools/PTcrop.vcproj,
+	  tools/PTinfo.c, tools/PTinfo.vcproj, tools/PTmasker.c,
+	  tools/PTmasker.vcproj, tools/PTmender.c, tools/PTmender.vcproj,
+	  tools/PTroller.vcproj, tools/PTtiff2psd.c, tools/PTtiff2psd.vcproj,
+	  tools/PTtiffdump.c, tools/PTtiffdump.vcproj, tools/PTuncrop.c,
+	  tools/PTuncrop.vcproj, tools/compat_win32,
+	  tools/compat_win32/dirent.h, tools/compat_win32/getopt.c,
+	  tools/compat_win32/getopt.h: make trunk buildable with MSVC 2003.
+	  Instructions at:
+	  http://wiki.panotools.org/Build_pano12_from_sourcecode_MSVC
+
+2006-12-12  dmg
+
+	* [r622] ChangeLog, adjust.c, configure.ac, filter.h, math.c,
+	  panorama.h, parser.c, queryfeature.c, tools/PTmender.c, version.h:
+	  2006-12-11 dmg <dmg@...>
+	  
+	  * version.h (VERSION), configure.ac Upgraded to version 2.9.4.
+	  
+	  * tools/PTmender.c: Fixed a bug in the processing of the input
+	  files.
+	  
+	  * queryfeature.c: Added lambert projection
+	  
+	  * math.c (erect_lambert, lambert_erect): Added lambert projection
+	  
+	  * filter.h: Added Lambert projection
+	  
+	  * panorama.h (enum): Added Lambert projection
+	  
+	  * adjust.c (SetMakeParams, SetInvMakeParams): Added Lambert
+	  projection
+	  
+	  * parser.c (readAdjust,ParseScript): Added Lambert projection.
+	  
+	  * adjust.c (SetInvMakeParams): Corrected error message.
+
+2006-12-04  dmg
+
+	* [r621] ChangeLog, PTcommon.c: Uncommented getCropInformation
+	* [r620] ptfeather.c, tools/PTinfo.c: added missing files
+	* [r619] ChangeLog, PTcommon.c, PTcommon.h, configure.ac, file.c,
+	  file.h, filter.h, metadata.c, parser.c, ptfeather.h, tiff.c,
+	  tools/Makefile.am, tools/PTblender.c, tools/PTcrop.c,
+	  tools/PTmasker.c, tools/PTroller.c, tools/PTuncrop.c, version.h:
+	  06-12-03 dmg <dmg@...>
+	  
+	  * version.h (VERSION), configure.ac Upgraded to version 2.9.3.
+	  
+	  * tiff.c (panoTiffDisplayInfo): Added function.
+	  
+	  * parser.c (panoParserFindOLine): Added function.
+	  
+	  2006-12-02 dmg <dmg@...>
+	  
+	  * PTinfo.c, Makefile.am (bin_PROGRAMS): Created new program
+	  
+	  * metadata.c (panoMetadataCropSizeUpdate),
+	  tiff.c (panoImageBoundingRectangleCompute): Fixed a bug in the
+	  creation of cropped files. The full size tag was not being
+	  created.
+	  
+	  * file.h, file.c (panoFileDeleteMultiple): Created function. Used
+	  with -x option.
+	  
+	  * PTcommon.h, PTcommon.c: Refactored main function from PTcrop
+	  and PTuncrop.
+	  
+	  * tools/PTcrop.c: allow the multiple files in the command line
+	  
+	  * tools/PTmasker.c, tools/PTroller.c, tools/PTblender.c,
+	  tools/PTcrop.c: Add -x switch
+	  
+	  2006-11-30 dmg <dmg@...>
+	  
+	  * parser.c (READ_OPT_VAR): Bug fix: changed a format spec from %k
+	  to %d
+	  
+	  2006-11-28 dmg <dmg@...>
+	  
+	  * tools/PTmender.c (PT_MENDER_USAGE): Updated usage message
+
+2006-11-29  dmg
+
+	* [r618] ChangeLog, tools/PTmender.c: updated usage of PTmender
+	* [r617] ChangeLog, TODO, configure.ac, tools/PTmender.c, version.h:
+	  2006-11-28 dmg <dmg@...>
+	  
+	  * version.h (VERSION), configure.ac Upgraded to version 2.9.2.
+	  
+	  * TODO: Updated it.
+	  
+	  * tools/PTmender.c: Mimic processing of input filenames to match
+	  PTstitcher:
+	  -- First use command line options
+	  -- If no images, then use filename in "i" lines
+	  -- If still no images, then use filename in "o" lines
+	* [r616] tools/panoinfo_unix.c: Fixed a minor bug in panoinfo
+	* [r615] ChangeLog, TODO, queryfeature.c, tools/panoinfo.c,
+	  tools/panoinfo_unix.c, version.h: Updated panoinfo_unix and
+	  ChangeLog
+	* [r614] ChangeLog, ColourBrightness.c, PTcommon.c, TODO, adjust.c,
+	  configure.ac, file.c, file.h, parser.c, tiff.c, tools/PTcrop.c,
+	  tools/PTmasker.c, tools/PTmender.c, tools/PTroller.c, version.h:
+	  2006-11-28 dmg <dmg@...>
+	  
+	  * version.h (VERSION), configure.ac Upgraded to version 2.9.0
+	  
+	  * tiff.c (panoImageBoundingRectangleCompute): Remove a debug
+	  statement.
+	  
+	  * file.h: removed a wrong comment
+	  
+	  * tools/PTcrop.c (main): Renamed option -o to -f (to be consistent)
+	  
+	  * tiff.c (panoTiffCrop): Do processing in a temporal file, instead
+	  of directly in the output file
+	  
+	  * PTcommon.c: Removed some dead code
+	  
+	  * PTcommon.c (panoCreatePanorama): The calculation of the ROI is
+	  not done correctly for circular fisheye images (CFIs). For the
+	  time being we will do uncrop processing for CFIs, and cropped
+	  processing for everything else. For fisheyes we will create crops
+	  in post-processing (it is a hack, but it means everything is
+	  consistent).
+	  
+	  * tools/PTroller.c (main): Fixed a warning
+	  
+	  * adjust.c (SetMakeParams): Added some debugging code (and
+	  commented it out)
+	  
+	  * parser.c (ReadImageDescription): Croping options were not
+	  working properly when 2 cropping specs were specified in the same
+	  command line. For instance, when M=0 was specified any cropping on
+	  the image was considered a type C crop. The new behaviour is the
+	  following:
+	  
+	  if M is specified with parameter == 0, then it is ignored
+	  
+	  For project wFor project wFor project wFor project wFor project wFor
+	  projec prFor project wFor project wFor project wFor project wFor
+	  proje27 dmg <dmg@...>
+	  
+	  * ColourBrightness.c (CorrectFileColourBrightness): Replaced
+	  readTIFF and writeTIFF with panoTiffRead and panoTiffWrite. Added
+	  some error checking
+	  
+	  * PTcommon.c (panoPSDCreate): Replaced readTIFF with panoTiffRead
+	  
+	  2006-11-26 dmg <dmg@...>
+	  
+	  * file.c (panoImageRead): Fixed bug in return value of panoReadImage
+
+2006-11-26  dmg
+
+	* [r613] ChangeLog, Makefile.am, TODO, configure.ac, metadata.c,
+	  metadata.h, ptstitch.c, tests/ChangeLog, tests/panoAutomateTest.pl,
+	  tiff.c, tools/PTmasker.c, version.h: 2006-11-25 dmg <dmg@...>
+	  
+	  * version.h (VERSION), configure.ac Upgraded to version 2.9.0
+	  
+	  * TODO: Updated this file
+	  
+	  * Makefile.am: Minor fix
+	  
+	  * tiff.c (readTIFF, writeTIFF): Finally stopped using these
+	  functions.
+	  
+	  * ptstitch.c: Fixed a bug in the computation of masks for 16 bit
+	  images, and replaced calls to readTIFF and writeTIFF
+	  
+	  * tools/PTmasker.c (main): Added some testing code
+	  
+	  * ptfeather.c (panoFeatherImage): Implemented feathering of
+	  cropped files and 16 bit images
+	  
+	  * metadata.h, metadata.c: added a bunch of simple functions to
+	  access the metatada of the image. Ideally we should not access the
+	  pointer
+	  directly any more.
+
+2006-11-25  dmg
+
+	* [r612] ChangeLog, makefile.osx: 2006-11-25 dmg <dmg@...>
+	  
+	  * Removed makefile.osx which is badly out of date.
+	* [r611] ChangeLog, Makefile.am, PTcommon.c, README, TODO,
+	  configure.ac, doc/PTmender.readme, ptstitch.c, tiff.c,
+	  tools/PTmasker.c, version.h: 2006-11-25 dmg <dmg@...>
+	  
+	  * version.h (VERSION), configure.ac Upgraded to version 2.8.5pre17
+	  
+	  * tiff.c (panoTiffWrite): Fixed a bug in the allocation of the
+	  buffer for writing to the output file.
+	  
+	  * ptstitch.c, tools/PTmasker.c: Enabled feathering code
+	  
+	  * PTcommon.c: removed feathering skeletons from here.
+	  
+	  * ptfeather.c, ptfeather.h: Implemented feathering.
+	  
+	  * Makefile.am: Added ptfeather.c, ptfeather.h
+	  
+	  2006-11-23 dmg <dmg@...>
+	  
+	  * TODO: updated tasks.
+	  
+	  * PTcommon.c (panoCreatePanorama): Change slightly error message
+	  to make it clearer.
+
+2006-11-18  dmg
+
+	* [r603] ChangeLog: Small fix in ChangeLog
+	* [r602] ChangeLog, doc/PTmender.readme: Added comment to PTmender
+	  readme
+	* [r601] ChangeLog, PTcommon.c, configure.ac, doc/PTmender.readme,
+	  doc/PTremap.readme, tools/Makefile.am, tools/PTmender.c,
+	  tools/PTremap.c, version.h: 2006-11-18 dmg <dmg@...>
+	  
+	  * PTcommon.c (Clear_Area_Outside_Selected_Region): Implemented
+	  circular fisheye
+	  
+	  * PTcommon.c (getROI): Reverted _isnan to isnan
+	  
+	  * tools/PTmender.c: I changed my mind. We should keep the PTmender
+	  in the new version of the tools too.
+	  
+	  * tools/PTremap.c: Deleted.
+	  
+	  * tools/Makefile.am: Removed PTremap
+	  
+	  * version.h (VERSION), configure.ac Upgraded to version 2.8.5pre16
+	* [r600] ChangeLog, filter.c, filter.h, panorama.h: 2006-11-17 dmg
+	  <dmg@...>
+	  
+	  * panorama.h: Created Boolean data type (unsigned char)
+	  
+	  * filter.c, filter.h (panoWrite*, panoRead*): Simplified the
+	  functions, got rid of mywrite, replaced BOOL with Boolean
+
+2006-11-15  jim0watters
+
+	* [r599] ChangeLog, filter.c, filter.h, jpeg.c: created file i/o
+	  functions with error checking to replace macro.
+
+2006-11-13  jim0watters
+
+	* [r598] ChangeLog, PTcommon.c, configure.ac, file.c, filter.h,
+	  libpano.vcproj, pano12vc.def, ptstitch.c, rgbe.c, rgbe.h, tiff.c,
+	  version.h: Updated to build with MSVC project file. Fixed build
+	  errors and warnings. increased version to 2.8.5pre15
+
+2006-11-02  dmg
+
+	* [r597] ChangeLog, TODO: updated the TODO with a list of bugs
+
+2006-10-28  dmg
+
+	* [r596] tools/PTmasker.c: I forgot to PTmasker.c
+	* [r595] ChangeLog, README: Updated README
+	* [r594] ChangeLog, PTcommon.c, TODO, configure.ac, file.c, file.h,
+	  pttiff.h, tiff.c, tools/Makefile.am, tools/PTblender.c,
+	  tools/PTcrop.c, tools/PTmender.c, tools/PTroller.c,
+	  tools/PTtiff2psd.c, tools/PTuncrop.c, version.h: 2006-10-28 dmg
+	  <dmg@...>
+	  
+	  * version.h (VERSION), configure.ac: Upgraded to version 2.8.5pre14
+	  
+	  * tools/PTtiff2psd.c: Add -f force processing option. Cleaned up.
+	  
+	  * file.h: Added a field to specify if forced processing in
+	  panoTiffUncrop
+	  
+	  * tools/PTmasker.c: Moved functionalty to create stitching masks
+	  into this program (from PTroller and PTblender).
+	  
+	  * tools/PTroller.c (main): Cleaned up options, added the option
+	  for force processsing.
+	  
+	  * tools/PTmender.c (main): Removed all functionality from it.
+	  
+	  * tools/PTblender.c (main): Cleaned up options. Added the option -f
+	  for force procesing
+	  
+	  * file.h, file.c (panoFileExists): Added function.
+	  
+	  * PTfile.c, tools/PTblender: Refactored function
+	  panoFileOutputNamesCreate
+	  
+	  * tools/PTcrop.c: Reindented. Cleanup options. Replaced -o with -f
+	  to be consistent
+	  
+	  * tools/PTcrop.c: Cleanup options. Replaced -o with -f
+	* [r593] ChangeLog, TODO, tools/PTcrop.c: 2006-10-28 dmg <dmg@...>
+	  
+	  * tools/PTcrop.c: Reindented.
+	* [r592] ChangeLog, TODO, configure.ac, file.h, metadata.c,
+	  metadata.h, ptstitch.c, ptstitch.h, pttiff.h, tiff.c,
+	  tools/Makefile.am, tools/PTcrop.c, tools/PTuncrop.c, version.h:
+	  2006-10-28 dmg <dmg@...>
+	  
+	  * version.h (VERSION), configure.ac: Upgraded to version 2.8.5pre13
+	  
+	  * ptstitch.c, ptstitch.h (panoStitchPixelChannelGet): Upgraded
+	  this function to non-static, since it is useful in tiff.c too.
+	  
+	  * pttiff.h, metadata.c, metadata.h, tiff.c: implemented cropping
+	  of tiffs to boudning rectangle
+	  
+	  * tools/Makefile.am, tools/PTcrop.c: Created program to crop panos
+	  to bounding rectangle
+	  
+	  * tools/PTuncrop.c (main): Fixed bug: return zero when success, and
+	  non-zero
+	  in error.
+
+2006-10-27  dmg
+
+	* [r591] ChangeLog, PTcommon.c, PTcommon.h, TODO, configure.ac,
+	  file.c, file.h, filter.h, panorama.h, tests/simpleStitch/ChangeLog,
+	  tests/simpleStitch/reference/tiff_m_cropped0000.tif,
+	  tests/simpleStitch/reference/tiff_m_cropped0001.tif,
+	  tests/simpleTiff16/ChangeLog,
+	  tests/simpleTiff16/reference/tiff_m_cropped0000.tif, tiff.c,
+	  tools/PTroller.c, tools/PTtiff2psd.c, version.h: 2006-10-27 dmg
+	  <dmg@...>
+	  
+	  * version.h (VERSION), configure.ac: Upgraded to version 2.8.5pre12
+	  
+	  * tools/PTroller.c: Removed unused variables
+	  
+	  * TODO: Updated it
+	  
+	  * PTcommon.c. Set the ImageDescription field of the tiff to the
+	  contents of the script.
+	  
+	  * PTcommon.c, tiff.c: Set imagenumber, and imagesTotalNumber in
+	  PAGENUMBER field of tiff.
+	  
+	  * panorama.h (struct): Added imageNumber, and imagesTotalNumber
+	  and script to the metadata struct.
+	  
+	  * PTcommon.c (panoPSDCreate): Implemented the ability to specify a
+	  blending mode in the output of the image.
+	  
+	  * tools/PTtiff2psd.c, file.c, file.h: panoCreatePSD renamed to
+	  panoPSDCreate, replaced last parameter to be a
+	  struct (panoFlatteningParms) so we can pass as many parameters as
+	  necessary. Added support for blending mode in PSD
+	  
+	* [r590] tools/Makefile.am: It is PToptimizer.c, not PToptimize.c
+	* [r589] tools/PToptimize.c, tools/PToptimizer.c: It is PToptimizer.c,
+	  not PToptimize.c
+	* [r588] ChangeLog, PTcommon.c, TODO, pttiff.h, tiff.c,
+	  tools/PTtiffdump.c, tools/PTuncrop.c: 2006-10-26 dmg <dmg@...>
+	  
+	  * version.h (VERSION), configure.ac: Upgraded to version 2.8.5pre11
+	  
+	  * Support for cropped images that do not contain full size. We
+	  assume the full size = croppped size + offset
+	  
+	  * tools/PTtiffdump.c: Cleaned up compilation errors.
+	  
+	  * tiff.c, PTcommon.c (panoTiffUnCrop): Moved function from
+	  PTcommon.c, renamed it.
+	  
+	  * TODO: Updates to reflect current status.
+	* [r587] ChangeLog, PTcommon.c, TODO, configure.ac,
+	  doc/PTblender.readme, doc/PTmender.readme, doc/PTremap.readme,
+	  tests/panoAutomateTest.pl, tools/Makefile.am, tools/PTblender.c,
+	  tools/PTestimate.c, tools/PTmender.c, tools/PToptimize.c,
+	  tools/PTremap.c, tools/PTroller.c, version.h: 2006-10-26 dmg
+	  <dmg@...>
+	  
+	  * version.h (VERSION), configure.ac: Upgraded to version 2.8.5pre10
+	  
+	  * TODO: Added file
+	  
+	  * tools/README.PTmender: Removed it (created equivalent in ./docs)
+	  
+	  * doc/PTmender.readme: Added file
+	  
+	  * doc/PTblender.readme: Added file
+	  
+	  * doc/PTremap.readme: Added file
+	  
+	  * tests/panoAutomateTest.pl: Updated it to use PTremap and not
+	  PTmender.
+	  
+	  * tools/PTblender.c (main): Removed flattening
+	  functionality. Improved command line handling
+	  
+	  * tools/Makefile.am, tools/PTroller.c: Added PTroller, and
+	  renaming back of PToptimize.
+	  
+	  * tools/PToptimize.c: Renamed PTestimate back to PToptimize.
+	  
+	  * tools/PTremap.c: Copied logic from PTmender to PTremap. Cleaned up
+	  logic
+	  and simplified handling of command line parameters.
+	  
+	  * PTcommon.c: Made some minor cosmetic fixes to progress report.
+	* [r586] ChangeLog, configure.ac, tests/simpleTiff16/temp.txt, tiff.c,
+	  version.h: 2006-10-26 dmg <dmg@...>
+	  
+	  * version.h (VERSION), configure.ac: Upgraded to version 2.8.5pre9
+	  
+	  * tiff.c (panoTiffGetImageProperties): Do not choke if LZW
+	  compressed TIFFs do not have a predictor field
+
+2006-10-26  dmg
+
+	* [r585] ChangeLog: 2006-10-26 dmg <dmg@...>
+	  
+	  * version.h (VERSION), configure.ac: Upgraded to version 2.8.5pre8
+	  
+	  * PTcommon.c (panoCreatePanorama): Remove post-processing during
+	  remapping of images: in other words, ignore output format in script
+	  file.
+	* [r584] ChangeLog, PTcommon.c, configure.ac, tests/ChangeLog,
+	  tests/panoAutomateTest.pl, version.h: 2006-10-26 dmg <dmg@...>
+	  
+	  * version.h (VERSION), configure.ac: Upgraded to version 2.8.5pre8
+	  
+	  * PTcommon.c (panoCreatePanorama): Remove post-processing during
+	  remapping of images: in other words, ignore output format in script
+	  file.
+
+2006-10-25  dmg
+
+	* [r583] ChangeLog, ColourBrightness.c, configure.ac, version.h:
+	  2006-10-25 dmg <dmg@...>
+	  
+	  * version.h (VERSION), configure.ac: Upgraded to version 2.8.5pre7
+	  
+	  * ColourBrightness.c (ReadHistograms): Compute histograms only
+	  when mask == 255. Ignore otherwise.
+	* [r582] ChangeLog, configure.ac, tools/Makefile.am,
+	  tools/PTOptimizer.c, tools/PTestimate.c, version.h: 2006-10-25 dmg
+	  <dmg@...>
+	  
+	  * version.h (VERSION), configure.ac: Upgraded to version 2.8.5pre6
+	  
+	  
+	  * tools/Makefile.am: Renamed PToptimizer to PTestimate
+	* [r581] ChangeLog, ColourBrightness.c, tools/ChangeLog,
+	  tools/PTblender.c: 2006-10-24 dmg <dmg@...>
+	  
+	  * ColourBrightness.c: Map and Curve files for photoshop (colour
+	  correction) were not properly created in Intel machines.
+	  
+	  Submitted by Michal at lightcomp.
+	  
+	  * tools/PTblender.c: Updated command line processing: assume image
+	  0 as reference if options -m or -c are specified.
+
+2006-10-24  dmg
+
+	* [r579] ChangeLog, ColourBrightness.c, configure.ac, tests/ChangeLog,
+	  tests/panoAutomateTest.pl, tools/PTblender.c, version.h: 2006-10-24
+	  dmg <dmg@...>
+	  
+	  * version.h (VERSION), configure.ac: Upgraded to version 2.8.5pre5
+	  
+	  * ColourBrightness.c, tools/PTblender.c: The following bugs in
+	  PTblender
+	  are fixed:
+	  
+	  1) When -c or -m is specified no image output is done and therefore
+	  it
+	  should not be possible to specify -f too.
+	  2) When -c is specified wrong index to array curveExtension is used.
+	  3) Program tries to free already freed memory at the end.
+	  
+	  Submitted by Michal at lightcomp.
+	  
+	  We need a test suite for PTblender.
+
+2006-10-23  dmg
+
+	* [r578] ChangeLog, PTcommon.c, PTcommon.h, configure.ac, file.c,
+	  filter.h, tests/simpleStitch/ChangeLog,
+	  tests/simpleStitch/reference/psd_no_mask.psd, tiff.c,
+	  tools/ChangeLog, tools/PTtiff2psd.c, version.h: 2006-10-22 dmg
+	  <dmg@...>
+	  
+	  * version.h (VERSION), configure.ac: Upgraded to version 2.8.5pre4
+	  
+	  * tiff.c: Removed redundant #defines
+	  
+	  * PTcommon.c, PTcommon.h, filter.h, file.c: Added support for
+	  stacking images in PSD files, that is, each iamge contributes
+	  equaly to a final image.
+
+2006-09-25  dmg
+
+	* [r577] tools/ChangeLog, tools/PTtiffdump.c: added PTtiffdump.c
+
+2006-09-22  dmg
+
+	* [r574] ChangeLog, PTcommon.c, ptstitch.c,
+	  tests/simpleStitch/ChangeLog, tests/simpleStitch/reference/jpeg.jpg,
+	  tests/simpleStitch/reference/psd.psd,
+	  tests/simpleStitch/reference/psd_mask.psd,
+	  tests/simpleStitch/reference/psd_no_mask.psd,
+	  tests/simpleTiff16/ChangeLog, tests/simpleTiff16/README.TXT,
+	  tests/simpleTiff16/reference/psd.psd,
+	  tests/simpleTiff16/reference/psd_mask.psd,
+	  tests/simpleTiff16/reference/psd_no_mask.psd, tools/ChangeLog,
+	  tools/PTblender.c: With this change stitching masks should be
+	  properly computed for all _mask and flat formats
+
+2006-09-21  dmg
+
+	* [r573] ChangeLog, ColourBrightness.c, ColourBrightness.h,
+	  PTcommon.c, configure.ac, version.h: 2006-09-21 dmg <dmg@...>
+	  
+	  * version.h (VERSION), configure.ac: Upgraded to version 2.8.5pre3
+	  
+	  * ColourBrightness.c, PTcommon.c: added support for
+	  saturation-only and brightness-only correction. I also fixed some
+	  small rounding problems in the old code.
+	* [r572] tools/ChangeLog, tools/Makefile.am, tools/PTblender.c:
+	  2006-09-20 dmg <dmg@...>
+	  
+	  * PTblender.c: Added option to select type of colour
+	  correction. Fixed a bug (when colour correction and flat output
+	  was requested, the output file did not use the colour corrected
+	  files)
+	* [r571] ChangeLog, PTcommon.c, bootstrap: 2006-09-21 dmg
+	  <dmg@...>
+	  
+	  * bootstrap (have_autoconf): Added support for autoconf 2.6
+	  
+	  * PTcommon.c (getROI): Replace calls to _nan() with nan()
+	  
+	  by Florian Merz
+
+2006-09-16  maxlyons
+
+	* [r570] tools/PTmender.c: Adding import of file.h to fix this:
+	  "ptmender.c:310: warning: implicit declaration of function
+	  `panoFileMakeTemp'"
+
+2006-09-06  maxlyons
+
+	* [r566] PTcommon.c: Fixing panoReplaceExt which was broken for
+	  filenames like c:\dir\another.dir\file, because of the period as
+	  part of the directory name
+	* [r565] PTcommon.c: Adding check for isNan in getROI. Sometimes the
+	  remapping function returns NaN. This is probably a bug in the
+	  remapping function, but in the meantime adding a check for isNan in
+	  getROI.
+	* [r564] filter.h: Adding define for bzero. Won't compile on windows
+	  without this.
+
+2006-09-02  dmg
+
+	* [r562] ChangeLog, file.c: PSDs include some metadata including ICC
+	  Profile
+
+2006-08-30  dmg
+
+	* [r561] tests/ChangeLog, tests/simpleStitch/reference/psd.psd,
+	  tests/simpleStitch/reference/psd_mask.psd,
+	  tests/simpleStitch/reference/psd_no_mask.psd,
+	  tests/simpleTiff16/reference/psd.psd,
+	  tests/simpleTiff16/reference/psd_mask.psd,
+	  tests/simpleTiff16/reference/psd_no_mask.psd: PSDs include some
+	  metadata including ICC Profile
+
+2006-08-13  dmg
+
+	* [r560] ChangeLog, ptstitch.c, ptstitch.h: I forgot to add ptstich.c
+	  and ptstitch.h. Unfortunately I noticed once I had refactored the
+	  code for panoStitchComputeMaskMap and unified 16 bit and 8 bit
+	  processing into one function. In the process I found a bug that was
+	  probably affecting spherical panoramas
+	* [r559] ChangeLog, Makefile.am, PTcommon.c, PTcommon.h,
+	  tools/ChangeLog, tools/PTtiff2psd.c: Created ptstitch.c and
+	  ptstich.h. They will contain any functions that deal with alpha
+	  channels and the stitching process
+	* [r558] tests/simpleTiff16/ChangeLog,
+	  tests/simpleTiff16/reference/tiff_lzw.tif: added tiff_lzw.tif
+	  reference file
+
+2006-08-12  dangelo
+
+	* [r557] filter.h, panorama.h, sys_mac.h: fixes for compilation on OSX
+	  10.4 when used together with Carbon applications.
+	  (patch by Ippei UKAI)
+
+2006-08-05  dmg
+
+	* [r556] ChangeLog, configure.ac, version.h: Updated version to
+	  2.8.5pre2
+	* [r555] ChangeLog, Makefile.am, jpeg.c, jpegicc.c, jpegicc.h,
+	  tests/simpleStitch/ChangeLog, tests/simpleStitch/reference/jpeg.jpg,
+	  tests/simpleTiff16/ChangeLog, tests/simpleTiff16/reference/jpeg.jpg:
+	  Added ICC profile support for JPEG files
+
+2006-07-30  dmg
+
+	* [r554] file.h, metadata.c, metadata.h: I forgot to commit these
+	  files
+	* [r553] ChangeLog, Makefile.am, PTcommon.c, PTcommon.h, bmp.c,
+	  file.c, hdrfile.c, jpeg.c, morpher.c, pict.c, png.c, ppm.c,
+	  pteditor.c, ptpicker.c, pttiff.h, tiff.c, tools/ChangeLog,
+	  tools/PTblender.c, tools/PTmender.c, tools/PTtiff2psd.c: Completed
+	  support for metadata in less-used formats, unified readImage and
+	  maketemppath, see ChangeLogs
+	* [r552] tests/simpleTiff16/tests: removed test version of output, it
+	  should be generated by the user
+	* [r551] ChangeLog, ppm.c, tests/simpleTiff16/tests/tiff_deflate.tif,
+	  tests/simpleTiff16/tests/tiff_m0000.tif,
+	  tests/simpleTiff16/tests/tiff_m_cropped0000.tif,
+	  tests/simpleTiff16/tests/tiff_mask0000.tif,
+	  tests/simpleTiff16/tests/tiff_none.tif: I forgot to enable PPM input
+	  files
+
+2006-07-29  dmg
+
+	* [r550] ChangeLog, Makefile.am, PTcommon.c, configure.ac, tiff.c,
+	  tools/ChangeLog, tools/Makefile.am, version.h: Bumped version to
+	  2.8.5pre1, started renaming the library to pano13 and removed a bug
+	  that created a segfault under linux
+	* [r549] tests/simpleTiff16/ChangeLog, tests/simpleTiff16/Makefile.am:
+	  updated makefile of simpleTiff16
+	* [r548] tests/ChangeLog, tests/panoAutomateTest.pl: Make sure that
+	  the software tag is not compared, as it will change with every new
+	  version of the binaries
+	* [r547] ChangeLog, bmp.c, filter.h, pict.c, ppm.c: Forgot to update a
+	  constant, hopefully it will work now
+	* [r546] ChangeLog, bmp.c, pict.c, ppm.c: Increased the number of
+	  temporary files from 1k to 1g
+	* [r545] ChangeLog, PTcommon.c, filter.c, jpeg.c, ppm.c, tiff.c:
+	  Updated PPM processing to match JPEG and TIFF, removed debugging
+	  comments, updated indentation
+
+2006-07-11  brunopostle
+
+	* [r533] configure.ac: added tests/simpleTiff16 to build system
+
+2006-07-11  dmg
+
+	* [r532] ChangeLog, ColourBrightness.c, PTcommon.c, filter.c,
+	  filter.h, jpeg.c, panorama.h, ppm.c, pttiff.h, tiff.c: Finished
+	  implementation of metadata preservation in TIFF files
+	* [r531] tests/simpleStitch/ChangeLog: Updated changelog for previous
+	  commit
+	* [r530] tests/ChangeLog, tests/Makefile.am,
+	  tests/simpleStitch/reference/tiff_deflate.tif,
+	  tests/simpleStitch/reference/tiff_m0000.tif,
+	  tests/simpleStitch/reference/tiff_m0001.tif,
+	  tests/simpleStitch/reference/tiff_m_cropped0000.tif,
+	  tests/simpleStitch/reference/tiff_m_cropped0001.tif,
+	  tests/simpleStitch/reference/tiff_mask0000.tif,
+	  tests/simpleStitch/reference/tiff_mask0001.tif,
+	  tests/simpleStitch/reference/tiff_none.tif, tests/simpleTiff16,
+	  tests/simpleTiff16/060520_3398.TIF, tests/simpleTiff16/ChangeLog,
+	  tests/simpleTiff16/Makefile.am, tests/simpleTiff16/reference,
+	  tests/simpleTiff16/reference/jpeg.jpg,
+	  tests/simpleTiff16/reference/psd.psd,
+	  tests/simpleTiff16/reference/psd_mask.psd,
+	  tests/simpleTiff16/reference/psd_no_mask.psd,
+	  tests/simpleTiff16/reference/tiff_deflate.tif,
+	  tests/simpleTiff16/reference/tiff_m0000.tif,
+	  tests/simpleTiff16/reference/tiff_m_cropped0000.tif,
+	  tests/simpleTiff16/reference/tiff_mask0000.tif,
+	  tests/simpleTiff16/reference/tiff_none.tif,
+	  tests/simpleTiff16/simple.txt, tests/simpleTiff16/temp.txt,
+	  tests/simpleTiff16/tests, tests/simpleTiff16/tests/jpeg.jpg,
+	  tests/simpleTiff16/tests/psd.psd,
+	  tests/simpleTiff16/tests/psd_mask.psd,
+	  tests/simpleTiff16/tests/psd_no_mask.psd,
+	  tests/simpleTiff16/tests/tiff_deflate.tif,
+	  tests/simpleTiff16/tests/tiff_m0000.tif,
+	  tests/simpleTiff16/tests/tiff_m_cropped0000.tif,
+	  tests/simpleTiff16/tests/tiff_mask0000.tif,
+	  tests/simpleTiff16/tests/tiff_none.tif: Added a simple test for 16
+	  bit TIFF images and updated other tests to match TIFF metadata
+	  preservation
+
+2006-07-10  dmg
+
+	* [r529] ChangeLog, PTcommon.c, jpeg.c, panorama.h, ppm.c, tiff.c:
+	  Reindented several files to match Apache coding standards --from now
+	  on our standards
+
+2006-07-08  dmg
+
+	* [r528] ChangeLog, ColourBrightness.c, PTcommon.c, PTcommon.h,
+	  pano12.def, tests/ChangeLog, tests/panoAutomateTest.pl,
+	  tests/simpleStitch/ChangeLog, tests/simpleStitch/Makefile.am,
+	  tests/simpleStitch/reference/tiff_m0000.tif,
+	  tests/simpleStitch/reference/tiff_m0001.tif,
+	  tests/simpleStitch/reference/tiff_mask0000.tif,
+	  tests/simpleStitch/reference/tiff_mask0001.tif, tools/ChangeLog,
+	  tools/PTblender.c, tools/PTmender.c, tools/PTtiff2psd.c,
+	  tools/PTuncrop.c: I revamped the TIFF infrastructure
+	  to make it more flexible. It is also more encapsulated.
+	  I restarted renaming functions with pano as a prefix.
+	  
+	  One of the side effects of this change is that we are starting
+	  to support ICC profile information in TIFFs and soon it will
+	  support other metadata.
+	  
+	  I updated all the PTtools to use the new functions names and
+	  I recreated some test cases.
+	  
+	  Functionally speaking the only difference in this change
+	  is that the process keeps the X and Y resolution in TIFF files
+	  (previously is was hardcoded to 150)
+
+2006-06-30  dmg
+
+	* [r526] ChangeLog: Testing svn commit
+
+2006-06-26  dmg
+
+	* [r525] ChangeLog, ColourBrightness.c, ColourBrightness.h,
+	  tools/ChangeLog, tools/PTblender.c: Implemented the creation of
+	  arbitrary maps in ColourBrightness
+	* [r524] ChangeLog, ColourBrightness.c, ColourBrightness.h,
+	  PTcommon.c, tools/ChangeLog, tools/PTblender.c: Add the ability to
+	  output the colour correction curve as Photoshop layer files.
+
+2006-06-16  dmg
+
+	* [r522] ChangeLog, PTcommon.c: 2006-06-16 dmg <dmgerman@...>
+	  
+	  * PTcommon.c (CreatePanorama): The process for creating PSD_mask
+	  and PSD_nomask was inverted.
+	* [r521] tests/ChangeLog, tests/panoAutomateTest.pl: 2006-06-16 dmg
+	  <dmgerman@...>
+	  
+	  * panoAutomateTest.pl: Added PSD_mask to the tests.
+	* [r520] tests/simpleStitch/ChangeLog: updated test
+	* [r519] tests/simpleStitch/reference/psd_mask.psd: update tests
+	* [r518] ChangeLog, PTcommon.c: 2006-06-15 dmg <dmgerman@...>
+	  
+	  * PTcommon.c: Major reindent, removed tabs
+	* [r517] ChangeLog, PTcommon.c, panorama.h, ppm.c, tiff.c: 2006-06-15
+	  dmg <dmgerman@...>
+	  
+	  * ppm.c (makeTempPath): Added zeroes to temp files, so they are
+	  nicely sorted when listed.
+	  
+	  * panorama.h: Added crop info to Image data structure.
+	  
+	  * tiff.c (writeTIFF): Added cropInformation parameter to function
+	  call.
+	  (setCropInformationInTiff, getCropInformationFromTiff): Moved
+	  functions to this file from PTcommon.c
+
+2006-06-14  brunopostle
+
+	* [r516] ChangeLog, Makefile.am, tests/simpleStitch/Makefile.am: Put
+	  tests in tarball, but only run them with 'make check'.
+
+2006-06-14  maxlyons
+
+	* [r515] ChangeLog: no message
+	* [r514] PTcommon.c: Modifying getROI function to better calculate ROI
+	  for images in projects with 360/180 FOV. Not sure if this completely
+	  eliminates problems, but is certainly a step in the right direction.
+	  Adding error checking to setCropInformationInTiff function.
+	  Removing check for cropped TIFF in uncropTIFF...it is possible for a
+	  cropped TIFF to have x and y offset equal to zero, so this check
+	  could have caused problems.
+	* [r513] filter.h, libpano12.def, pano12.def, sys_common.c: Adding new
+	  dieWithError function to print error message and exit program with
+	  non-zero exit code
+
+2006-06-13  jim0watters
+
+	* [r512] ChangeLog: *** empty log message ***
+
+2006-06-13  dmg
+
+	* [r511] ChangeLog: Fixed minor typo in ChangeLog
+	* [r510] ChangeLog, ColourBrightness.c, PTcommon.c, PTcommon.h:
+	  Cleaned up most compiler warnings, reinserted tiff error handler for
+	  everything but windows
+	* [r509] ChangeLog, Makefile.am, tests/ChangeLog, tests/README.TXT,
+	  tests/simpleStitch/ChangeLog, tests/simpleStitch/Makefile.am,
+	  tests/simpleStitch/README.txt: 2006-06-12 dmg <dmgerman@...>
+	  
+	  * Makefile.am (all): Undo the changes below... I decided instead
+	  to remove the test directory from the make in the root
+	  directory. Too bad CVS does not support transactions and rollbacks.
+	  
+	  * README.txt: run "make test" to, you got it, run the test
+	  * Makefile.am (all): Removed test from default Make.
+	* [r508] ChangeLog, PTcommon.c, tools, tools/.cvsignore,
+	  tools/ChangeLog: 2006-06-12 dmg <dmgerman@...>
+	  
+	  * PTcommon.c (ReplaceAlphaChannel): The images created in this
+	  routine were not labeled as cropped. This patch fixes the
+	  problem. The test case did not catch this problem. We need a
+	  360/180 one.
+	* [r507] tests/simpleStitch/ChangeLog, tests/simpleStitch/Makefile.am,
+	  tests/simpleStitch/README.txt: Do not run tests in every make, only
+	  with indicated: make test
+
+2006-06-13  jim0watters
+
+	* [r506] ColourBrightness.c, PTcommon.c, libpano.vcproj, pt_stdint.h:
+	  updated VC project file and fixed compile problems of missing header
+	  files.
+
+2006-06-12  brunopostle
+
+	* [r505] configure.ac, version.h: Increment version to 2.8.4
+
+2006-06-12  dmg
+
+	* [r503] ChangeLog, PTcommon.c, tools/ChangeLog, tools/PTmender.c:
+	  improved behaviour during errors
+	* [r502] ChangeLog, PTcommon.c: removed a temp file that was left
+	  during the uncropping
+	* [r501] ChangeLog, PTcommon.c: Create .psd not .PSD extensions for
+	  photoshop files
+	* [r500] tests/panoAutomateTest.pl: Made sure that tests work under
+	  linux
+	* [r499] tests/ChangeLog, tests/panoAutomateTest.pl,
+	  tests/simpleStitch/ChangeLog, tests/simpleStitch/reference/jpeg.jpg,
+	  tests/simpleStitch/reference/psd.psd,
+	  tests/simpleStitch/reference/psd_no_mask.psd,
+	  tests/simpleStitch/reference/tiff_deflate.tif,
+	  tests/simpleStitch/reference/tiff_m0000.tif,
+	  tests/simpleStitch/reference/tiff_m0001.tif,
+	  tests/simpleStitch/reference/tiff_m_cropped0000.tif,
+	  tests/simpleStitch/reference/tiff_m_cropped0001.tif,
+	  tests/simpleStitch/reference/tiff_mask0000.tif,
+	  tests/simpleStitch/reference/tiff_mask0001.tif,
+	  tests/simpleStitch/reference/tiff_none.tif,
+	  tests/simpleStitch/simple.txt: Updated tests, use tiffcmp instead of
+	  diff
+
+2006-06-11  maxlyons
+
+	* [r498] ChangeLog: no message
+	* [r497] ColourBrightness.c, PTcommon.c, filter.h, libpano12.def,
+	  pano12.def, pttiff.h, tiff.c: Changes to support "cropped tiff"
+	  processing when using colour/brightness correction in PTMender.
+	  Changes also allow pttiff2psd to work with cropped tiff output as
+	  well.
+
+2006-06-11  brunopostle
+
+	* [r496] Makefile.am: put pttiff.h in the tarball
+
+2006-06-06  dangelo
+
+	* [r495] ChangeLog, PTcommon.c, ptpicker.c: moved InsertFileName to
+	  PTcommon.c
+
+2006-06-05  dwilkins42
+
+	* [r494] Makefile.am, configure.ac, doc/Makefile.am, m4/Makefile.am,
+	  tests, tests/.cvsignore, tests/Makefile.am, tests/simpleStitch,
+	  tests/simpleStitch/.cvsignore, tests/simpleStitch/Makefile,
+	  tests/simpleStitch/Makefile.am, tools/Makefile.am: Put the tests
+	  subdirectory under autotools control. Ensure all files all in the
+	  dist tarball
+
+2006-06-04  maxlyons
+
+	* [r493] ChangeLog: no message
+	* [r492] PTcommon.c: Fixing bug with morph-to-fit. Memory allocated
+	  with malloc was being incorrectly freed with myfree leading to
+	  random crashes.
+	* [r491] tools/PTmender.c: Changed behavior for input file name
+	  parsing. If the script is specified on the command line with a path
+	  (e.g. c:\some\path]myscript.txt), this path was prepended to all of
+	  the image names in the script, regardless of whether those image
+	  names were also specified with a full qualified path. This change
+	  adds a check so that the script path is only prepended to the image
+	  names, if the image names don't already contain path information.
+
+2006-06-01  maxlyons
+
+	* [r488] ChangeLog: no message
+	* [r487] PTcommon.c: PTCommon.c: Fixed bug in getROI
+
+2006-05-30  brunopostle
+
+	* [r485] README.linux: Replace old build instructions with correct
+	  instructions
+
+2006-05-30  maxlyons
+
+	* [r484] ChangeLog: no message
+	* [r483] PTcommon.c, pttiff.h, tools/PTuncrop.c: * Moving uncrop logic
+	  from ptuncrop.c to ptcommon.c. Creating uncropTiff function
+	  * Adding uncropTiff function declaration to pttiff.h
+	  * Making cropped TIFF the intermediate format for all processing,
+	  regardless of output format. Uncropped TIFFs can be generated, if
+	  needed, from intermediate cropped TIFFs by calling new uncropTiff
+	  function.
+	* [r482] adjust.c: CheckParams: allowing optimizer to work with new
+	  projections
+
+2006-05-29  maxlyons
+
+	* [r478] pttiff.h: changes fix various compilation problems:
+	  
+	  * Moved declaration of three functions from ptcommon.h to new
+	  ptttiff.h file. * Updated includes in PTcommon.c and PTuncrop.c
+	  * Updated pano12.def and libpano12.def to include the same, latest,
+	  exports
+	* [r477] PTcommon.c, PTcommon.h, libpano12.def, pano12.def,
+	  tools/PTuncrop.c: changes fix various compilation problems:
+	  
+	  * Moved declaration of three functions from ptcommon.h to new
+	  ptttiff.h file. * Updated includes in PTcommon.c and PTuncrop.c
+	  * Updated pano12.def and libpano12.def to include the same, latest,
+	  exports
+
+2006-05-28  brunopostle
+
+	* [r475] Makefile.am: install pt_stdint.h with `make install`
+
+2006-05-28  dmg
+
+	* [r474] tests/simpleStitch/reference/tiff_lzw.tif: committed lzw
+	* [r473] tests/simpleStitch/simple.txt: script should be fast
+	  transform
+	* [r472] tests/simpleStitch/reference/jpeg.jpg,
+	  tests/simpleStitch/reference/psd.psd,
+	  tests/simpleStitch/reference/psd_no_mask.psd,
+	  tests/simpleStitch/reference/tiff_deflate.tif,
+	  tests/simpleStitch/reference/tiff_m0000.tif,
+	  tests/simpleStitch/reference/tiff_m0001.tif,
+	  tests/simpleStitch/reference/tiff_m_cropped0000.tif,
+	  tests/simpleStitch/reference/tiff_m_cropped0001.tif,
+	  tests/simpleStitch/reference/tiff_mask0000.tif,
+	  tests/simpleStitch/reference/tiff_mask0001.tif,
+	  tests/simpleStitch/reference/tiff_none.tif,
+	  tests/simpleStitch/simple.txt: Ok, the previous ones were way too
+	  large, these are significantly smaller
+	* [r471] tests/simpleStitch/reference/tiff_lzw.tif: added tiff_lzw
+	* [r470] tests, tests/ChangeLog, tests/panoAutomateTest.pl,
+	  tests/simpleStitch, tests/simpleStitch/051221_6054_750.jpg,
+	  tests/simpleStitch/051221_6055_750.jpg,
+	  tests/simpleStitch/ChangeLog, tests/simpleStitch/Makefile,
+	  tests/simpleStitch/README.txt, tests/simpleStitch/reference,
+	  tests/simpleStitch/reference/jpeg.jpg,
+	  tests/simpleStitch/reference/psd.psd,
+	  tests/simpleStitch/reference/psd_no_mask.psd,
+	  tests/simpleStitch/reference/tiff_deflate.tif,
+	  tests/simpleStitch/reference/tiff_m0000.tif,
+	  tests/simpleStitch/reference/tiff_m0001.tif,
+	  tests/simpleStitch/reference/tiff_m_cropped0000.tif,
+	  tests/simpleStitch/reference/tiff_m_cropped0001.tif,
+	  tests/simpleStitch/reference/tiff_mask0000.tif,
+	  tests/simpleStitch/reference/tiff_mask0001.tif,
+	  tests/simpleStitch/reference/tiff_none.tif,
+	  tests/simpleStitch/simple.pto, tests/simpleStitch/simple.txt:
+	  created first battery of tests for a simple, 2 images, panorama
+	* [r469] tools/PTuncrop.c: I forgot to add PTuncrop.c
+	* [r468] ChangeLog, PTcommon.c: * PTcommon.c (CreatePanorama): Removed
+	  some ugly formatting I
+	  introduced in a recent commit
+	  (CreatePanorama): Fixed bug of the missing column/row introduced
+	  in cropped files.
+	* [r467] ChangeLog, PTcommon.c: * PTcommon.c (CreatePanorama): Removed
+	  some ugly formatting I
+	  introduced in a recent commit
+	* [r466] ChangeLog, PTcommon.h, tools/ChangeLog, tools/Makefile.am:
+	  Added PTuncrop, a program to conver cropped tiffs to regular tiffs
+
+2006-05-27  dmg
+
+	* [r464] ChangeLog, PTcommon.c, tiff.c: 2006-05-27 dmg
+	  <dmgerman@...>
+	  
+	  * PTcommon.c (TiffGetImageParameters): Fixed incorrect error
+	  message.
+	  Removed tabs from entire file (some of them completely messed the
+	  format), reindented entire file
+	  
+	  * tiff.c: Changed TIFFTAG_ROWSPERSTRIP to 1.
+
+2006-05-24  maxlyons
+
+	* [r458] ChangeLog: Cropped TIFF modifications (mostly)
+	* [r457] tiff.c: readTIFF. Storing filename of TIFF in im->name.
+	* [r456] filter.h: getCropInformation. Adding declaration.
+	* [r455] PTcommon.c: All logic has been reworked so that "cropped"
+	  TIFF files can be used throughout the stitching process for all
+	  currently supported output formats. (Cropped TIFF files are those
+	  that are just large enough to contain the remapped image, and the
+	  offset/full size information is stored in the TIFF header). Modified
+	  functions include ReplaceAlphaChannel, CreateAlphaChannels,
+	  AddStitchingMasks, FlattenTIFF, createPanorama. New functions
+	  include getCropInformationFromTiff, setFullSizeImageParameters.
+	  
+	  Simplified ComputeStitchingMask8bits syntax
+	  
+	  CreatePanorama. Reworked logic to handle intermediate output files
+	  and produce final output in various formats. Added logic that
+	  decides when to use cropped TIFF as intermediate format based on
+	  chosen output format. TODO: this could use some tidy up, and it
+	  might be a good idea to have cropped TIFF as the default
+	  intermediate format for TIFF_m and TIFF_mask, and include a function
+	  to "expand" the cropped TIFFs to full size when finished (if the
+	  user requests non-cropped TIFF).
+	  
+	  Reluctantly commented out calls to TIFFSetWarningHandler and
+	  TIFFSetErrorHandler...these cause to GCC to abort, with a series of
+	  errors about multiple definition of TIFF functions in libpano and
+	  libtiff.
+	  
+	  Changed title bar of progress dialog to indicate currently
+	  processing image number (indexed at 1) and total images to be
+	  processed.
+	* [r454] file.c: writePSD, writeLayerAndMask, writeChannelData,
+	  getImageRectangle, addLayer. Reworked to handle "cropped" files.
+	* [r453] ColourBrightness.c, tools/PTmender.c: changed #include syntax
+
+2006-05-23  dmg
+
+	* [r452] ChangeLog, PTcommon.c: 2006-05-24 dmg <dmgerman@...>
+	  
+	  * PTcommon.c (TiffSetImageParameters, TiffGetImageParameters):
+	  Make sure ROWSPERSTRIP is propagated.
+
+2006-05-23  maxlyons
+
+	* [r451] pt_stdint.h: Fixing bad CR/LF combinations
+	* [r450] panorama.h: Adding CropInfo struct...used for processed
+	  cropped images
+	* [r449] adjust.c: Removing old comments
+
+2006-05-23  dmg
+
+	* [r448] ChangeLog, PTcommon.c, PTcommon.h: 2006-05-23 dmg
+	  <dmgerman@...>
+	  
+	  * PTcommon.c (TiffGetImageParameters, TiffSetImageParameters):
+	  Make sure compression is propagated at further stages
+	  (CreatePanorama): Implemented support for C:NONE
+	  (CreatePanorama): Implemented support for C:DEFLATE
+
+2006-05-22  dmg
+
+	* [r447] ChangeLog, PTcommon.c: (CreatePSD): Make sure PSD is 8 bit if
+	  it contains more than 1
+	  layer (we do not support multi-layer 16bit images). Cleaned up the
+	  function and added some comments.
+	  (ComputeStitchingMask8bits): Cleanedup the function (still more
+	  work to do)
+	* [r446] ChangeLog, PTcommon.c, tools/PTblender.c: -05-22 dmg
+	  <dmgerman@...>
+	  
+	  * PTcommon.c: Checked return value of each TIFFWriteScanline. It
+	  now returns an error when it cannot write to the output (instead of
+	  just continue blindly). Added Error and Warning handler for TIFF
+	  library so the errors are now reported using the PTtools error
+	  handler.
+	  
+	  2006-05-20 dmg <dmgerman@...>
+	  
+	  * PTcommon.c (CreatePanorama): Fixed a bug in TIFF_mask (the
+	  program was not ending after where it should have)
+
+2006-05-21  dangelo
+
+	* [r445] pt_stdint.h: stdint is not provided by M$ Visual C.
+	* [r444] Makefile.am, PTcommon.h, filter.h, libpano.vcproj, sys_X11.c,
+	  sys_ansi.c, sys_common.c, sys_mac.c, sys_win.c: bugfix: vararg
+	  processing of PrintError() was broken
+	* [r443] adjust.c: fixed "SetMakeParams: Unsupported input image
+	  projection" error when using
+	  circular fisheye input images.
+
+2006-05-16  dmg
+
+	* [r434] ChangeLog, PTcommon.c: 2006-05-15 dmg <dmgerman@...>
+	  
+	  * PTcommon.c (CreatePanorama): Fixed a typo related to QTVR
+	  images. I also renamed Unknown07 to Create_QTVR
+	* [r433] ChangeLog, resample.c: 2006-05-15 dmg <dmgerman@...>
+	  
+	  * resample.c: Fixed compilation warnings by moving #define
+	  unsigned inside the body of the functions.
+
+2006-05-16  maxlyons
+
+	* [r432] ChangeLog: no message
+	* [r431] resample.c: Fixing bug in fast transform logic that caused
+	  crash when destRect.left != 0 (i.e. producing cropped TIFF output)
+
+2006-05-15  brunopostle
+
+	* [r430] configure.ac, version.h: make version 2.8.3 same everywhere
+
+2006-05-15  maxlyons
+
+	* [r429] ChangeLog: no message
+	* [r428] tools/ColourBrightness.c, tools/ColourBrightness.h,
+	  tools/PTcommon.c, tools/PTcommon.h: Removing old versions of
+	  ptcommon and colourbrightness from the tools...these have already
+	  been moved into libpano main directory
+	* [r427] tools/PTblender.c: Fixed comparison between pointer and
+	  integer error (line 102)
+	* [r426] pano12.def: Removed duplicate entry for "StringtoFullPath"
+	  (exported twice).
+	* [r425] makefile.win32: Updated Makefile.win32 to include missing
+	  references to sys_common.c, PTCommon.c, hdrfile.c, rgbe.c,
+	  ColourBrightness.c...should now build correctly using MingW
+	* [r424] PTcommon.c: Changed #include <filter.h> to #include
+	  "filter.h" (this prevented compilation with MingW)
+	  Changed call to execute_stack to execute_stack_new (necessary as a
+	  result of modification to Transformation function type)
+	  Removed InsertFileName definition. This is already defined in
+	  PTPicker, and prevented compilation with MingW.
+	* [r423] ColourBrightness.c: Changed #include <filter.h> to #include
+	  "filter.h" (this prevented compilation with MingW)
+
+2006-05-07  dmg
+
+	* [r422] ChangeLog, PTcommon.c, tools/ChangeLog, version.h: 2006-05-07
+	  dmg <dmgerman@...>
+	  
+	  * version.h: Updated version to 2.8.3
+	  
+	  * PTcommon.c (SetBestAlphaChannel16bits): Implemented function.
+	  
+	  2006-05-06 dmg <dmgerman@...>
+	  
+	  * PTcommon.c: (BlendLayers): Added support for 16 bit images.
+	  
+	  * PTcommon.c (BlendLayers16Bit): Added function.
+
+2006-05-06  dmg
+
+	* [r419] ChangeLog, PTcommon.c, PTcommon.h, pano12.def: * PTcommon.h
+	  (CreatePanorama): Added StringtoFullPath
+	  
+	  * pano12.def: Exported StringtoFullPath
+	  
+	  * PTcommon.h: removed <tiffio.h> from its includes.
+	* [r416] ChangeLog, Makefile.am: 2006-05-06 dmg <dmgerman@...>
+	  
+	  * Makefile.am (STD_HDR): Install PTcommon.h
+	* [r415] ChangeLog, ColourBrightness.c, ColourBrightness.h,
+	  Makefile.am, PTcommon.c, PTcommon.h, pano12.def, panorama.h,
+	  tools/ChangeLog, tools/Makefile.am, tools/PTOptimizer.c,
+	  tools/PTblender.c, tools/PTmender.c, tools/PTtiff2psd.c, version.h:
+	  2006-05-06 dmg <dmgerman@...>
+	  
+	  * version.h: Updated version to 2.8.2 and improved ifdefs for
+	  easier maintenance
+	  
+	  * pano12.def: Added ColourBrightness, PTcommon definitions.
+	  
+	  * Moved ColourBrightness.{c,h}, PTcommon.{c,h} to this directory.
+	  
+	  
+	  2006-05-06 dmg <dmgerman@...>
+	  
+	  * PTStitcher.cpp: sent to the attic.
+	  
+	  * PTblender.c, PTtiff2psd, PTmender: Changed name of quietFlag to
+	  ptQuietFlag. I replaced their own version number with libpano.
+	  
+	  * PTcommon.c, PTcommon.h, PTmender.c, Makefile.am: Moved
+	  CreatePanorama to PTcommon.c and all the functions required by it.
+	  
+	  * PTcommon.c (CreatePanorama): Added an error when the type of
+	  panorama is not valid.
+	* [r414] tools/ChangeLog, tools/Makefile.am, tools/PTmender.c: *
+	  PTcommon.c, PTcommon.h, PTmender.c, Makefile.am: Moved
+	  CreatePanorama to PTcommon.c and all the functions required by it.
+	  
+	  * PTcommon.c (CreatePanorama): Added an error when the type of
+	  panorama is not valid.
+	* [r413] ChangeLog: Added missing entries to Changelog
+
+2006-05-05  dangelo
+
+	* [r412] morpher.c: fixed return code
+	* [r411] math.c: MSVC does not provide atanh.
+	* [r410] libpano.vcproj: updated MSVC project file. Use
+	  $WXWIDGETS_HOME and $JDK_HOME environment
+	  variables instead of hardcoded paths
+
+2006-04-28  dangelo
+
+	* [r408] libpano12.def, pano12.def, pano12vc.def, pano12vcd.def:
+	  export exectute_stack_new in windows .dll
+
+2006-04-27  brunopostle
+
+	* [r407] ChangeLog, configure.ac, version.h: update version to 2.8.1
+
+2006-04-27  dmg
+
+	* [r406] ChangeLog: 2006-04-26 dmg (dmg)
+	  
+	  * ChangeLog: updated changelog to match last 2 changes (including
+	  the change to the ChangeLog :)
+
+2006-04-26  dangelo
+
+	* [r405] adjust.c, correct.c, filter.h, math.c, resample.c: fixed an
+	  error in the transverse mercator transform.
+	  do not fill undefined area in the sinusoidal projection with
+	  garbage.
+	  provide binary compatible version of execute_stack.
+
+2006-04-25  dangelo
+
+	* [r404] doc/stitch.txt: added new projection types to documentation
+
+2006-04-25  brunopostle
+
+	* [r403] ChangeLog: Updated ChangeLog to the autogenerated one (had
+	  been clobbered)
+
+2006-04-21  dangelo
+
+	* [r402] rgbe.c: previous commit errornously replaced #include
+	  <stdlib.h> with malloc.h.
+	  revert to #include <stdlib.h>
+
+2006-04-20  dangelo
+
+	* [r401] AUTHORS, ChangeLog, adjust.c, filter.h, math.c, morpher.c,
+	  pano12.def, pano12vc.def, pano12vcd.def, panorama.h, parser.c,
+	  queryfeature.c, rgbe.c: added stereographic, mercator, transverse
+	  mercator and sinusoidal projection.
+	  Transverse mercator does not work properly yet. Modified all
+	  coordinate transform
+	  functions to return if the transformation was possible. (Not used
+	  during stitching
+	  yet)
+
+2006-04-19  brunopostle
+
+	* [r400] sys_common.c: Fix for previous patch for customizing
+	  libpano12 error and progress output (Pablo D'Angelo)
+
+2006-04-14  dmg
+
+	* [r399] ChangeLog: update changelog for previous commit
+
+2006-04-14  brunopostle
+
+	* [r398] AUTHORS, Makefile.am, filter.h, libpano12.def, pano12.def,
+	  pano12vc.def, pano12vcd.def, queryfeature.c, queryfeature.h,
+	  sys_X11.c, sys_ansi.c, sys_common.c, sys_mac.c, sys_win.c: Allow
+	  applications to supply their own callback functions for error and
+	  progress reporting. (Pablo d'Angelo)
+
+2006-04-11  dmg
+
+	* [r397] ChangeLog, tools/PTblender.c, tools/PTmender.c: released
+	  version 0.4.0 of PTmender and PTblender
+	* [r396] ChangeLog, tools/PTblender.c, tools/PTcommon.c,
+	  tools/PTcommon.h, tools/PTmender.c, tools/PTmender.h,
+	  tools/README.PTmender: 2006-04-10 dmg <dmgerman@...>
+	  
+	  * toos/README.PTmender: updated it.
+	  
+	  * tools/PTmender.h: removed some prototypes from the file that
+	  belong now to PTcommon.h
+	  
+	  * tools/PTmender.c: added support for flattening tiffs (including,
+	  by extension, JPG and PNG support).
+	  
+	  * tools/PTcommon.h: moved pt_tiff_parms into it, moved some
+	  prototypes from tools/PTmender.h
+	  
+	  * tools/PTcommon.c: Added blending of TIFFs into a single
+	  one. JPG creation.
+	  
+	  * tools/PTblender.c: added JPG creation.
+
+2006-04-09  dmg
+
+	* [r395] ChangeLog, rgbe.c: 2006-04-09 dmg <dmgerman@...>
+	  
+	  * rgbe.c: Replaced #include <malloc.h> with <stdlib.h> to avoid
+	  MacOS compilation error
+
+2006-03-10  brunopostle
+
+	* [r394] resample.c: Fix for gcc compilation error (Thomas Rauscher)
+
+2006-03-09  brunopostle
+
+	* [r393] tools, tools/.cvsignore: ignore non-source files
+
+2006-03-01  maxlyons
+
+	* [r392] tools/PTmender.c: Added ability to produce "cropped" output
+	  files in tiff_m and tiff_mask format. Unfortunately, it doesn't
+	  currently work when the fast transform (f0 option in m line) so make
+	  sure not to include this option in stitcher script.
+	  Added ability to produce LZW compressed output. Use following
+	  syntax:
+	  p w1237 h952 f1 u0 v115 n"TIFF_m r:CROP c:LZW"
+	  Modified the number of rows per strip of TIFF data to be 1.
+	  Code cleanup (removing goto statements, etc.), give variables more
+	  descriptive names, and added a lot of comments/documentation.
+	* [r391] tools/PTcommon.h, tools/PTmender.h: Moving declaration of
+	  InsertFileName.
+	  Adding TIFFTAGs for full image width/length (in case not present in
+	  tiff.h)
+
+2006-02-27  brunopostle
+
+	* [r390] tools, tools/.cvsignore: add .deps to .cvsignore
+	* [r389] tools, tools/.cvsignore: cvs should ignore Makefile.in not
+	  Makefile.am
+	* [r388] Makefile.am, bmp.c, filter.h, hdrfile.c, queryfeature.c,
+	  resample.c, rgbe.c, rgbe.h: Support for radiance 32bit float .hdr
+	  files (Thomas Rauscher)
+	* [r387] ChangeLog: updated ChangeLog from CVS commit messages
+
+2006-02-21  dmg
+
+	* [r385] tools/ChangeLog, tools/PTcommon.c: 06-02-21 dmg
+	  <dmgerman@...>
+	  
+	  * PTcommon.c: Replaced InsertFileName with the one from
+	  ptpicker.c (patch submitted by Max Lyons)
+
+2006-02-20  dmg
+
+	* [r384] tools/ChangeLog: Fixed spelling mistake in ChangeLog
+	* [r383] tools/ChangeLog, tools/PTcommon.c, tools/PTmender.c,
+	  tools/PTtiff2psd.c: 2006-02-20 dmg <dmgerman@...>
+	  
+	  * PTcommon.c (AddStitchingMasks): Removed exit that I was using
+	  during debugging.
+	  
+	  * PTtiff2psd.c (PT_TIFF2PSD_USAGE): Added name of default output
+	  file.
+	  
+	  * PTmender.c (ComputeStitchingMask8bits,
+	  ComputeStitchingMask16bits,
+	  ComputeStitchingMask,SetBestAlphaChannel16bits,
+	  SetBestAlphaChannel8bits, CalculateAlphaChannel,
+	  ApplyFeather8bits, ApplyFeather16bits, ApplyFeather): Removed
+	  functions, they are already in PTcommon.c
+	  
+	  * PTmender.c: Removed test code for TEST_ENABLE_COLOUR_CORRECTION
+	  
+	  Changes submitted by Max Lyonx:
+	  
+	  * PTcommon.c: Moved InsertFileName to this file from
+	  PTmender.c. It should be compiled only under Windows.
+	  
+	  * PTmender.c (main): Changed 0x6f for 'o'.
+	* [r382] tools/PTcommon.c, tools/PTcommon.h: I forgot to commit these
+	  files
+
+2006-02-17  dmg
+
+	* [r381] tools/ChangeLog, tools/ColourBrightness.c, tools/Makefile.am,
+	  tools/PTblender.c, tools/PTmender.c, tools/PTmender.h,
+	  tools/PTtiff2psd.c: 2006-01-23 dmg <dmgerman@...>
+	  
+	  * PTblender.c (main): There was an extra colon in the spec of the
+	  command line options (reported by josh at joshdoe com)
+	  
+	  * PTcommon.c (SetBestAlphaChannel8bits): Fixed minor bug.
+	  
+	  2006-01-20 dmg <dmgerman@...>
+	  
+	  * Makefile.am (bin_PROGRAMS): Added PTtiff2psd.
+	  
+	  * PTblender.c (main): Freed pointers. Added call to
+	  VerifyTiffsAreCompatible. Added include to PTcommon.h
+	  
+	  * PTmender.h: Moved quietFlag from this one to PTcommon.h
+	  
+	  * PTmender.c: Added include to PTcommon.h, extracted CreatePSD,
+	  and CreateStitchingMasks.
+	  
+	  * PTtiff2psd.c: Created program.
+	  
+	  * PTcommon.h (VerifyTiffsAreCompatible): Created file, added
+	  prototypes.
+	  
+	  * PTcommon.c (VerifyTiffsAreCompatible): Created file, and added
+	  function. Moved CreatePSD and CreateStitchingMasks from PTmender.c.
+
+2006-01-20  dmg
+
+	* [r380] tools/ChangeLog, tools/PTblender.c: 06-01-19 dmg
+	  <dmgerman@...>
+	  
+	  * PTblender.c (main): If no files were specified in the command
+	  line, then print usage.
+	* [r379] tools/ChangeLog, tools/ColourBrightness.c,
+	  tools/ColourBrightness.h, tools/Makefile.am, tools/PTblender.c,
+	  tools/PTmender.c: 2006-01-19 dmg <dmgerman@...>
+	  
+	  * PTmender.c (main): Used PATH_SEP instead of / to get it to
+	  work under Windogs.
+	  (CreateStitchingMasks): Removed unnecessary assert.
+	  
+	  * PTblender.c: Added program.
+	  
+	  * PTmender.c (CreatePanorama): Changed call to
+	  ColourBrightness to match new prototype. See below. Moved
+	  ReplaceExt from to ColourBrightness.
+	  
+	  * ColourBrightness.h: Changed prototypes (see below).
+	  
+	  * ColourBrightness.c (CorrectFileColourBrightness): Add an extra
+	  parameter to handle different input and output file names.
+	  (ColourBrightness): Added an extra parameter to handle different
+	  input and output filename. If the input filename is different from
+	  output, then process file.
+	  (ReplaceExt): Moved it here from
+	  PTmender.c
+
+2006-01-16  dmg
+
+	* [r378] tools/ChangeLog, tools/ColourBrightness.c: Removed useless
+	  comments
+	* [r377] tools/ChangeLog, tools/ColourBrightness.c: Fixed a bug in
+	  Unknown49
+	* [r376] tools/ChangeLog: Minor edit change
+	* [r375] tools/ChangeLog, tools/PTmender.c: 2006-01-15 dmg
+	  <dmgerman@...>
+	  
+	  * PTmender.c (CreatePanorama): Found a bug. strcmp did not
+	  include ==0.
+	  (ComputeStitchingMask8bits): Implemented function.
+	  (CalculateAlphaChannel): Implemented function.
+	  (SetBestAlphaChannel8bits): Implemented function.
+	  (CreateStitchingMasks): Found an error: Progress returns zero
+	  when not error, not !=0. Also, I forgot return -1
+	  (ApplyFeather): Implemented function.
+	  (SetBestAlphaChannel8bits): Fixed a bug in the function. Wrong
+	  condition in loop.
+	  (PT_MENDER_VERSION): Bumped version to 0.3. Released.
+	  
+	  2006-01-14 dmg <dmgerman@...>
+	  
+	  * PTmender.c (CreatePSD): Implemented function.
+	  (TiffSetImageParameters): Added function.
+	  (CreateStitchingMasks): Implemented function.
+	  (ComputeStitchingMask): Implemented function.
+
+2006-01-15  dwilkins42
+
+	* [r374] Makefile.am, configure.ac: Add endian check. OS check only is
+	  not sufficient
+
+2006-01-12  dmg
+
+	* [r373] tools/ChangeLog, tools/ColourBrightness.c, tools/PTmender.c:
+	  2006-01-12 dmg <dmgerman@...>
+	  
+	  * ColourBrightness.c: Remove fprintfs
+	  
+	  * PTmender.c: Enabled colour correction. Ready for
+	  testing. Upgraded version to 0.2: "the Enlightment"
+	  
+	  * ColourBrightness.c (Unknown40): Fixed another bug. This time it
+	  was the data type of a variable. It was double, not integer!
+	* [r372] tools/ChangeLog, tools/ColourBrightness.c,
+	  tools/ColourBrightness.h, tools/PTmender.c, tools/README.PTmender:
+	  006-01-12 dmg <dmgerman@...>
+	  
+	  * PTmender.c (CreatePanorama): Reduced the size of the cache to
+	  500kbytes
+	  
+	  * ColourBrightness.c: Improved readibility of many functions.
+	  (RemapHistogram): Another bug. Divided a/b
+	  instead of b/a.
+	  
+	  2006-01-11 dmg <dmgerman@...>
+	  
+	  * ColourBrightness.c: (ComputeColourBrightnessCorrection) Found
+	  another bug (limit of for loop was < 0xff not <= 0xff).
+	  (ComputeColourBrightnessCorrection): Cleaned up the function,
+	  renamed variables to make them meaninful. Killed another
+	  bug. Again, a/b instead of b/a
+	  (CorrectFileColourBrightness): Another bug. Missundertood return
+	  value from readTIFF: it is zero when success, -1 when it is not.
+	  (CorrectImageColourBrigthness): Another bug. im->data is a pointer
+	  to the pointer to the actual data, not a pointer to the data!
+	  Took advante of the editing and cleaned up the code and renamed
+	  some veriables.
+	  (DisplayHistogramsError): Refactored this function from
+	  ColourBrightness.
+	  
+	  * ColourBrightness.h, ColourBrightness.c: Renamed Unknown41 to
+	  ComputeAdjustmentCurve. Renamed Unknown37 to RemapHistogram. I
+	  have added assertions and debug code everywhere. Renamed Unknown33
+	  to MapFunction. Updated callers accordingly.
+	  
+	  2006-01-10 dmg <dmgerman@...>
+	  
+	  * ColourBrightness.c: (ComputeColourBrightnessCorrection): Another
+	  bug: incorrect number of daisies.
+
+2006-01-10  dmg
+
+	* [r371] tools/ChangeLog, tools/ColourBrightness.c, tools/Makefile.am,
+	  tools/PTmender.c, tools/README.PTmender: 1-10 dmg <dmgerman@...>
+	  
+	  * ColourBrightness.c: I changed all mallocs to callocs. I also
+	  added and removed some debug messages, and added optional use of
+	  the dmalloc library.
+	  (InitializeMagnolia): fixed a bug. I had allocated sizeof(pointer)
+	  rather than sizeof(thing pointed by pointer). What an amateur!
+	  (ColourBrightness): Another bug, I was freeing an incorrect number
+	  of histograms.
+	  (Unknown33): Fixed another bug. I referenced last element as
+	  array[n] instead of the correct way array[n-1].
+	  (Unknown37): Another bug 2 bugs. I had missed a set of parenthesis
+	  in an expression. The next line had a couple of errors too.
+	  (FreeHistograms): Another bug. One free was in the wrong place.
+	  
+	  * README.PTmender: Updated it.
+	  
+	  * PTmender.c (CreatePanorama): Disabled code for colour correction.
+	  
+	  * Makefile.am (AM_CPPFLAGS): Added flags for TIFF and JPEG to the
+	  compilation of the programs.
+
+2006-01-09  brunopostle
+
+	* [r370] configure.ac: update version to 2.8.0
+
+2006-01-09  dmg
+
+	* [r369] tools/ChangeLog, tools/ColourBrightness.c,
+	  tools/ColourBrightness.h, tools/PTmender.c, tools/README.PTmender:
+	  2006-01-09 dmg <dmgerman@...>
+	  
+	  * PTmender.c (CreatePanorama): Fixed a bug that affected cropped
+	  images. I think TIFF_m is ready for the masses. The tests I have
+	  performed are promising.
+	  (main): Added a Version message for its official release. Initial
+	  release: 0.1
+	  
+	  * ColorBrightness.c, ColorBrightness.h: First bug: I got burned by
+	  the fact that chars are by default signed. I changed any use of
+	  char to unsigned.
+	* [r368] tools/ChangeLog, tools/ColourBrightness.c,
+	  tools/ColourBrightness.h, tools/Makefile.am, tools/PTmender.c:
+	  2006-01-09 dmg <dmgerman@...>
+	  
+	  * Makefile.am (PTmender_SOURCES): Added colourBrightness.* to
+	  PTmender
+	  
+	  * PTmender.c: Renamed CreatePanorama, removed old function stub
+	  
+	  * ColorBrightness.c, ColorBrightness.h: added files. All the
+	  functions for colourBrightness have been created, but they do not
+	  work.
+	  
+	  2006-01-04 dmg <dmgerman@...>
+	  
+	  * PTmender.c (main): Fixed another bug, in the case that no files
+	  were specified in the command line.
+	  (ARGtoRGBAImage): Fixed another bug (a line I duplicated, but that
+	  I did not update).
+	  (CreatePanorama): Replaced assertion on colourCorreection. I had
+	  misinterpreted what the value was.
+
+2005-12-25  dmg
+
+	* [r367] tools/Makefile.am: I really removed -Wall -g this time
+	* [r366] tools, tools/.cvsignore, tools/ChangeLog, tools/Makefile.am,
+	  tools/PTmender.c: 2005-12-25 dmg <dmgerman@...>
+	  
+	  * PTmender.c (main,CreatePanorama): Fixed 5 more bugs. I am able
+	  to stitch the first one photo panorama!
+	* [r365] tools/ChangeLog, tools/Makefile.am, tools/PTmender.c,
+	  tools/PTmender.h: 005-12-24 dmg <dmgerman@...>
+	  
+	  * Makefile.am: Removed -Wall from make process
+	  
+	  * PTmender.c (main): Fixed 3 bugs.
+	  (CreatePanorama): Fixed 2 bugs
+
+2005-12-23  dmg
+
+	* [r364] tools/ChangeLog: fixed minor typo in ChangeLog
+	* [r363] tools/ChangeLog, tools/PTmender.c: 2005-12-23 dmg
+	  <dmgerman@...>
+	  
+	  * PTmender.c (CreatePanorama): It appears now to be complete. We
+	  have all the code for TIFF_m without brightness adjustement. Time
+	  to start planning the testing phase.
+
+2005-12-22  dmg
+
+	* [r362] tools/ChangeLog, tools/PTmender.c, tools/PTmender.h:
+	  2005-12-22 dmg <dmgerman@...>
+	  
+	  * PTmender.h: Renamed Unknown09 to
+	  Clear_Area_Outside_Selected_Region
+	  
+	  * PTmender.c (Clear_Area_Outside_Selected_Region): Created
+	  function. This completes all the functions needed for
+	  TIFF_m.
+
+2005-12-21  dmg
+
+	* [r361] tools/ChangeLog, tools/Makefile.am, tools/PTmender.c,
+	  tools/PTmender.h: 2005-12-21 dmg <dmgerman@...>
+	  
+	  * PTmender.h (InsertFileName): added prototype.
+	  
+	  * Makefile.am (PTmender_LDADD): We now require the tiff library too.
+	  (AM_CFLAGS): Added -Wall. I need to catch _any_ potential error.
+	  
+	  * PTmender.c, PTmender.h (ARGtoRGBAImage): Renamed Unknown08 to
+	  ARGtoRGBAImage and implemented it.
+	* [r360] tools/ChangeLog, tools/Makefile.am, tools/PTmender.c:
+	  2005-12-21 dmg <dmgerman@...>
+	  
+	  * I forgot that OS X is case insensitive (even though it is case
+	  preserving). I have renamed ptmender.h to PTmender.h. Updated
+	  Makefile.am and PTmender.c (thanks to Bruno Postle for noticing
+	  this).
+	  
+	  * PTmender.c (CreatePanorama): Fixed some bugs during code review
+	  of CreatePanorama
+	  (CreatePanorama): Changed name of Unknown28 to Colour_Brightness
+	* [r359] tools/PTmender.h, tools/ptmender.h: renamed ptmender.h to
+	  PTmender.h
+	* [r358] tools/ChangeLog, tools/README.PTmender: 2005-12-21 dmg
+	  <dmgerman@...>
+	  
+	  * README.PTmender: Added an explanation of its command line options.
+	* [r357] tools/ChangeLog, tools/PTmender.c, tools/ptmender.h:
+	  2005-12-21 dmg <dmgerman@...>
+	  
+	  * PTmender.c (main): Completed main.
+	  (sorting_function): Added it to sort files if -s
+
+2005-12-20  dmg
+
+	* [r356] tools, tools/.cvsignore, tools/ChangeLog, tools/Makefile.am,
+	  tools/PTmender.c, tools/README.PTmender, tools/ptmender.h:
+	  2005-12-20 dmg <dmgerman@...>
+	  
+	  * README.PTmender: Added this file.
+	  
+	  * PTmender.c, PTmender.h: I created these two files. Created the
+	  functions ReplaceExt, InsertFileName, and CreatePanorama. It has
+	  also all the skeletons to all the functions that need to be
+	  rewritten.
+	  
+	  * Modified Makefile.am to add PTStitcher. The program currently
+	  compiles, but does nothing.
+	  
+	  * Created the ChangeLog.
+
+2005-12-13  jim0watters
+
+	* [r354] makefile.win32: added missing ZComb.o
+
+2005-12-07  jim0watters
+
+	* [r353] tools/PTStitcher.cpp, tools/PTStitcher.vcproj: Add
+	  PTstitcher.exe helper tool
+	  This is to replace the original PTstitcher
+	* [r352] tools/PTpano12.dsp, tools/PTpano12.vcproj,
+	  tools/PTpano12_readme.txt, tools/ptpano12.cpp, tools/ptpano12.def,
+	  tools/ptpano12.h: Add too PTpano12
+	  This tool will intercepts calls, displays info, and then calls
+	  original pano12.dll with the same parameters. It then passes back
+	  the return values back to the original caller.
+
+2005-11-25  jim0watters
+
+	* [r351] version.h: update to ver 2.8
+
+2005-11-24  brunopostle
+
+	* [r349] ChangeLog: Updated chnagelog from CVS commit messages
+	* [r348] configure.ac: updated to 2.7.0.14 release
+
+2005-11-23  jim0watters
+
+	* [r347] version.h: update to ver .14
+	* [r346] sys_win.c: MSVS memory tracking tools
+	* [r345] sys_win.h: remove build warning
+	* [r344] adjust.c, parser.c: fix possible double delete or delete of
+	  null
+
+2005-11-16  brunopostle
+
+	* [r342] ChangeLog: updated from cvs commit messages
+	* [r341] configure.ac: updated to 2.7.0.13 release
+
+2005-11-16  jim0watters
+
+	* [r340] version.h: update to ver .13
+	* [r339] libpano.vcproj: do not use MSVCP71.DLL
+	* [r338] ZComb.c: Fix "Bounds error"
+
+2005-11-09  brunopostle
+
+	* [r337] configure.ac: updated configure.ac to version 2.7.0.12
+
+2005-11-09  jim0watters
+
+	* [r336] adjust.c, filter.h, resample.c, seamer_.c, version.h: Fix
+	  inverse transform
+	  Add number to aa_transform
+	  Increase ver to .12
+	* [r335] math.c: fix 64bit process slow down
+	* [r334] parser.c, tiff.c: fix possible memory leak / double free
+
+2005-11-03  brunopostle
+
+	* [r333] Makefile.am: Add Xcode project files to dist archive target
+
+2005-10-27  jim0watters
+
+	* [r332] doc/Optimize.txt, doc/stitch.txt: Added Antialiasing filter
+	  numbers
+	* [r331] libpano.vcproj: Updated Windows project
+
+2005-10-26  jim0watters
+
+	* [r330] resample.c: Added the dual-color modes to the transform_aa
+	  and cleaned
+	  the code, rename 4 variables...
+
+2005-10-24  jim0watters
+
+	* [r328] PanoTools.pbproj.tgz: A project file for Apple's "XCode" IDE,
+	  for developers who like to use Apple's tool.
+	* [r327] adjust.c, filter.h, resample.c: combine makePano with
+	  MyMakePano and transform with MyTransform to remove duplicate code
+	  and prepair to make MyTransform multiprocessor aware
+
+2005-10-23  jim0watters
+
+	* [r326] resample.c: alpha mask threshold bug fix
+	* [r325] resample.c: alpha mask threshold bug fix
+	* [r324] NEWS: alpha mask threshold bug fix
+
+2005-10-22  jim0watters
+
+	* [r323] NEWS: Do not process unchanged color channels for CA
+	  correction
+	* [r322] AUTHORS, correct.c, queryfeature.c, resample.c, version.h: Do
+	  not process unchanged color channels for CA correction
+
+2005-10-19  jim0watters
+
+	* [r321] AUTHORS, NEWS, version.h: update changes
+	* [r320] adjust.c, filter.h, panorama.h, parser.c, queryfeature.c,
+	  resample.c: ByThomas Rauscher, Added antialiasing filters
+	* [r319] file.c, filter.c, tiff.c: ByThomas Rauscher, Added support
+	  32bit float files
+
+2005-10-18  jim0watters
+
+	* [r318] bmp.c: allow to read both top to bottom or bottom to top BMP
+	  files
+	* [r317] panorama.h: remove incorrect filer_main()
+
+2005-05-22  dwilkins42
+
+	* [r315] version.h: Update all versions
+	* [r314] configure.ac, filter.c, queryfeature.c, version.h: Correct
+	  behaviour for mode=_usedata
+
+2005-05-18  brunopostle
+
+	* [r312] NEWS, configure.ac, version.h: Changed version to 2.7.0.10
+	  for release
+
+2005-05-12  jim0watters
+
+	* [r311] libpano.vcproj: update for VC .Net
+
+2005-05-07  dwilkins42
+
+	* [r310] lmdif.c, multilayer.c, panotypes.h, pteditor.c, ptpicker.c,
+	  resample.c, sys_ansi.c: Explicitly mark unused variables and remove
+	  GCC warning
+
+2005-05-05  dwilkins42
+
+	* [r308] queryfeature.c: Modify sense of Java test
+
+2005-05-04  dwilkins42
+
+	* [r307] ChangeLog: Update ChangeLog
+	* [r306] filter.c: Use 64 bit clean data types. Use 64 bit safe casts.
+	* [r305] file.c: Use decimal instead of hex constants
+	* [r304] pan.c: Use 64 bit safe casts.
+	* [r303] PTDialogs.c: Correct typo
+	* [r302] perspect.c: Use 64 bit clean data types.
+	* [r301] fourier.c, jpeg.c, morpher.c: Use 64 bit clean data types.
+	  Use 64 bit safe casts.
+	* [r300] file.c: Use 64 bit clean data types. Use 64 bit safe casts.
+	  Rename READLONG and WRITELONG to READINT32 and WRITEINT32 to
+	  accurately reflect their purpose.
+	* [r299] correct.c: Use 64 bit safe casts.
+	* [r298] sys_ansi.c, sys_win.c: Use 64 bit clean parameter
+	  declarations.
+	* [r297] tiff.c: Use 64 bit clean data types and types defined in
+	  tiff.h where appropriate
+	* [r296] resample.c: Use 64 bit clean data types.

@@ Diff output truncated at 100000 characters. @@

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

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

From: <kornelbenko@us...> - 2009-09-27 11:57

Revision: 1088
          http://panotools.svn.sourceforge.net/panotools/?rev=1088&view=rev
Author:   kornelbenko
Date:     2009-09-27 11:57:32 +0000 (Sun, 27 Sep 2009)

Log Message:
-----------
libpano/CMakeLists.txt: Added ${_common_libs} to the link stage of the shared pano13 lib.
                Needed on OSX Platform.
Corrected the copyright-dates

Modified Paths:
--------------
    trunk/libpano/CMakeLists.txt
    trunk/libpano/man/CMakeLists.txt
    trunk/libpano/tests/CMakeLists.txt
    trunk/libpano/tests/simpleStitch/CMakeLists.txt
    trunk/libpano/tests/simpleTiff16/CMakeLists.txt
    trunk/libpano/tools/CMakeLists.txt

Modified: trunk/libpano/CMakeLists.txt
===================================================================
--- trunk/libpano/CMakeLists.txt	2009-09-27 09:51:54 UTC (rev 1087)
+++ trunk/libpano/CMakeLists.txt	2009-09-27 11:57:32 UTC (rev 1088)
@@ -203,6 +203,7 @@
 # We have some header files at top source level now
 include_directories(${CMAKE_SOURCE_DIR})
 add_library(pano13 SHARED ${pano13_hdr} ${pano13_res} ${pano13_src})
+target_link_libraries(pano13 ${_common_libs})
 add_library(pano13a STATIC ${pano13_hdr} ${pano13_res} ${pano13_src})
 set_target_properties(pano13 PROPERTIES VERSION "2.0.0" SOVERSION "2")
 set_target_properties(pano13a PROPERTIES OUTPUT_NAME pano13)

Modified: trunk/libpano/man/CMakeLists.txt
===================================================================
--- trunk/libpano/man/CMakeLists.txt	2009-09-27 09:51:54 UTC (rev 1087)
+++ trunk/libpano/man/CMakeLists.txt	2009-09-27 11:57:32 UTC (rev 1088)
@@ -1,7 +1,7 @@
 # This file is part of libpano13, the hugin build environment.
 # Licence details can be found in the file gpl.txt.
 #
-# Copyright (c) 2008, 2009 Kornel Benko, <Kornel.Benko@...>
+# Copyright (c) 2009 Kornel Benko, <Kornel.Benko@...>
 #
 
 project(man)

Modified: trunk/libpano/tests/CMakeLists.txt
===================================================================
--- trunk/libpano/tests/CMakeLists.txt	2009-09-27 09:51:54 UTC (rev 1087)
+++ trunk/libpano/tests/CMakeLists.txt	2009-09-27 11:57:32 UTC (rev 1088)
@@ -1,7 +1,7 @@
 # This file is part of libpano13, the hugin build environment.
 # Licence details can be found in the file gpl.txt.
 #
-# Copyright (c) 2008, 2009 Kornel Benko, <Kornel.Benko@...>
+# Copyright (c) 2009 Kornel Benko, <Kornel.Benko@...>
 #
 
 project(test)

Modified: trunk/libpano/tests/simpleStitch/CMakeLists.txt
===================================================================
--- trunk/libpano/tests/simpleStitch/CMakeLists.txt	2009-09-27 09:51:54 UTC (rev 1087)
+++ trunk/libpano/tests/simpleStitch/CMakeLists.txt	2009-09-27 11:57:32 UTC (rev 1088)
@@ -1,7 +1,7 @@
 # This file is part of libpano13, the hugin build environment.
 # Licence details can be found in the file gpl.txt.
 #
-# Copyright (c) 2008, 2009 Kornel Benko, <Kornel.Benko@...>
+# Copyright (c) 2009 Kornel Benko, <Kornel.Benko@...>
 #
 
 project(test1)

Modified: trunk/libpano/tests/simpleTiff16/CMakeLists.txt
===================================================================
--- trunk/libpano/tests/simpleTiff16/CMakeLists.txt	2009-09-27 09:51:54 UTC (rev 1087)
+++ trunk/libpano/tests/simpleTiff16/CMakeLists.txt	2009-09-27 11:57:32 UTC (rev 1088)
@@ -1,7 +1,7 @@
 # This file is part of libpano13, the hugin build environment.
 # Licence details can be found in the file gpl.txt.
 #
-# Copyright (c) 2008, 2009 Kornel Benko, <Kornel.Benko@...>
+# Copyright (c) 2009 Kornel Benko, <Kornel.Benko@...>
 #
 
 project(test2)

Modified: trunk/libpano/tools/CMakeLists.txt
===================================================================
--- trunk/libpano/tools/CMakeLists.txt	2009-09-27 09:51:54 UTC (rev 1087)
+++ trunk/libpano/tools/CMakeLists.txt	2009-09-27 11:57:32 UTC (rev 1088)
@@ -1,7 +1,7 @@
 # This file is part of libpano13, the hugin build environment.
 # Licence details can be found in the file gpl.txt.
 #
-# Copyright (c) 2008, 2009 Kornel Benko, <Kornel.Benko@...>
+# Copyright (c) 2009 Kornel Benko, <Kornel.Benko@...>
 #
 
 project(tools)


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

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

From: <kornelbenko@us...> - 2009-09-28 18:13

Revision: 1094
          http://panotools.svn.sourceforge.net/panotools/?rev=1094&view=rev
Author:   kornelbenko
Date:     2009-09-28 18:13:14 +0000 (Mon, 28 Sep 2009)

Log Message:
-----------
Use the correct target to add dependencies
and also to create executables.

On windows, bind with tha static target/library,
on other platforms with the shared target.

Modified Paths:
--------------
    trunk/libpano/CMakeLists.txt
    trunk/libpano/tools/CMakeLists.txt

Modified: trunk/libpano/CMakeLists.txt
===================================================================
--- trunk/libpano/CMakeLists.txt	2009-09-28 10:37:42 UTC (rev 1093)
+++ trunk/libpano/CMakeLists.txt	2009-09-28 18:13:14 UTC (rev 1094)
@@ -205,6 +205,9 @@
   target_link_libraries(pano13 ${_common_libs})
   set_target_properties(pano13 PROPERTIES VERSION "2.0.0" SOVERSION "2")
   install(TARGETS pano13 LIBRARY DESTINATION lib)
+  set(_pano_target pano13)
+else()
+  set(_pano_target pano13a)
 endif()
 
 #create and install static library
@@ -217,9 +220,9 @@
 set(TOP_SRC_DIR ${CMAKE_SOURCE_DIR})
 
 add_subdirectory(man)
-add_dependencies(pano13 man)
+add_dependencies(${_pano_target} man)
 add_subdirectory(tools)
-add_dependencies(tools pano13)
+add_dependencies(tools ${_pano_target})
 
 macro(setstripped _varname _value)
   string(STRIP ${_value} _v)

Modified: trunk/libpano/tools/CMakeLists.txt
===================================================================
--- trunk/libpano/tools/CMakeLists.txt	2009-09-28 10:37:42 UTC (rev 1093)
+++ trunk/libpano/tools/CMakeLists.txt	2009-09-28 18:13:14 UTC (rev 1094)
@@ -23,7 +23,7 @@
 
 foreach(_cmd ${commands})
   add_executable(${_cmd} ${_cmd}.c)
-  target_link_libraries(${_cmd} pano13 ${_common_libs})
+  target_link_libraries(${_cmd} ${_pano_target} ${_common_libs})
   install(TARGETS ${_cmd} DESTINATION bin CONFIGURATIONS Release RelWithDebInfo MinSizeRel)
 endforeach(_cmd)
 


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

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

From: <jim0watters@us...> - 2009-10-08 02:52

Revision: 1098
          http://panotools.svn.sourceforge.net/panotools/?rev=1098&view=rev
Author:   jim0watters
Date:     2009-10-08 02:51:56 +0000 (Thu, 08 Oct 2009)

Log Message:
-----------
Move function to PTCommon where it belongs.
Fix many possible memory leaks detected by CppCheck

Modified Paths:
--------------
    trunk/libpano/ChangeLog
    trunk/libpano/PTcommon.h
    trunk/libpano/tools/PTmender.c

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2009-10-08 02:48:06 UTC (rev 1097)
+++ trunk/libpano/ChangeLog	2009-10-08 02:51:56 UTC (rev 1098)
@@ -1,3 +1,13 @@
+2009-10-07 jim0watters
+
+    * PTmender.c: use define for path seperator.
+
+	* ColourBrightness.c, file.c, hdrfile.c, main.c, parser.c, PTcommon.c, 
+	ptstitch.c, tiff.c pttiff.h: Fixed many possible memory leaks for libpano
+	
+	* PTblender.c, PTmasker.c, PTmender.h, PTroller.c: Fixed many possible 
+	memory leaks for the tools.
+	
 2009-09-25    <dmg@...>
 	
 	* parser.c (ReadImageDescription): Removed a debugging printf I forgot

Modified: trunk/libpano/PTcommon.h
===================================================================
--- trunk/libpano/PTcommon.h	2009-10-08 02:48:06 UTC (rev 1097)
+++ trunk/libpano/PTcommon.h	2009-10-08 02:51:56 UTC (rev 1098)
@@ -64,7 +64,7 @@
 int  panoPSDCreate(  fullPath *fullPathImages, int, fullPath*, pano_flattening_parms*);
 
 int panoCreatePanorama(fullPath ptrImageFileNames[], int counterImageFiles, fullPath *panoFileName, fullPath *scriptFileName);
-
+void ARGtoRGBAImage(Image *im);
 void panoReplaceExt(char* filename, char *extension);
 int panoUnCropTiff(char *inputFile, char *outputFile);
 

Modified: trunk/libpano/tools/PTmender.c
===================================================================
--- trunk/libpano/tools/PTmender.c	2009-10-08 02:48:06 UTC (rev 1097)
+++ trunk/libpano/tools/PTmender.c	2009-10-08 02:51:56 UTC (rev 1098)
@@ -388,7 +388,7 @@
 char* Filename(fullPath* path)
 {
     char *temp;
-    if ((temp = strrchr(path->name, '/')) != NULL) {
+    if ((temp = strrchr(path->name, PATH_SEP)) != NULL) {
 	temp++;
     } else {
 	temp = path->name;


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

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

From: <dangelo@us...> - 2009-10-11 21:45

Revision: 1103
          http://panotools.svn.sourceforge.net/panotools/?rev=1103&view=rev
Author:   dangelo
Date:     2009-10-11 21:45:33 +0000 (Sun, 11 Oct 2009)

Log Message:
-----------
Use Te0 as plane_yaw and Te1 as
plane_pitch. This allows specification of the plane that is used in
the translation mosaic (TrX, TrY, TrZ) mode. Not sure if the code is
bug free, though. It mostly worked as expected but didn't work nicely
for the nadir usecase in my limited tests.

Modified Paths:
--------------
    trunk/libpano/ChangeLog
    trunk/libpano/filter.h
    trunk/libpano/math.c

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2009-10-11 08:30:27 UTC (rev 1102)
+++ trunk/libpano/ChangeLog	2009-10-11 21:45:33 UTC (rev 1103)
@@ -1,3 +1,11 @@
+2009-10-11 dangelo
+
+	* filter.h, math.c: Use Te0 as plane_yaw and Te1 as
+	plane_pitch. This allows specification of the plane that is used in
+	the translation mosaic (TrX, TrY, TrZ) mode. Not sure if the code is
+	bug free, though. It mostly worked as expected but didn't work nicely
+	for the nadir usecase in my limited tests.
+
 2009-10-07 jim0watters
 
     * PTmender.c: use define for path seperator.

Modified: trunk/libpano/filter.h
===================================================================
--- trunk/libpano/filter.h	2009-10-11 08:30:27 UTC (rev 1102)
+++ trunk/libpano/filter.h	2009-10-11 21:45:33 UTC (rev 1103)
@@ -379,12 +379,12 @@
 	double	horizontal;
 	double	vertical;
 
-  // Tilt 
+    // Tilt 
 	double tilt[4]; // 0 around x, 1 around y, 2 around z, 3 scaling factor
-  // Translation of cmaera plane
-        double trans[3];
-  // For testing new projections
-        double test[4];
+    // Translation of cmaera plane
+    double trans[3];
+    // For testing new projections
+    double test[4];
 
 
 	Image *im;

Modified: trunk/libpano/math.c
===================================================================
--- trunk/libpano/math.c	2009-10-11 08:30:27 UTC (rev 1102)
+++ trunk/libpano/math.c	2009-10-11 21:45:33 UTC (rev 1103)
@@ -40,7 +40,11 @@
 void    matrix_matrix_mult      ( double m1[3][3],double m2[3][3],double result[3][3]);
 int     polzeros_();
 
+void cubeZero( double *a, int *n, double *root );
+void squareZero( double *a, int *n, double *root );
+double cubeRoot( double x );
 
+
 //------------------------- Some auxilliary math functions --------------------------------------------
 
 // atanh is not available on MSVC. Use the atanh routine from gsl
@@ -1794,134 +1798,205 @@
     return 1;
 }
 
-/** transfer a point from a camera centered at x1,y1,z1 into the camera at x2,y2,z2 */
-int plane_transfer_to_camera( double x_dest, double y_dest, double * x_src, double * y_src, void * params)
+/** convert erect to cartesian XYZ coordinates
+ */
+int cart_erect( double x_dest, double y_dest, double * xyz, double distance)
 {
-	// params: distance, x1,y1,z1
-	
-	double  phi, theta;
-	double x_plane, y_plane;
-	double x_ray,y_ray,z_ray;
+    // phi is azimuth (negative angle around y axis, starting at the z axis)
+	double phi = x_dest / distance;	
+	double theta_zenith = M_PI/2.0 - (y_dest / distance);
+	// compute cartesian coordinates..
+	//pos[2] = cos(-phi)*sin(theta_zenith);
+	//pos[0] = sin(-phi)*sin(theta_zenith);
+	//pos[1] = cos(theta_zenith);
 
+    xyz[0] = sin(theta_zenith)*sin(phi);
+	xyz[1] = cos(theta_zenith);
+	xyz[2] = sin(theta_zenith)*-cos(phi);
 
-	phi 	= x_dest / mp->distance;
-	theta 	=  - y_dest / mp->distance  + PI / 2.0;
-	if(theta < 0)
-	{
-		theta = - theta;
-		phi += PI;
+	return 1;
+}
+
+
+/** convert cartesian coordinates into spherical ones
+ */
+int erect_cart(double * xyz, double *x_src, double *y_src, double distance)
+{
+	*x_src = atan2(xyz[0],-xyz[2]) * distance;
+	*y_src = asin(xyz[1]/sqrt(xyz[0]*xyz[0]+xyz[1]*xyz[1]+xyz[2]*xyz[2])) * distance;
+}
+
+
+/** Compute intersection between line and point.
+ *  n : a,b,c,d coefficients of plane (a,b,c = normal vector)
+ *  p1: point on line
+ *  p2: point on line
+ *  See http://local.wasp.uwa.edu.au/~pbourke/geometry/planeline/
+ */
+int line_plane_intersection(double n[4],
+							double p1[3],
+							double p2[3],
+							double * result)
+{
+	int i;
+	// direction vector of line
+	double d[3];
+	double u,num,den;
+
+	for (i=0;i<3;i++)
+		d[i] = p2[i]-p1[i];
+	num = n[0]*p1[0]+n[1]*p1[1]+n[2]*p1[2] + n[3];
+	den = -n[0]*d[0]-n[1]*d[1]-n[2]*d[2];
+	if (fabs(den) < 1e-15) {
+		return 0;
 	}
-	if(theta > PI)
-	{
-		theta = PI - (theta - PI);
-		phi += PI;
+	u = num/den;
+
+	if (u < 0) {
+		// This is match is in the wrong direction, ignore
+		return 0;
 	}
+	/* printf("intersect, dir: %f %f %f, num: %f, denom: %f, u: %f\n", d[0], d[1], d[2], num, den, u);
+	 */
 
-	// if the ray goes behind the camera, abort here
-	// normalize phi to be in the -PI, PI range
-	while(phi <= -PI)
-		phi += 2*PI;
-	while(phi > PI)
-		phi -= 2*PI;
+	for (i=0;i<3;i++)
+	  result[i] = p1[i]+u*d[i];
 
-	// check if the point is "in front" of the camera
-	if (phi < -PI/2.0 || phi > PI/2.0)
-		// behind, transform considered invalid
+	return 1;
+}
+
+/** transfer a point from the master camera through a plane into camera 
+ *  at TrX, TrY, TrZ using the plane located at Te0 (yaw), Te1 (pitch)
+ */
+int plane_transfer_to_camera( double x_dest, double y_dest, double * x_src, double * y_src, void * params)
+{
+	// params: distance, x1,y1,z1
+
+	double plane_coeff[4];
+	double p1[3];
+	double p2[3];
+	double intersection[3];
+
+	// compute ray of sight for the current pixel in
+	// the master panorama camera.
+	// camera point
+	p1[0] = p1[1] = p1[2] = 0;
+	// point on sphere.
+	cart_erect(x_dest, y_dest, &p2[0], mp->distance);
+
+	// compute plane description
+	cart_erect(DEG_TO_RAD(mp->test[0]), -DEG_TO_RAD(mp->test[1]),
+			   &plane_coeff[0], 1.0);
+
+	// plane_coeff[0..2] is both the normal and a point
+	// on the plane.
+	plane_coeff[3] = - plane_coeff[0]*plane_coeff[0]
+		             - plane_coeff[1]*plane_coeff[1]
+		             - plane_coeff[2]*plane_coeff[2];
+
+	/*
+	printf("Plane: y:%f p:%f coefficients: %f %f %f %f, ray direction: %f %f %f\n", 
+	       mp->test[0], mp->test[1], plane_coeff[0], plane_coeff[1], plane_coeff[2], plane_coeff[3],
+		   p2[0],p2[1],p2[2]);
+	*/
+
+	// perform intersection.
+
+	if (!line_plane_intersection(plane_coeff, p1, p2, &intersection[0])) {
+		// printf("No intersection found, %f %f %f\n", p2[0], p2[1], p2[2]);
 		return 0;
+	}
 
-	// compute the position on the intermediate plane
-	// the ray originates from the pano center (0,0,0)
-	// and intersects the plane located at z=-1
-	// basically rect_erect, but with distance = 1
-	x_plane = tan(phi);
-	y_plane = 1.0 / (tan( theta ) * cos(phi));
+	// compute ray leading to the camera.
+	intersection[0] -= mp->trans[0];
+	intersection[1] -= mp->trans[1];
+	intersection[2] -= mp->trans[2];
 
-	// compute ray leading to to the camera.
-	x_ray = x_plane - mp->trans[0];
-	y_ray = y_plane - mp->trans[1];
-	z_ray = mp->trans[2] + 1.0;
-
 	// transform into erect
-	// basically erect_rect
-	*x_src = mp->distance * atan2( x_ray, z_ray );
-	*y_src = mp->distance * atan2(  y_ray, sqrt( z_ray*z_ray + x_ray*x_ray ) );	
+	erect_cart(&intersection[0], x_src, y_src, mp->distance);
 
 	/*
-	printf("plane(%.1f,%.1f%.1f): %8.5f %8.5f -> %8.5f %8.5f -> %8.5f %8.5f %8.5f -> %8.5f %8.5f\n", 
-		   mp->trans[0], mp->trans[1], mp->trans[2],
+	printf("pano->plane->cam(%.1f, %.1f, %.1f, y:%1f,p:%1f): %8.5f %8.5f -> %8.5f %8.5f %8.5f -> %8.5f %8.5f\n",
+		   mp->trans[0], mp->trans[1], mp->trans[2], mp->test[0], mp->test[1],
 		   x_dest, y_dest, 
-		   //RAD_TO_DEG(phi), RAD_TO_DEG(theta),
-		   x_plane, y_plane,
-		   x_ray, y_ray, z_ray, *x_src, *y_src);
+		   intersection[0], intersection[1], intersection[2],
+		   *x_src, *y_src);
 	*/
 
 	return 1;
 }
 
+
 /** transfer a point from a camera centered at x1,y1,z1 into the camera at x2,y2,z2 */
 int plane_transfer_from_camera( double x_dest, double y_dest, double * x_src, double * y_src, void * params)
 {
+
+	double phi, theta;
+	double plane_coeff[4];
+	double p1[3];
+	double p2[3];
+	double intersection[3];
+
 	// params: MakeParams
 
-	double  phi, theta;
-	double x_plane, y_plane;
-	double x_ray,y_ray,z_ray;
+	// compute ray of sight for the current pixel in
+	// the master panorama camera.
+	// camera point
+	p1[0] = mp->trans[0];
+	p1[1] = mp->trans[1];
+	p1[2] = mp->trans[2];
 
-	phi 	= x_dest / mp->distance;
-	theta 	=  - y_dest / mp->distance  + PI / 2.0;
-	if(theta < 0)
-	{
-		theta = - theta;
-		phi += PI;
-	}
-	if(theta > PI)
-	{
-		theta = PI - (theta - PI);
-		phi += PI;
-	}
+	// point on sphere (direction vector in camera coordinates)
+	cart_erect(x_dest, y_dest, &p2[0], mp->distance);
+	// add camera position to get point on ray
+	p2[0] += p1[0];
+	p2[1] += p1[1];
+	p2[2] += p1[2];	
 
-	// normalize phi to be in the -PI, PI range
-	while(phi <= -PI)
-		phi += 2*PI;
-	while(phi > PI)
-		phi -= 2*PI;
 
-	// check if the point is "in front" of the panorama camera
-	if (phi < -PI/2.0 || phi > PI/2.0)
-		// behind, transform considered invalid
-		return 0;
+	// compute plane description
+	cart_erect(DEG_TO_RAD(mp->test[0]), -DEG_TO_RAD(mp->test[1]),
+			   &plane_coeff[0], 1.0);
 
-	// compute the position on the intermediate plane
-	// Intersection of ray from the image center (Tx,Ty,Tz)
-	// with plane located at z=-1
-	x_plane = (mp->trans[2]+1.0)* tan(phi);
-	y_plane = (mp->trans[2]+1.0) / (tan( theta ) * cos(phi));
+	// plane_coeff[0..2] is both the normal and a point
+	// on the plane.
+	plane_coeff[3] = - plane_coeff[0]*plane_coeff[0]
+		             - plane_coeff[1]*plane_coeff[1]
+		             - plane_coeff[2]*plane_coeff[2];
 
-	// shift according to camera position
-	x_plane += mp->trans[0];
-	y_plane += mp->trans[1];
+	/*
+	printf("Plane: y:%f p:%f coefficients: %f %f %f %f, ray direction: %f %f %f\n", 
+	       mp->test[0], mp->test[1], plane_coeff[0], plane_coeff[1], plane_coeff[2], plane_coeff[3],
+		   p2[0],p2[1],p2[2]);
+	*/
 
-	x_ray = x_plane;
-	y_ray = y_plane;
-	z_ray = 1.0;
 
+	// compute intersection
+	if (!line_plane_intersection(plane_coeff, p1, p2, &intersection[0])) {
+		//printf("No intersection found, %f %f %f\n", p2[0], p2[1], p2[2]);
+		return 0;
+	}
+
+	// the intersection vector is the vector of the ray of sight from
+	// the master panorama camera.
+
 	// transform into erect
-	// basically erect_rect
-	*x_src = mp->distance * atan2( x_ray, z_ray );
-	*y_src = mp->distance * atan2(  y_ray, sqrt( z_ray*z_ray + x_ray*x_ray ) );	
+	erect_cart(&intersection[0], x_src, y_src, mp->distance);
 
 	/*
-	printf("cam->plane(%.1f,%.1f%.1f): %8.5f %8.5f -> %8.5f %8.5f -> %8.5f %8.5f %8.5f -> %8.5f %8.5f\n", 
-		   mp->trans[0], mp->trans[1], mp->trans[2],
+	printf("cam->plane->pano(%.1f, %.1f, %.1f, y:%1f,p:%1f): %8.5f %8.5f -> %8.5f %8.5f %8.5f -> %8.5f %8.5f\n",
+		   mp->trans[0], mp->trans[1], mp->trans[2], mp->test[0], mp->test[1],
 		   x_dest, y_dest, 
-		   //RAD_TO_DEG(phi), RAD_TO_DEG(theta),
-		   x_plane, y_plane,
-		   x_ray, y_ray, z_ray, *x_src, *y_src);
+		   intersection[0], intersection[1], intersection[2],
+		   *x_src, *y_src);
+		   
 	*/
 
+	return 1;
 }
 
 
+
 /** convert from erect to biplane */
 int biplane_erect		( double x_dest,double  y_dest, double* x_src, double* y_src, void* params )
 {
@@ -2351,12 +2426,9 @@
 }
 #endif
 
-void cubeZero( double *a, int *n, double *root );
-void squareZero( double *a, int *n, double *root );
-double cubeRoot( double x );
 
 
-void cubeZero( double *a, int *n, double *root ){
+void cubeZero( double *a, int *n, double *root ) {
 	if( a[3] == 0.0 ){ // second order polynomial
 		squareZero( a, n, root );
 	}else{


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

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

From: <dmg@us...> - 2009-10-14 09:11

Revision: 1108
          http://panotools.svn.sourceforge.net/panotools/?rev=1108&view=rev
Author:   dmg
Date:     2009-10-14 09:11:42 +0000 (Wed, 14 Oct 2009)

Log Message:
-----------
this commit should have been few weeks ago... fixes incorrect normalization of angles in tilt

Modified Paths:
--------------
    trunk/libpano/ChangeLog
    trunk/libpano/PTcommon.c
    trunk/libpano/adjust.c
    trunk/libpano/filter.h

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2009-10-12 17:12:57 UTC (rev 1107)
+++ trunk/libpano/ChangeLog	2009-10-14 09:11:42 UTC (rev 1108)
@@ -16,10 +16,19 @@
 	* PTblender.c, PTmasker.c, PTmender.h, PTroller.c: Fixed many possible 
 	memory leaks for the tools.
 	
+2009-09-26    <dmg@...>
+
+	* adjust.c (SetAlignParams): Trying to normalize the angles didn't
+	really worked. Disabled for the time begin
+
+	* filter.h (NORM_ANGLE_RAD): Totally incorrect implementation before.
+
+
+
 2009-09-25    <dmg@...>
-	
+
 	* parser.c (ReadImageDescription): Removed a debugging printf I forgot
-	
+
 2009-09-25    <dmg@...>
 
 	* correct.c (SetCorrectDefaults): Initialized values of new parameters.

Modified: trunk/libpano/PTcommon.c
===================================================================
--- trunk/libpano/PTcommon.c	2009-10-12 17:12:57 UTC (rev 1107)
+++ trunk/libpano/PTcommon.c	2009-10-14 09:11:42 UTC (rev 1108)
@@ -894,7 +894,7 @@
         } else {
 	    PrintError("No support for this ouput image format (%s). Output will be TIFF_m", output_file_format);
 	}
-        //croppedTIFFIntermediate = 0;
+        //        croppedTIFFIntermediate = 0;
 
 
 

Modified: trunk/libpano/adjust.c
===================================================================
--- trunk/libpano/adjust.c	2009-10-12 17:12:57 UTC (rev 1107)
+++ trunk/libpano/adjust.c	2009-10-14 09:11:42 UTC (rev 1108)
@@ -2497,15 +2497,15 @@
                 }
                 // tilt
                 if( (k = optInfo->opt[i].tiltXopt) > 0 ){
-                    if( k == 1 ){ optInfo->im[i].cP.tilt_x  = x[j++]; NORM_ANGLE_RAD(optInfo->im[i].cP.tilt_x);
+                    if( k == 1 ){ optInfo->im[i].cP.tilt_x  = x[j++]; //NORM_ANGLE_RAD(optInfo->im[i].cP.tilt_x);
                     }else{  optInfo->im[i].cP.tilt_x = optInfo->im[k-2].cP.tilt_x;}
                 }
                 if( (k = optInfo->opt[i].tiltYopt) > 0 ){
-                        if( k == 1 ){ optInfo->im[i].cP.tilt_y  = x[j++]; NORM_ANGLE_RAD(optInfo->im[i].cP.tilt_y);
+                    if( k == 1 ){ optInfo->im[i].cP.tilt_y  = x[j++]; //NORM_ANGLE_RAD(optInfo->im[i].cP.tilt_y);
                         }else{  optInfo->im[i].cP.tilt_y = optInfo->im[k-2].cP.tilt_y;}
                 }
                 if( (k = optInfo->opt[i].tiltZopt) > 0 ){
-                        if( k == 1 ){ optInfo->im[i].cP.tilt_z  =       x[j++];NORM_ANGLE_RAD(optInfo->im[i].cP.tilt_z);
+                    if( k == 1 ){ optInfo->im[i].cP.tilt_z  =x[j++]; //NORM_ANGLE_RAD(optInfo->im[i].cP.tilt_z);
                         }else{  optInfo->im[i].cP.tilt_z = optInfo->im[k-2].cP.tilt_z;}
                 }
                 if( (k = optInfo->opt[i].tiltScaleOpt) > 0 ){
@@ -2515,6 +2515,11 @@
                             optInfo->im[i].cP.tilt_scale = 0.001; //make sure it never becomes zero
                         }
                         optInfo->im[i].cP.tilt_scale = fabs(optInfo->im[i].cP.tilt_scale);
+                        /*
+                        if (optInfo->im[i].cP.tilt_scale > 10) {
+                            optInfo->im[i].cP.tilt_scale = 10; //make sure it never gets out of control
+                        }
+                        */
                     } else{  optInfo->im[i].cP.tilt_scale = optInfo->im[k-2].cP.tilt_scale;}
                 }
                 // translate

Modified: trunk/libpano/filter.h
===================================================================
--- trunk/libpano/filter.h	2009-10-12 17:12:57 UTC (rev 1107)
+++ trunk/libpano/filter.h	2009-10-14 09:11:42 UTC (rev 1108)
@@ -71,7 +71,7 @@
 // Normalize an angle to +/-180degrees
 
 #define NORM_ANGLE( x )      while( x >180.0 ) x -= 360.0; while( x < -180.0 ) x += 360.0;
-#define NORM_ANGLE_RAD( x )  fmod((x), PI)
+#define NORM_ANGLE_RAD( x )  while( (x) >PI ) (x) -= 2 * PI; while( (x) < -PI ) (x) += 2 * PI;
 
 // Convert degree to radian
 


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

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

From: <jim0watters@us...> - 2009-11-08 03:05

Revision: 1136
          http://panotools.svn.sourceforge.net/panotools/?rev=1136&view=rev
Author:   jim0watters
Date:     2009-11-08 03:05:46 +0000 (Sun, 08 Nov 2009)

Log Message:
-----------
Allow building the CMD and GUI versions of pano13.dll

Modified Paths:
--------------
    trunk/libpano/libpano13.def
    trunk/libpano/pano13vc.def
    trunk/libpano/sys_ansi.c
    trunk/libpano/sys_ansi.h

Modified: trunk/libpano/libpano13.def
===================================================================
--- trunk/libpano/libpano13.def	2009-11-08 01:00:24 UTC (rev 1135)
+++ trunk/libpano/libpano13.def	2009-11-08 03:05:46 UTC (rev 1136)
@@ -14,27 +14,27 @@
 			writePrefs		@5
 			writeTIFF		@6
 			PrintError		@7
-			DispPrg	= DispPrg@...		@8
-			SetCPrefs = SetCPrefs@...		@9
+;			DispPrg	= DispPrg@...		@8
+;			SetCPrefs = SetCPrefs@...		@9
 			SetWindowOwner	@10
-			SetLumOpt = SetLumOpt@...		@11
-			DLLInit = DLLInit@...			@12
-			SetRadOpt = SetRadOpt@...		@13
-			SetHorOpt = SetHorOpt@...		@15
-			SetVerOpt = SetVerOpt@...		@16
-			SetScOpt = SetScOpt@...		@17
-			SetShOpt = SetShOpt@...		@18
-			SetCrOpt = SetCrOpt@...		@19
-			SetAdPrefs = SetAdPrefs@...		@20
-			SetPerspPrefs = SetPerspPrefs@...  @21
-			SetRem = SetRem@...			@22
-			SetSiz = SetSiz@...			@23
-			SetIntp	= SetIntp@...		@24
+;			SetLumOpt = SetLumOpt@...		@11
+;			DLLInit = DLLInit@...			@12
+;			SetRadOpt = SetRadOpt@...		@13
+;			SetHorOpt = SetHorOpt@...		@15
+;			SetVerOpt = SetVerOpt@...		@16
+;			SetScOpt = SetScOpt@...		@17
+;			SetShOpt = SetShOpt@...		@18
+;			SetCrOpt = SetCrOpt@...		@19
+;			SetAdPrefs = SetAdPrefs@...		@20
+;			SetPerspPrefs = SetPerspPrefs@...  @21
+;			SetRem = SetRem@...			@22
+;			SetSiz = SetSiz@...			@23
+;			SetIntp	= SetIntp@...		@24
 			CopyImageData	@25
-			InfoPrg	= InfoPrg@...		@26
-			SetCutOpt = SetCutOpt@...		@27
-			SetPanOpt = SetPanOpt@...		@28
-			SetFrPrefs = SetFrPrefs@...	@29
+;			InfoPrg	= InfoPrg@...		@26
+;			SetCutOpt = SetCutOpt@...		@27
+;			SetPanOpt = SetPanOpt@...		@28
+;			SetFrPrefs = SetFrPrefs@...	@29
 			writePSD		@30
 			addLayerToFile	@31
 			writePSDwithLayer	@32
@@ -78,10 +78,10 @@
 			FindFile	@70
 			DisposeAlignInfo	@71
 			showScript	@72
-			readImage	@73
-			writeImage	@74
+;			readImage	@73
+;			writeImage	@74
 			writeJPEG	@75
-			makeTempPath	@76
+;			makeTempPath	@76
 			MorphImageFile	@77
 			blendImages	@78
 			InterpolateImageFile	@79
@@ -94,44 +94,44 @@
 			SetMakeParams	@86
 			fwiener	@87
 			noisefilter	@88
-			Java_ptutils_CLoadImage = Java_ptutils_CLoadImage@...	@89
-			Java_ptutils_CGetImageRow = Java_ptutils_CGetImageRow@...	@90
-			Java_ptutils_CGetImageWidth = Java_ptutils_CGetImageWidth@...	@91
-			Java_ptutils_CGetImageHeight = Java_ptutils_CGetImageHeight@...	@92
-			Java_ptutils_CLoadProject = Java_ptutils_CLoadProject@... 	@93
-			Java_ptutils_CGetImageCount = Java_ptutils_CGetImageCount@...	@94
-			Java_ptutils_CGetImageName = Java_ptutils_CGetImageName@...	@95
-			Java_ptutils_CGetControlPointCount = Java_ptutils_CGetControlPointCount@...	@96
-			Java_ptutils_CGetCP_1n = Java_ptutils_CGetCP_1n@...	@97
-			Java_ptutils_CGetCP_1x = Java_ptutils_CGetCP_1x@...	@98
-			Java_ptutils_CGetCP_1y = Java_ptutils_CGetCP_1y@...	@99
-			Java_ptutils_CGetCP_1t = Java_ptutils_CGetCP_1t@...	@100
-			Java_ptutils_CGetTriangleCount = Java_ptutils_CGetTriangleCount@...	@101
-			Java_ptutils_CGetTR_1v = Java_ptutils_CGetTR_1v@...	@102
-			Java_ptutils_CGetTR_1i = Java_ptutils_CGetTR_1i@...	@103
-			Java_ptutils_CSaveProject = Java_ptutils_CSaveProject@...	@104
-			Java_ptutils_CSetImageName = Java_ptutils_CSetImageName@...	@105
-			Java_ptutils_CSetControlPointCount = Java_ptutils_CSetControlPointCount@...	@106
-			Java_ptutils_CSetCP = Java_ptutils_CSetCP@...	@107
-			Java_ptutils_CSetTriangleCount = Java_ptutils_CSetTriangleCount@...	@108
-			Java_ptutils_CSetTR = Java_ptutils_CSetTR@...	@109
-			Java_ptutils_CGetIndex = Java_ptutils_CGetIndex@...	@110
-			Java_ptutils_CCreateProject = Java_ptutils_CCreateProject@...	@111
-			Java_ptutils_CTriangulate = Java_ptutils_CTriangulate@...	@112
-			Java_ptutils_CReduce = Java_ptutils_CReduce@...	@113
-			Java_ptutils_CCallOptimizer = Java_ptutils_CCallOptimizer@...	@114
-			Java_ptutils_CShowScript = Java_ptutils_CShowScript@...	@115
-			Java_ptutils_CLaunchAndSendScript = Java_ptutils_CLaunchAndSendScript@...	@116
+;			Java_ptutils_CLoadImage = Java_ptutils_CLoadImage@...	@89
+;			Java_ptutils_CGetImageRow = Java_ptutils_CGetImageRow@...	@90
+;			Java_ptutils_CGetImageWidth = Java_ptutils_CGetImageWidth@...	@91
+;			Java_ptutils_CGetImageHeight = Java_ptutils_CGetImageHeight@...	@92
+;			Java_ptutils_CLoadProject = Java_ptutils_CLoadProject@... 	@93
+;			Java_ptutils_CGetImageCount = Java_ptutils_CGetImageCount@...	@94
+;			Java_ptutils_CGetImageName = Java_ptutils_CGetImageName@...	@95
+;			Java_ptutils_CGetControlPointCount = Java_ptutils_CGetControlPointCount@...	@96
+;			Java_ptutils_CGetCP_1n = Java_ptutils_CGetCP_1n@...	@97
+;			Java_ptutils_CGetCP_1x = Java_ptutils_CGetCP_1x@...	@98
+;			Java_ptutils_CGetCP_1y = Java_ptutils_CGetCP_1y@...	@99
+;			Java_ptutils_CGetCP_1t = Java_ptutils_CGetCP_1t@...	@100
+;			Java_ptutils_CGetTriangleCount = Java_ptutils_CGetTriangleCount@...	@101
+;			Java_ptutils_CGetTR_1v = Java_ptutils_CGetTR_1v@...	@102
+;			Java_ptutils_CGetTR_1i = Java_ptutils_CGetTR_1i@...	@103
+;			Java_ptutils_CSaveProject = Java_ptutils_CSaveProject@...	@104
+;			Java_ptutils_CSetImageName = Java_ptutils_CSetImageName@...	@105
+;			Java_ptutils_CSetControlPointCount = Java_ptutils_CSetControlPointCount@...	@106
+;			Java_ptutils_CSetCP = Java_ptutils_CSetCP@...	@107
+;			Java_ptutils_CSetTriangleCount = Java_ptutils_CSetTriangleCount@...	@108
+;			Java_ptutils_CSetTR = Java_ptutils_CSetTR@...	@109
+;			Java_ptutils_CGetIndex = Java_ptutils_CGetIndex@...	@110
+;			Java_ptutils_CCreateProject = Java_ptutils_CCreateProject@...	@111
+;			Java_ptutils_CTriangulate = Java_ptutils_CTriangulate@...	@112
+;			Java_ptutils_CReduce = Java_ptutils_CReduce@...	@113
+;			Java_ptutils_CCallOptimizer = Java_ptutils_CCallOptimizer@...	@114
+;			Java_ptutils_CShowScript = Java_ptutils_CShowScript@...	@115
+;			Java_ptutils_CLaunchAndSendScript = Java_ptutils_CLaunchAndSendScript@...	@116
 			IsTextFile	@117
 			StringtoFullPath	@118
-			Java_ptutils_CAlignPoint = Java_ptutils_CAlignPoint@...	@119
-			Java_pteditor_CLoadImage = Java_pteditor_CLoadImage@...	@120
-			Java_pteditor_CSaveImage = Java_pteditor_CSaveImage@...	@121
-			Java_pteditor_CGetImageWidth = Java_pteditor_CGetImageWidth@...	@122
-			Java_pteditor_CGetImageHeight = Java_pteditor_CGetImageHeight@...	@123
-			Java_pteditor_CGetImageRow = Java_pteditor_CGetImageRow@...	@124
-			Java_pteditor_CExtract 	= Java_pteditor_CExtract@... @125
-			Java_pteditor_CInsert = Java_pteditor_CInsert@...	@126
+;			Java_ptutils_CAlignPoint = Java_ptutils_CAlignPoint@...	@119
+;			Java_pteditor_CLoadImage = Java_pteditor_CLoadImage@...	@120
+;			Java_pteditor_CSaveImage = Java_pteditor_CSaveImage@...	@121
+;			Java_pteditor_CGetImageWidth = Java_pteditor_CGetImageWidth@...	@122
+;			Java_pteditor_CGetImageHeight = Java_pteditor_CGetImageHeight@...	@123
+;			Java_pteditor_CGetImageRow = Java_pteditor_CGetImageRow@...	@124
+;			Java_pteditor_CExtract 	= Java_pteditor_CExtract@... @125
+;			Java_pteditor_CInsert = Java_pteditor_CInsert@...	@126
 			Progress	@127
 			TIFFOpen	@128
 			TIFFClose	@129
@@ -152,14 +152,14 @@
 			RGBAtoARGB	@145
 			readTIFF	@146
 			CheckParams	@147
-			Java_ptutils_CGetImageFormat	= Java_ptutils_CGetImageFormat@... @148
-			Java_ptutils_CGetHfov	=	Java_ptutils_CGetHfov@...	@149
-			Java_ptutils_CGetYaw	=	Java_ptutils_CGetYaw@...	@150
-			Java_ptutils_CGetPitch	=	Java_ptutils_CGetPitch@...	@151
-			Java_ptutils_CGetRoll	=	Java_ptutils_CGetRoll@...	@152
-			Java_pteditor_CSetImageWidth = Java_pteditor_CSetImageWidth@... @153
-			Java_pteditor_CSetImageHeight = Java_pteditor_CSetImageHeight@... @154
-			Java_pteditor_CSetImageRow = Java_pteditor_CSetImageRow@... @155
+;			Java_ptutils_CGetImageFormat	= Java_ptutils_CGetImageFormat@... @148
+;			Java_ptutils_CGetHfov	=	Java_ptutils_CGetHfov@...	@149
+;			Java_ptutils_CGetYaw	=	Java_ptutils_CGetYaw@...	@150
+;			Java_ptutils_CGetPitch	=	Java_ptutils_CGetPitch@...	@151
+;			Java_ptutils_CGetRoll	=	Java_ptutils_CGetRoll@...	@152
+;			Java_pteditor_CSetImageWidth = Java_pteditor_CSetImageWidth@... @153
+;			Java_pteditor_CSetImageHeight = Java_pteditor_CSetImageHeight@... @154
+;			Java_pteditor_CSetImageRow = Java_pteditor_CSetImageRow@... @155
 			TwoToOneByte @156
 			CropImage @157
 			numLines @158
@@ -181,17 +181,17 @@
 			PT_setErrorFcn @174
 			execute_stack_new @175
 			InsertFileName @176
-			VerifyTiffsAreCompatible @177
-			AddStitchingMasks @178
-			FlattenTIFF @179
-			CreatePSD @180
-			CreatePanorama @181
+;			VerifyTiffsAreCompatible @177
+;			AddStitchingMasks @178
+			panoFlattenTIFF @179
+;			CreatePSD @180
+			panoCreatePanorama @181
 			ptQuietFlag @182
-			ReplaceExt @183
+			panoReplaceExt @183
 			ColourBrightness @184
-			TiffSetImageParameters @185
-			TiffGetImageParameters @186
+;			TiffSetImageParameters @185
+;			TiffGetImageParameters @186
 			getCropInformationFromTiff @187
 			setCropInformationInTiff @188 
-			writeCroppedTIFF @ 189
+			writeCroppedTIFF @189
 			dieWithError @190			 
\ No newline at end of file

Modified: trunk/libpano/pano13vc.def
===================================================================
--- trunk/libpano/pano13vc.def	2009-11-08 01:00:24 UTC (rev 1135)
+++ trunk/libpano/pano13vc.def	2009-11-08 03:05:46 UTC (rev 1136)
@@ -10,27 +10,27 @@
 			writePrefs		@5
 			writeTIFF		@6
 			PrintError		@7
-			DispPrg@...	= DispPrg		@8
-			SetCPrefs@... = SetCPrefs		@9
+;			DispPrg@...	= DispPrg		@8
+;			SetCPrefs@... = SetCPrefs		@9
 			SetWindowOwner	@10
-			SetLumOpt@... = SetLumOpt		@11	
-			DLLInit@... = DLLInit			@12
-			SetRadOpt@... = SetRadOpt		@13
-			SetHorOpt@... = SetHorOpt		@15
-			SetVerOpt@... = SetVerOpt		@16
-			SetScOpt@... = SetScOpt		@17
-			SetShOpt@... = SetShOpt		@18
-			SetCrOpt@... = SetCrOpt		@19
-			SetAdPrefs@... = SetAdPrefs		@20
-			SetPerspPrefs@... = SetPerspPrefs  @21
-			SetRem@... = SetRem			@22
-			SetSiz@... = SetSiz			@23
-			SetIntp@...	= SetIntp		@24
+;			SetLumOpt@... = SetLumOpt		@11	
+;			DLLInit@... = DLLInit			@12
+;			SetRadOpt@... = SetRadOpt		@13
+;			SetHorOpt@... = SetHorOpt		@15
+;			SetVerOpt@... = SetVerOpt		@16
+;			SetScOpt@... = SetScOpt		@17
+;			SetShOpt@... = SetShOpt		@18
+;			SetCrOpt@... = SetCrOpt		@19
+;			SetAdPrefs@... = SetAdPrefs		@20
+;			SetPerspPrefs@... = SetPerspPrefs  @21
+;			SetRem@... = SetRem			@22
+;			SetSiz@... = SetSiz			@23
+;			SetIntp@...	= SetIntp		@24
 			CopyImageData	@25
-			InfoPrg@...	= InfoPrg		@26
-			SetCutOpt@... = SetCutOpt		@27
-			SetPanOpt@... = SetPanOpt		@28
-			SetFrPrefs@... = SetFrPrefs	@29	
+;			InfoPrg@...	= InfoPrg		@26
+;			SetCutOpt@... = SetCutOpt		@27
+;			SetPanOpt@... = SetPanOpt		@28
+;			SetFrPrefs@... = SetFrPrefs	@29	
 			writePSD		@30
 			addLayerToFile	@31
 			writePSDwithLayer	@32
@@ -90,44 +90,44 @@
 			SetMakeParams	@86
 			fwiener	@87
 			noisefilter	@88
-			Java_ptutils_CLoadImage@... = Java_ptutils_CLoadImage	@89
-			Java_ptutils_CGetImageRow@... = Java_ptutils_CGetImageRow	@90
-			Java_ptutils_CGetImageWidth@... = Java_ptutils_CGetImageWidth	@91
-			Java_ptutils_CGetImageHeight@... = Java_ptutils_CGetImageHeight	@92
-			Java_ptutils_CLoadProject@... = Java_ptutils_CLoadProject 	@93
-			Java_ptutils_CGetImageCount@... = Java_ptutils_CGetImageCount	@94
-			Java_ptutils_CGetImageName@... = Java_ptutils_CGetImageName	@95
-			Java_ptutils_CGetControlPointCount@... = Java_ptutils_CGetControlPointCount	@96
-			Java_ptutils_CGetCP_1n@... = Java_ptutils_CGetCP_1n	@97
-			Java_ptutils_CGetCP_1x@... = Java_ptutils_CGetCP_1x	@98
-			Java_ptutils_CGetCP_1y@... = Java_ptutils_CGetCP_1y	@99
-			Java_ptutils_CGetCP_1t@... = Java_ptutils_CGetCP_1t	@100
-			Java_ptutils_CGetTriangleCount@... = Java_ptutils_CGetTriangleCount	@101
-			Java_ptutils_CGetTR_1v@... = Java_ptutils_CGetTR_1v	@102
-			Java_ptutils_CGetTR_1i@... = Java_ptutils_CGetTR_1i	@103
-			Java_ptutils_CSaveProject@... = Java_ptutils_CSaveProject	@104
-			Java_ptutils_CSetImageName@... = Java_ptutils_CSetImageName	@105
-			Java_ptutils_CSetControlPointCount@... = Java_ptutils_CSetControlPointCount	@106
-			Java_ptutils_CSetCP@... = Java_ptutils_CSetCP	@107
-			Java_ptutils_CSetTriangleCount@... = Java_ptutils_CSetTriangleCount	@108
-			Java_ptutils_CSetTR@... = Java_ptutils_CSetTR	@109
-			Java_ptutils_CGetIndex@... = Java_ptutils_CGetIndex	@110
-			Java_ptutils_CCreateProject@... = Java_ptutils_CCreateProject	@111
-			Java_ptutils_CTriangulate@... = Java_ptutils_CTriangulate	@112
-			Java_ptutils_CReduce@... = Java_ptutils_CReduce	@113
-			Java_ptutils_CCallOptimizer@... = Java_ptutils_CCallOptimizer	@114
-			Java_ptutils_CShowScript@... = Java_ptutils_CShowScript	@115
-			Java_ptutils_CLaunchAndSendScript@... = Java_ptutils_CLaunchAndSendScript	@116
+;			Java_ptutils_CLoadImage@... = Java_ptutils_CLoadImage	@89
+;			Java_ptutils_CGetImageRow@... = Java_ptutils_CGetImageRow	@90
+;			Java_ptutils_CGetImageWidth@... = Java_ptutils_CGetImageWidth	@91
+;			Java_ptutils_CGetImageHeight@... = Java_ptutils_CGetImageHeight	@92
+;			Java_ptutils_CLoadProject@... = Java_ptutils_CLoadProject 	@93
+;			Java_ptutils_CGetImageCount@... = Java_ptutils_CGetImageCount	@94
+;			Java_ptutils_CGetImageName@... = Java_ptutils_CGetImageName	@95
+;			Java_ptutils_CGetControlPointCount@... = Java_ptutils_CGetControlPointCount	@96
+;			Java_ptutils_CGetCP_1n@... = Java_ptutils_CGetCP_1n	@97
+;			Java_ptutils_CGetCP_1x@... = Java_ptutils_CGetCP_1x	@98
+;			Java_ptutils_CGetCP_1y@... = Java_ptutils_CGetCP_1y	@99
+;			Java_ptutils_CGetCP_1t@... = Java_ptutils_CGetCP_1t	@100
+;			Java_ptutils_CGetTriangleCount@... = Java_ptutils_CGetTriangleCount	@101
+;			Java_ptutils_CGetTR_1v@... = Java_ptutils_CGetTR_1v	@102
+;			Java_ptutils_CGetTR_1i@... = Java_ptutils_CGetTR_1i	@103
+;			Java_ptutils_CSaveProject@... = Java_ptutils_CSaveProject	@104
+;			Java_ptutils_CSetImageName@... = Java_ptutils_CSetImageName	@105
+;			Java_ptutils_CSetControlPointCount@... = Java_ptutils_CSetControlPointCount	@106
+;			Java_ptutils_CSetCP@... = Java_ptutils_CSetCP	@107
+;			Java_ptutils_CSetTriangleCount@... = Java_ptutils_CSetTriangleCount	@108
+;			Java_ptutils_CSetTR@... = Java_ptutils_CSetTR	@109
+;			Java_ptutils_CGetIndex@... = Java_ptutils_CGetIndex	@110
+;			Java_ptutils_CCreateProject@... = Java_ptutils_CCreateProject	@111
+;			Java_ptutils_CTriangulate@... = Java_ptutils_CTriangulate	@112
+;			Java_ptutils_CReduce@... = Java_ptutils_CReduce	@113
+;			Java_ptutils_CCallOptimizer@... = Java_ptutils_CCallOptimizer	@114
+;			Java_ptutils_CShowScript@... = Java_ptutils_CShowScript	@115
+;			Java_ptutils_CLaunchAndSendScript@... = Java_ptutils_CLaunchAndSendScript	@116
 			IsTextFile	@117
 			StringtoFullPath	@118
-			Java_ptutils_CAlignPoint@... = Java_ptutils_CAlignPoint	@119
-			Java_pteditor_CLoadImage@... = Java_pteditor_CLoadImage	@120
-			Java_pteditor_CSaveImage@... = Java_pteditor_CSaveImage	@121
-			Java_pteditor_CGetImageWidth@... = Java_pteditor_CGetImageWidth	@122
-			Java_pteditor_CGetImageHeight@... = Java_pteditor_CGetImageHeight	@123
-			Java_pteditor_CGetImageRow@... = Java_pteditor_CGetImageRow	@124
-			Java_pteditor_CExtract@... 	= Java_pteditor_CExtract @125
-			Java_pteditor_CInsert@... = Java_pteditor_CInsert	@126
+;			Java_ptutils_CAlignPoint@... = Java_ptutils_CAlignPoint	@119
+;			Java_pteditor_CLoadImage@... = Java_pteditor_CLoadImage	@120
+;			Java_pteditor_CSaveImage@... = Java_pteditor_CSaveImage	@121
+;			Java_pteditor_CGetImageWidth@... = Java_pteditor_CGetImageWidth	@122
+;			Java_pteditor_CGetImageHeight@... = Java_pteditor_CGetImageHeight	@123
+;			Java_pteditor_CGetImageRow@... = Java_pteditor_CGetImageRow	@124
+;			Java_pteditor_CExtract@... 	= Java_pteditor_CExtract @125
+;			Java_pteditor_CInsert@... = Java_pteditor_CInsert	@126
 			Progress	@127
 			TIFFOpen	@128
 			TIFFClose	@129
@@ -148,14 +148,14 @@
 			RGBAtoARGB	@145
 			readTIFF	@146
 			CheckParams	@147
-			Java_ptutils_CGetImageFormat@...	= Java_ptutils_CGetImageFormat @148
-			Java_ptutils_CGetHfov@...	=	Java_ptutils_CGetHfov	@149
-			Java_ptutils_CGetYaw@...	=	Java_ptutils_CGetYaw	@150
-			Java_ptutils_CGetPitch@...	=	Java_ptutils_CGetPitch	@151
-			Java_ptutils_CGetRoll@...	=	Java_ptutils_CGetRoll	@152
-			Java_pteditor_CSetImageWidth@... = Java_pteditor_CSetImageWidth @153
-			Java_pteditor_CSetImageHeight@... = Java_pteditor_CSetImageHeight @154
-			Java_pteditor_CSetImageRow@... = Java_pteditor_CSetImageRow @155
+;			Java_ptutils_CGetImageFormat@...	= Java_ptutils_CGetImageFormat @148
+;			Java_ptutils_CGetHfov@...	=	Java_ptutils_CGetHfov	@149
+;			Java_ptutils_CGetYaw@...	=	Java_ptutils_CGetYaw	@150
+;			Java_ptutils_CGetPitch@...	=	Java_ptutils_CGetPitch	@151
+;			Java_ptutils_CGetRoll@...	=	Java_ptutils_CGetRoll	@152
+;			Java_pteditor_CSetImageWidth@... = Java_pteditor_CSetImageWidth @153
+;			Java_pteditor_CSetImageHeight@... = Java_pteditor_CSetImageHeight @154
+;			Java_pteditor_CSetImageRow@... = Java_pteditor_CSetImageRow @155
 			TwoToOneByte @156
 			CropImage @157
 			numLines @158
@@ -179,11 +179,11 @@
 			InsertFileName              @176
 ;			VerifyTiffsAreCompatible    @177
 ;			AddStitchingMasks           @178
-;			FlattenTIFF                 @179
+			panoFlattenTIFF             @179
 ;			CreatePSD                   @180
-;			CreatePanorama              @181
+			panoCreatePanorama          @181
 			ptQuietFlag                 @182
-;			ReplaceExt                  @183
+			panoReplaceExt              @183
 			ColourBrightness            @184
 ;			TiffSetImageParameters      @185
 ;			TiffGetImageParameters      @186

Modified: trunk/libpano/sys_ansi.c
===================================================================
--- trunk/libpano/sys_ansi.c	2009-11-08 01:00:24 UTC (rev 1135)
+++ trunk/libpano/sys_ansi.c	2009-11-08 03:05:46 UTC (rev 1136)
@@ -25,6 +25,8 @@
 //------------------ Public functions required by filter.h -------------------------------
 
 
+void SetWindowOwner(HWND Owner) {return;}
+void CenterDialog(HWND hDlg) {return;}
 
 void filter_main( TrformStr *TrPtr, struct size_Prefs *spref)
 {

Modified: trunk/libpano/sys_ansi.h
===================================================================
--- trunk/libpano/sys_ansi.h	2009-11-08 01:00:24 UTC (rev 1135)
+++ trunk/libpano/sys_ansi.h	2009-11-08 03:05:46 UTC (rev 1136)
@@ -41,6 +41,9 @@
 																			\
 			return( FALSE );
 
+void SetWindowOwner(HWND Owner);
+void CenterDialog(HWND hDlg);
+
 #define		kSetRemapPrefs_dlg					"REMAP"	
 #define		kSetRemapPrefs_InRect				350
 #define		kSetRemapPrefs_InPano				351


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

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

From: <jim0watters@us...> - 2009-11-08 03:09

Revision: 1137
          http://panotools.svn.sourceforge.net/panotools/?rev=1137&view=rev
Author:   jim0watters
Date:     2009-11-08 03:09:24 +0000 (Sun, 08 Nov 2009)

Log Message:
-----------
Updated Visual Studio Solution and Project files for building libpano and all the tools.

Modified Paths:
--------------
    trunk/libpano/libpano.sln
    trunk/libpano/libpano.vcproj
    trunk/libpano/tools/PTAInterpolate.vcproj
    trunk/libpano/tools/PTOptimizer.vcproj
    trunk/libpano/tools/PTblender.vcproj
    trunk/libpano/tools/PTcrop.vcproj
    trunk/libpano/tools/PTinfo.vcproj
    trunk/libpano/tools/PTmasker.vcproj
    trunk/libpano/tools/PTmender.vcproj
    trunk/libpano/tools/PTroller.vcproj
    trunk/libpano/tools/PTtiff2psd.vcproj
    trunk/libpano/tools/PTtiffdump.vcproj
    trunk/libpano/tools/PTuncrop.vcproj
    trunk/libpano/tools/mpremap.vcproj

Modified: trunk/libpano/libpano.sln
===================================================================
--- trunk/libpano/libpano.sln	2009-11-08 03:05:46 UTC (rev 1136)
+++ trunk/libpano/libpano.sln	2009-11-08 03:09:24 UTC (rev 1137)
@@ -1,7 +1,6 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pano13", "libpano.vcproj", "{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTblender", "tools\PTblender.vcproj", "{20D1E094-A4B5-4294-85CE-229529065789}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -58,115 +57,126 @@
 		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B} = {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpremap", "tools\mpremap.vcproj", "{D6E6335C-274E-4FE4-8954-AF542F972C1B}"
+	ProjectSection(ProjectDependencies) = postProject
+		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B} = {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}
+	EndProjectSection
+EndProject
 Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug DLL CMD = Debug DLL CMD
-		Debug LIB CMD = Debug LIB CMD
-		Release DLL CMD = Release DLL CMD
-		Release LIB CMD = Release LIB CMD
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug CMD|Win32 = Debug CMD|Win32
+		Debug CMD|x64 = Debug CMD|x64
+		Release CMD|Win32 = Release CMD|Win32
+		Release CMD|x64 = Release CMD|x64
 	EndGlobalSection
-	GlobalSection(ProjectDependencies) = postSolution
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32
+		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug CMD|Win32.Build.0 = Debug CMD|Win32
+		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug CMD|x64.ActiveCfg = Debug CMD|x64
+		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug CMD|x64.Build.0 = Debug CMD|x64
+		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug CMD|x64.Build.2 = Debug GUI|x64
+		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release CMD|Win32.ActiveCfg = Release CMD|Win32
+		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release CMD|Win32.Build.0 = Release CMD|Win32
+		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release CMD|x64.ActiveCfg = Release CMD|x64
+		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release CMD|x64.Build.0 = Release CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065789}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065789}.Debug CMD|Win32.Build.0 = Debug CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065789}.Debug CMD|x64.ActiveCfg = Debug CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065789}.Debug CMD|x64.Build.0 = Debug CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065789}.Release CMD|Win32.ActiveCfg = Release CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065789}.Release CMD|Win32.Build.0 = Release CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065789}.Release CMD|x64.ActiveCfg = Release CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065789}.Release CMD|x64.Build.0 = Release CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065781}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065781}.Debug CMD|Win32.Build.0 = Debug CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065781}.Debug CMD|x64.ActiveCfg = Debug CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065781}.Debug CMD|x64.Build.0 = Debug CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065781}.Release CMD|Win32.ActiveCfg = Release CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065781}.Release CMD|Win32.Build.0 = Release CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065781}.Release CMD|x64.ActiveCfg = Release CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065781}.Release CMD|x64.Build.0 = Release CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065782}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065782}.Debug CMD|Win32.Build.0 = Debug CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065782}.Debug CMD|x64.ActiveCfg = Debug CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065782}.Debug CMD|x64.Build.0 = Debug CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065782}.Release CMD|Win32.ActiveCfg = Release CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065782}.Release CMD|Win32.Build.0 = Release CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065782}.Release CMD|x64.ActiveCfg = Release CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065782}.Release CMD|x64.Build.0 = Release CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065783}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065783}.Debug CMD|Win32.Build.0 = Debug CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065783}.Debug CMD|x64.ActiveCfg = Debug CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065783}.Debug CMD|x64.Build.0 = Debug CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065783}.Release CMD|Win32.ActiveCfg = Release CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065783}.Release CMD|Win32.Build.0 = Release CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065783}.Release CMD|x64.ActiveCfg = Release CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065783}.Release CMD|x64.Build.0 = Release CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065784}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065784}.Debug CMD|Win32.Build.0 = Debug CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065784}.Debug CMD|x64.ActiveCfg = Debug CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065784}.Debug CMD|x64.Build.0 = Debug CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065784}.Release CMD|Win32.ActiveCfg = Release CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065784}.Release CMD|Win32.Build.0 = Release CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065784}.Release CMD|x64.ActiveCfg = Release CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065784}.Release CMD|x64.Build.0 = Release CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065785}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065785}.Debug CMD|Win32.Build.0 = Debug CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065785}.Debug CMD|x64.ActiveCfg = Debug CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065785}.Debug CMD|x64.Build.0 = Debug CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065785}.Release CMD|Win32.ActiveCfg = Release CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065785}.Release CMD|Win32.Build.0 = Release CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065785}.Release CMD|x64.ActiveCfg = Release CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065785}.Release CMD|x64.Build.0 = Release CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065716}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065716}.Debug CMD|Win32.Build.0 = Debug CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065716}.Debug CMD|x64.ActiveCfg = Debug CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065716}.Debug CMD|x64.Build.0 = Debug CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065716}.Release CMD|Win32.ActiveCfg = Release CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065716}.Release CMD|Win32.Build.0 = Release CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065716}.Release CMD|x64.ActiveCfg = Release CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065716}.Release CMD|x64.Build.0 = Release CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065711}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065711}.Debug CMD|Win32.Build.0 = Debug CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065711}.Debug CMD|x64.ActiveCfg = Debug CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065711}.Debug CMD|x64.Build.0 = Debug CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065711}.Release CMD|Win32.ActiveCfg = Release CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065711}.Release CMD|Win32.Build.0 = Release CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065711}.Release CMD|x64.ActiveCfg = Release CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065711}.Release CMD|x64.Build.0 = Release CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065712}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065712}.Debug CMD|Win32.Build.0 = Debug CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065712}.Debug CMD|x64.ActiveCfg = Debug CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065712}.Debug CMD|x64.Build.0 = Debug CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065712}.Release CMD|Win32.ActiveCfg = Release CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065712}.Release CMD|Win32.Build.0 = Release CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065712}.Release CMD|x64.ActiveCfg = Release CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065712}.Release CMD|x64.Build.0 = Release CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065786}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065786}.Debug CMD|Win32.Build.0 = Debug CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065786}.Debug CMD|x64.ActiveCfg = Debug CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065786}.Debug CMD|x64.Build.0 = Debug CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065786}.Release CMD|Win32.ActiveCfg = Release CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065786}.Release CMD|Win32.Build.0 = Release CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065786}.Release CMD|x64.ActiveCfg = Release CMD|x64
+		{20D1E094-A4B5-4294-85CE-229529065786}.Release CMD|x64.Build.0 = Release CMD|x64
+		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32
+		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug CMD|Win32.Build.0 = Debug CMD|Win32
+		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug CMD|x64.ActiveCfg = Debug CMD|x64
+		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug CMD|x64.Build.0 = Debug CMD|x64
+		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|Win32.ActiveCfg = Release CMD|Win32
+		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|Win32.Build.0 = Release CMD|Win32
+		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|x64.ActiveCfg = Release CMD|x64
+		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|x64.Build.0 = Release CMD|x64
+		{D6E6335C-274E-4FE4-8954-AF542F972C1B}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32
+		{D6E6335C-274E-4FE4-8954-AF542F972C1B}.Debug CMD|Win32.Build.0 = Debug CMD|Win32
+		{D6E6335C-274E-4FE4-8954-AF542F972C1B}.Debug CMD|x64.ActiveCfg = Debug CMD|x64
+		{D6E6335C-274E-4FE4-8954-AF542F972C1B}.Debug CMD|x64.Build.0 = Debug CMD|x64
+		{D6E6335C-274E-4FE4-8954-AF542F972C1B}.Release CMD|Win32.ActiveCfg = Release CMD|Win32
+		{D6E6335C-274E-4FE4-8954-AF542F972C1B}.Release CMD|Win32.Build.0 = Release CMD|Win32
+		{D6E6335C-274E-4FE4-8954-AF542F972C1B}.Release CMD|x64.ActiveCfg = Release CMD|x64
+		{D6E6335C-274E-4FE4-8954-AF542F972C1B}.Release CMD|x64.Build.0 = Release CMD|x64
 	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug DLL CMD.ActiveCfg = Debug DLL CMD|Win32
-		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug DLL CMD.Build.0 = Debug DLL CMD|Win32
-		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug LIB CMD.ActiveCfg = Debug LIB CMD|Win32
-		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug LIB CMD.Build.0 = Debug LIB CMD|Win32
-		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release DLL CMD.ActiveCfg = Release DLL CMD|Win32
-		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release DLL CMD.Build.0 = Release DLL CMD|Win32
-		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release LIB CMD.ActiveCfg = Release LIB CMD|Win32
-		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release LIB CMD.Build.0 = Release LIB CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065789}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065789}.Debug DLL CMD.Build.0 = Debug DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065789}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065789}.Debug LIB CMD.Build.0 = Debug LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065789}.Release DLL CMD.ActiveCfg = Release DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065789}.Release DLL CMD.Build.0 = Release DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065789}.Release LIB CMD.ActiveCfg = Release LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065789}.Release LIB CMD.Build.0 = Release LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065781}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065781}.Debug DLL CMD.Build.0 = Debug DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065781}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065781}.Debug LIB CMD.Build.0 = Debug LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065781}.Release DLL CMD.ActiveCfg = Release DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065781}.Release DLL CMD.Build.0 = Release DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065781}.Release LIB CMD.ActiveCfg = Release LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065781}.Release LIB CMD.Build.0 = Release LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065782}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065782}.Debug DLL CMD.Build.0 = Debug DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065782}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065782}.Debug LIB CMD.Build.0 = Debug LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065782}.Release DLL CMD.ActiveCfg = Release DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065782}.Release DLL CMD.Build.0 = Release DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065782}.Release LIB CMD.ActiveCfg = Release LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065782}.Release LIB CMD.Build.0 = Release LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065783}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065783}.Debug DLL CMD.Build.0 = Debug DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065783}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065783}.Debug LIB CMD.Build.0 = Debug LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065783}.Release DLL CMD.ActiveCfg = Release DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065783}.Release DLL CMD.Build.0 = Release DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065783}.Release LIB CMD.ActiveCfg = Release LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065783}.Release LIB CMD.Build.0 = Release LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065784}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065784}.Debug DLL CMD.Build.0 = Debug DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065784}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065784}.Debug LIB CMD.Build.0 = Debug LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065784}.Release DLL CMD.ActiveCfg = Release DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065784}.Release DLL CMD.Build.0 = Release DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065784}.Release LIB CMD.ActiveCfg = Release LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065784}.Release LIB CMD.Build.0 = Release LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065785}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065785}.Debug DLL CMD.Build.0 = Debug DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065785}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065785}.Debug LIB CMD.Build.0 = Debug LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065785}.Release DLL CMD.ActiveCfg = Release DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065785}.Release DLL CMD.Build.0 = Release DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065785}.Release LIB CMD.ActiveCfg = Release LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065785}.Release LIB CMD.Build.0 = Release LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065716}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065716}.Debug DLL CMD.Build.0 = Debug DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065716}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065716}.Debug LIB CMD.Build.0 = Debug LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065716}.Release DLL CMD.ActiveCfg = Release DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065716}.Release DLL CMD.Build.0 = Release DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065716}.Release LIB CMD.ActiveCfg = Release LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065716}.Release LIB CMD.Build.0 = Release LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065711}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065711}.Debug DLL CMD.Build.0 = Debug DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065711}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065711}.Debug LIB CMD.Build.0 = Debug LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065711}.Release DLL CMD.ActiveCfg = Release DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065711}.Release DLL CMD.Build.0 = Release DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065711}.Release LIB CMD.ActiveCfg = Release LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065711}.Release LIB CMD.Build.0 = Release LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065712}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065712}.Debug DLL CMD.Build.0 = Debug DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065712}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065712}.Debug LIB CMD.Build.0 = Debug LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065712}.Release DLL CMD.ActiveCfg = Release DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065712}.Release DLL CMD.Build.0 = Release DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065712}.Release LIB CMD.ActiveCfg = Release LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065712}.Release LIB CMD.Build.0 = Release LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065786}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065786}.Debug DLL CMD.Build.0 = Debug DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065786}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065786}.Debug LIB CMD.Build.0 = Debug LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065786}.Release DLL CMD.ActiveCfg = Release DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065786}.Release DLL CMD.Build.0 = Release DLL|Win32
-		{20D1E094-A4B5-4294-85CE-229529065786}.Release LIB CMD.ActiveCfg = Release LIB|Win32
-		{20D1E094-A4B5-4294-85CE-229529065786}.Release LIB CMD.Build.0 = Release LIB|Win32
-		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32
-		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug DLL CMD.Build.0 = Debug DLL|Win32
-		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32
-		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug LIB CMD.Build.0 = Debug LIB|Win32
-		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release DLL CMD.ActiveCfg = Release DLL|Win32
-		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release DLL CMD.Build.0 = Release DLL|Win32
-		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release LIB CMD.ActiveCfg = Release LIB|Win32
-		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release LIB CMD.Build.0 = Release LIB|Win32
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
 EndGlobal

Modified: trunk/libpano/libpano.vcproj
===================================================================
--- trunk/libpano/libpano.vcproj	2009-11-08 03:05:46 UTC (rev 1136)
+++ trunk/libpano/libpano.vcproj	2009-11-08 03:09:24 UTC (rev 1137)
@@ -1,425 +1,589 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="9.00"
 	Name="pano13"
 	ProjectGUID="{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}"
 	RootNamespace="Panotools"
-	Keyword="MakeFileProj">
+	Keyword="MakeFileProj"
+	TargetFrameworkVersion="131072"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="Release DLL CMD|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0">
+			Name="Debug CMD|Win32"
+			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
+			ConfigurationType="4"
+			CharacterSet="0"
+			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="0"
-				FavorSizeOrSpeed="0"
+				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;;&quot;$(JDK_HOME)\include&quot;;&quot;$(JDK_HOME)\include\win32&quot;"
-				PreprocessorDefinitions="WIN32;_CONSOLE;_USRDLL;HasJava"
-				RuntimeLibrary="2"
+				PreprocessorDefinitions="WIN32;_CONSOLE;_LIB"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
 				StructMemberAlignment="4"
+				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="0"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
 				CallingConvention="0"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCLinkerTool"
-				RegisterOutput="FALSE"
-				IgnoreImportLibrary="FALSE"
-				AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib"
-				OutputFile="$(OutDir)/pano13.dll"
-				LinkIncremental="0"
-				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib&quot;"
-				IgnoreAllDefaultLibraries="FALSE"
-				IgnoreDefaultLibraryNames="LIBCMT"
-				ModuleDefinitionFile="pano13vc.def"
-				GenerateDebugInformation="FALSE"
-				EntryPointSymbol=""
-				ImportLibrary="$(OutDir)/pano13.lib"
-				TargetMachine="1"/>
+				Name="VCResourceCompilerTool"
+				ResourceOutputFileName=""
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCPreLinkEventTool"
+				CommandLine=""
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCLibrarianTool"
+				IgnoreAllDefaultLibraries="true"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				ResourceOutputFileName="$(IntDir)/pano13.res"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release CMD|Win32"
+			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
+			ConfigurationType="4"
+			CharacterSet="0"
+			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
+			>
 			<Tool
-				Name="VCWebDeploymentTool"/>
+				Name="VCPreBuildEventTool"
+			/>
 			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
+				Name="VCCustomBuildTool"
+			/>
 			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug DLL CMD|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0">
+				Name="VCXMLDataGeneratorTool"
+			/>
 			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="2"
+				InlineFunctionExpansion="0"
+				FavorSizeOrSpeed="0"
 				AdditionalIncludeDirectories="&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;;&quot;$(JDK_HOME)\include&quot;;&quot;$(JDK_HOME)\include\win32&quot;"
-				PreprocessorDefinitions="WIN32;_CONSOLE;_USRDLL;HasJava"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="WIN32;_CONSOLE;_LIB"
+				RuntimeLibrary="0"
 				StructMemberAlignment="4"
+				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="0"
 				CallingConvention="0"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="wxtiffd.lib wxzlibd.lib wxjpegd.lib wxpngd.lib Ws2_32.lib odbc32.lib odbccp32.lib version.lib"
-				OutputFile="$(OutDir)/pano13.dll"
-				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib&quot;"
-				IgnoreAllDefaultLibraries="FALSE"
-				IgnoreDefaultLibraryNames="LIBCMTD"
-				ModuleDefinitionFile="pano13vc.def"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
-				EntryPointSymbol=""
-				ImportLibrary="$(OutDir)/pano13.lib"
-				TargetMachine="1"/>
+				Name="VCResourceCompilerTool"
+				ResourceOutputFileName=""
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCPreLinkEventTool"
+				CommandLine=""
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCLibrarianTool"
+				IgnoreAllDefaultLibraries="true"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				ResourceOutputFileName="$(IntDir)/pano13.res"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
-			Name="Debug LIB CMD|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			Name="Debug GUI|Win32"
+			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="4"
-			CharacterSet="0">
+			CharacterSet="0"
+			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;;&quot;$(JDK_HOME)\include&quot;;&quot;$(JDK_HOME)\include\win32&quot;"
-				PreprocessorDefinitions="WIN32;_CONSOLE;_LIB;HasJava"
-				MinimalRebuild="TRUE"
+				PreprocessorDefinitions="WIN32;_WINDOWS;_LIB"
+				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				StructMemberAlignment="4"
+				EnableFunctionLevelLinking="true"
+				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 				CallingConvention="0"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCLibrarianTool"
-				IgnoreAllDefaultLibraries="TRUE"/>
+				Name="VCResourceCompilerTool"
+				ResourceOutputFileName=""
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCPreLinkEventTool"
+				CommandLine=""
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCLibrarianTool"
+				IgnoreAllDefaultLibraries="true"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				ResourceOutputFileName=""/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
-			Name="Release LIB CMD|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			Name="Release GUI|Win32"
+			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="4"
-			CharacterSet="0">
+			CharacterSet="0"
+			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="0"
 				FavorSizeOrSpeed="0"
 				AdditionalIncludeDirectories="&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;;&quot;$(JDK_HOME)\include&quot;;&quot;$(JDK_HOME)\include\win32&quot;"
-				PreprocessorDefinitions="WIN32;_CONSOLE;_LIB;HasJava"
+				PreprocessorDefinitions="WIN32;_WINDOWS;_LIB"
 				RuntimeLibrary="0"
 				StructMemberAlignment="4"
+				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="0"
 				CallingConvention="0"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCLibrarianTool"
-				IgnoreAllDefaultLibraries="TRUE"/>
+				Name="VCResourceCompilerTool"
+				ResourceOutputFileName=""
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCPreLinkEventTool"
+				CommandLine=""
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCLibrarianTool"
+				IgnoreAllDefaultLibraries="true"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				ResourceOutputFileName=""/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
-			Name="Debug LIB GUI|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			Name="Debug CMD|x64"
+			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="4"
-			CharacterSet="0">
+			CharacterSet="0"
+			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;;&quot;$(JDK_HOME)\include&quot;;&quot;$(JDK_HOME)\include\win32&quot;"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_LIB;HasJava"
-				MinimalRebuild="TRUE"
+				PreprocessorDefinitions="WIN32;_CONSOLE;_LIB"
+				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				StructMemberAlignment="4"
+				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 				CallingConvention="0"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				ResourceOutputFileName=""
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+				CommandLine=""
+			/>
+			<Tool
 				Name="VCLibrarianTool"
-				IgnoreAllDefaultLibraries="TRUE"/>
+				IgnoreAllDefaultLibraries="true"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				ResourceOutputFileName=""/>
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release CMD|x64"
+			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
+			ConfigurationType="4"
+			CharacterSet="0"
+			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
+			>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCPreBuildEventTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCCustomBuildTool"
+			/>
 			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
+				Name="VCXMLDataGeneratorTool"
+			/>
 			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug DLL GUI|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0">
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
 			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="2"
+				InlineFunctionExpansion="0"
+				FavorSizeOrSpeed="0"
 				AdditionalIncludeDirectories="&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;;&quot;$(JDK_HOME)\include&quot;;&quot;$(JDK_HOME)\include\win32&quot;"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;HasJava"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="WIN32;_CONSOLE;_LIB"
+				RuntimeLibrary="0"
 				StructMemberAlignment="4"
+				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="0"
 				CallingConvention="0"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="wxtiffd.lib wxzlibd.lib wxjpegd.lib wxpngd.lib Ws2_32.lib odbc32.lib odbccp32.lib version.lib"
-				OutputFile="$(OutDir)/pano13.dll"
-				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib&quot;"
-				IgnoreAllDefaultLibraries="FALSE"
-				IgnoreDefaultLibraryNames="LIBCMTD"
-				ModuleDefinitionFile="pano13vc.def"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
-				EntryPointSymbol=""
-				ImportLibrary="$(OutDir)/pano13.lib"
-				TargetMachine="1"/>
+				Name="VCResourceCompilerTool"
+				ResourceOutputFileName=""
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCPreLinkEventTool"
+				CommandLine=""
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCLibrarianTool"
+				IgnoreAllDefaultLibraries="true"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				ResourceOutputFileName="$(IntDir)/pano13.res"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
-			Name="Release LIB GUI|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			Name="Debug GUI|x64"
+			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="4"
-			CharacterSet="0">
+			CharacterSet="0"
+			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="0"
-				FavorSizeOrSpeed="0"
+				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;;&quot;$(JDK_HOME)\include&quot;;&quot;$(JDK_HOME)\include\win32&quot;"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_LIB;HasJava"
-				RuntimeLibrary="0"
+				PreprocessorDefinitions="WIN32;_WINDOWS;_LIB"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
 				StructMemberAlignment="4"
+				EnableFunctionLevelLinking="true"
+				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="0"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
 				CallingConvention="0"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				ResourceOutputFileName=""
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+				CommandLine=""
+			/>
+			<Tool
 				Name="VCLibrarianTool"
-				IgnoreAllDefaultLibraries="TRUE"/>
+				IgnoreAllDefaultLibraries="true"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				ResourceOutputFileName=""/>
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release GUI|x64"
+			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
+			ConfigurationType="4"
+			CharacterSet="0"
+			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
+			>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCPreBuildEventTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCCustomBuildTool"
+			/>
 			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
+				Name="VCXMLDataGeneratorTool"
+			/>
 			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release DLL GUI|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0">
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
 			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="0"
 				FavorSizeOrSpeed="0"
 				AdditionalIncludeDirectories="&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;;&quot;$(JDK_HOME)\include&quot;;&quot;$(JDK_HOME)\include\win32&quot;"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;HasJava"
-				RuntimeLibrary="2"
+				PreprocessorDefinitions="WIN32;_WINDOWS;_LIB"
+				RuntimeLibrary="0"
 				StructMemberAlignment="4"
+				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="0"
 				CallingConvention="0"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCLinkerTool"
-				RegisterOutput="FALSE"
-				IgnoreImportLibrary="FALSE"
-				AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib"
-				OutputFile="$(OutDir)/pano13.dll"
-				LinkIncremental="0"
-				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib&quot;"
-				IgnoreAllDefaultLibraries="FALSE"
-				IgnoreDefaultLibraryNames="LIBCMT"
-				ModuleDefinitionFile="pano13vc.def"
-				GenerateDebugInformation="FALSE"
-				EntryPointSymbol=""
-				ImportLibrary="$(OutDir)/pano13.lib"
-				TargetMachine="1"/>
+				Name="VCResourceCompilerTool"
+				ResourceOutputFileName=""
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCPreLinkEventTool"
+				CommandLine=""
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCLibrarianTool"
+				IgnoreAllDefaultLibraries="true"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				ResourceOutputFileName="$(IntDir)/pano13.res"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -428,316 +592,451 @@
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
 			<File
-				RelativePath=".\adjust.c">
+				RelativePath=".\adjust.c"
+				>
 			</File>
 			<File
-				RelativePath=".\bmp.c">
+				RelativePath=".\bmp.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ColourBrightness.c">
+				RelativePath=".\ColourBrightness.c"
+				>
 			</File>
 			<File
-				RelativePath=".\correct.c">
+				RelativePath=".\correct.c"
+				>
 			</File>
 			<File
-				RelativePath=".\fftn.c">
+				RelativePath=".\fftn.c"
+				>
 			</File>
 			<File
-				RelativePath=".\file.c">
+				RelativePath=".\file.c"
+				>
 			</File>
 			<File
-				RelativePath=".\filter.c">
+				RelativePath=".\filter.c"
+				>
 			</File>
 			<File
-				RelativePath=".\fourier.c">
+				RelativePath=".\fourier.c"
+				>
 			</File>
 			<File
-				RelativePath=".\tools\compat_win32\getopt.c">
+				RelativePath=".\tools\compat_win32\getopt.c"
+				>
 			</File>
 			<File
-				RelativePath=".\hdrfile.c">
+				RelativePath=".\hdrfile.c"
+				>
 			</File>
 			<File
-				RelativePath=".\jpeg.c">
+				RelativePath=".\jpeg.c"
+				>
 			</File>
 			<File
-				RelativePath=".\jpegicc.c">
+				RelativePath=".\jpegicc.c"
+				>
 			</File>
 			<File
-				RelativePath=".\lmdif.c">
+				RelativePath=".\lmdif.c"
+				>
 			</File>
 			<File
-				RelativePath=".\math.c">
+				RelativePath=".\math.c"
+				>
 			</File>
 			<File
-				RelativePath=".\metadata.c">
+				RelativePath=".\metadata.c"
+				>
 			</File>
 			<File
-				RelativePath=".\morpher.c">
+				RelativePath=".\morpher.c"
+				>
 			</File>
 			<File
-				RelativePath=".\multilayer.c">
+				RelativePath=".\multilayer.c"
+				>
 			</File>
 			<File
-				RelativePath=".\optimize.c">
+				RelativePath=".\optimize.c"
+				>
 			</File>
 			<File
-				RelativePath=".\parser.c">
+				RelativePath=".\parser.c"
+				>
 			</File>
 			<File
-				RelativePath=".\perspect.c">
+				RelativePath=".\perspect.c"
+				>
 			</File>
 			<File
-				RelativePath=".\png.c">
+				RelativePath=".\png.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ppm.c">
+				RelativePath=".\ppm.c"
+				>
 			</File>
 			<File
-				RelativePath=".\PTcommon.c">
+				RelativePath=".\PTcommon.c"
+				>
 			</File>
 			<File
-				RelativePath=".\PTDialogs.c">
+				RelativePath=".\PTDialogs.c"
+				>
 			</File>
 			<File
-				RelativePath=".\pteditor.c">
+				RelativePath=".\pteditor.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ptfeather.c">
+				RelativePath=".\ptfeather.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ptpicker.c">
+				RelativePath=".\ptpicker.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ptstitch.c">
+				RelativePath=".\ptstitch.c"
+				>
 			</File>
 			<File
-				RelativePath=".\queryfeature.c">
+				RelativePath=".\queryfeature.c"
+				>
 			</File>
 			<File
-				RelativePath=".\remap.c">
+				RelativePath=".\remap.c"
+				>
 			</File>
 			<File
-				RelativePath=".\resample.c">
+				RelativePath=".\resample.c"
+				>
 			</File>
 			<File
-				RelativePath=".\rgbe.c">
+				RelativePath=".\rgbe.c"
+				>
 			</File>
 			<File
-				RelativePath=".\seamer.c">
+				RelativePath=".\seamer.c"
+				>
 			</File>
 			<File
-				RelativePath=".\sys_ansi.c">
+				RelativePath=".\sys_ansi.c"
+				>
 				<FileConfiguration
-					Name="Debug LIB GUI|Win32"
-					ExcludedFromBuild="TRUE">
+					Name="Debug GUI|Win32"
+					ExcludedFromBuild="true"
+					>
 					<Tool
-						Name="VCCLCompilerTool"/>
+						Name="VCCLCompilerTool"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug DLL GUI|Win32"
-					ExcludedFromBuild="TRUE">
+					Name="Release GUI|Win32"
+					ExcludedFromBuild="true"
+					>
 					<Tool
-						Name="VCCLCompilerTool"/>
+						Name="VCCLCompilerTool"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release LIB GUI|Win32"
-					ExcludedFromBuild="TRUE">
+					Name="Debug GUI|x64"
+					ExcludedFromBuild="true"
+					>
 					<Tool
-						Name="VCCLCompilerTool"/>
+						Name="VCCLCompilerTool"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release DLL GUI|Win32"
-					ExcludedFromBuild="TRUE">
+					Name="Release GUI|x64"
+					ExcludedFromBuild="true"
+					>
 					<Tool
-						Name="VCCLCompilerTool"/>
+						Name="VCCLCompilerTool"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\sys_common.c">
+				RelativePath=".\sys_common.c"
+				>
 			</File>
 			<File
-				RelativePath=".\sys_win.c">
+				RelativePath=".\sys_win.c"
+				>
 				<FileConfiguration
-					Name="Release DLL CMD|Win32"
-					ExcludedFromBuild="TRUE">
+					Name="Debug CMD|Win32"
+					ExcludedFromBuild="true"
+					>
 					<Tool
-						Name="VCCLCompilerTool"/>
+						Name="VCCLCompilerTool"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug DLL CMD|Win32"
-					ExcludedFromBuild="TRUE">
+					Name="Release CMD|Win32"
+					ExcludedFromBuild="true"
+					>
 					<Tool
-						Name="VCCLCompilerTool"/>
+						Name="VCCLCompilerTool"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug LIB CMD|Win32"
-					ExcludedFromBuild="TRUE">
+					Name="Debug CMD|x64"
+					ExcludedFromBuild="true"
+					>
 					<Tool
-						Name="VCCLCompilerTool"/>
+						Name="VCCLCompilerTool"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release LIB CMD|Win32"
-					ExcludedFromBuild="TRUE">
+					Name="Release CMD|x64"
+					ExcludedFromBuild="true"
+					>
 					<Tool
-						Name="VCCLCompilerTool"/>
+						Name="VCCLCompilerTool"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\tiff.c">
+				RelativePath=".\tiff.c"
+				>
 			</File>
 			<File
-				RelativePath=".\Triangulate.c">
+				RelativePath=".\Triangulate.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ZComb.c">
+				RelativePath=".\ZComb.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
 			<File
-				RelativePath=".\ColourBrightness.h">
+				RelativePath=".\ColourBrightness.h"
+				>
 			</File>
 			<File
-				RelativePath=".\f2c.h">
+				RelativePath=".\f2c.h"
+				>
 			</File>
 			<File
-				RelativePath=".\fftn.h">
+				RelativePath=".\fftn.h"
+				>
 			</File>
 			<File
-				RelativePath=".\file.h">
+				RelativePath=".\file.h"
+				>
 			</File>
 			<File
-				RelativePath=".\filter.h">
+				RelativePath=".\filter.h"
+				>
 			</File>
 			<File
-				RelativePath=".\tools\compat_win32\getopt.h">
+				RelativePath=".\tools\compat_win32\getopt.h"
+				>
 			</File>
 			<File
-				RelativePath=".\metadata.h">
+				RelativePath=".\metadata.h"
+				>
 			</File>
 			<File
-				RelativePath=".\panorama.h">
+				RelativePath=".\panorama.h"
+				>
 			</File>
 			<File
-				RelativePath=".\pt_stdint.h">
+				RelativePath=".\pt_stdint.h"
+				>
 			</File>
 			<File
-				RelativePath=".\PTcommon.h">
+				RelativePath=".\PTcommon.h"
+				>
 			</File>
 			<File
-				RelativePath=".\pteditor.h">
+				RelativePath=".\pteditor.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ptutils.h">
+				RelativePath=".\ptutils.h"
+				>
 			</File>
 			<File
-				RelativePath=".\resource.h">
+				RelativePath=".\resource.h"
+				>
 			</File>
 			<File
-				RelativePath=".\rgbe.h">
+				RelativePath=".\rgbe.h"
+				>
 			</File>
 			<File
-				RelativePath=".\seamer.h">
+				RelativePath=".\seamer.h"
+				>
 			</File>
 			<File
-				RelativePath=".\sys_ansi.h">
+				RelativePath=".\sys_ansi.h"
+				>
 				<FileConfiguration
-					Name="Debug LIB GUI|Win32"
-					ExcludedFromBuild="TRUE">
+					Name="Debug GUI|Win32"
+					ExcludedFromBuild="true"
+					>
 					<Tool
-						Name="VCCustomBuildTool"/>
+						Name="VCCustomBuildTool"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug DLL GUI|Win32"
-					ExcludedFromBuild="TRUE">
+					Name="Release GUI|Win32"
+					ExcludedFromBuild="true"
+					>
 					<Tool
-						Name="VCCustomBuildTool"/>
+						Name="VCCustomBuildTool"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release LIB GUI|Win32"
-					ExcludedFromBuild="TRUE">
+					Name="Debug GUI|x64"
+					ExcludedFromBuild="true"
+					>
 					<Tool
-						Name="VCCustomBuildTool"/>
+						Name="VCCustomBuildTool"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release DLL GUI|Win32"
-					ExcludedFromBuild="TRUE">
+					Name="Release GUI|x64"
+					ExcludedFromBuild="true"
+					>
 					<Tool
-						Name="VCCustomBuildTool"/>
+						Name="VCCustomBuildTool"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\sys_win.h">
+				RelativePath=".\sys_win.h"
+				>
 				<FileConfiguration
-					Name="Release DLL CMD|Win32"
-					ExcludedFromBuild="TRUE">
+					Name="Debug CMD|Win32"
+					ExcludedFromBuild="true"
+					>
 					<Tool
-						Name="VCCustomBuildTool"/>
+						Name="VCCustomBuildTool"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug DLL CMD|Win32"
-					ExcludedFromBuild="TRUE">
+					Name="Release CMD|Win32"
+					ExcludedFromBuild="true"
+					>
 					<Tool
-						Name="VCCustomBuildTool"/>
+						Name="VCCustomBuildTool"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug LIB CMD|Win32"
-					ExcludedFromBuild="TRUE">
+					Name="Debug CMD|x64"
+					ExcludedFromBuild="true"
+					>
 					<Tool
-						Name="VCCustomBuildTool"/>
+						Name="VCCustomBuildTool"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release LIB CMD|Win32"
-					ExcludedFromBuild="TRUE">
+					Name="Release CMD|x64"
+					ExcludedFromBuild="true"
+					>
 					<Tool
-						Name="VCCustomBuildTool"/>
+						Name="VCCustomBuildTool"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\version.h">
+				RelativePath=".\version.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ZComb.h">
+				RelativePath=".\ZComb.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
 			<File
-				RelativePath=".\pano13.rc">
+				RelativePath=".\pano13.rc"
+				>
 				<FileConfiguration
-					Name="Debug LIB CMD|Win32"
-					ExcludedFromBuild="TRUE">
+					Name="Debug CMD|Win32"
+					ExcludedFromBuild="true"
+					>
 					<Tool
-						Name="VCResourceCompilerTool"/>
+						Name="VCResourceCompilerTool"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release LIB CMD|Win32"
-					ExcludedFromBuild="TRUE">
+					Name="Release CMD|Win32"
+					ExcludedFromBuild="true"
+					>
 					<Tool
-						Name="VCResourceCompilerTool"/>
+						Name="VCResourceCompilerTool"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug LIB GUI|Win32"
-					ExcludedFromBuild="TRUE">
+					Name="Debug GUI|Win32"
+					ExcludedFromBuild="true"
+					>
 					<Tool
-						Name="VCResourceCompilerTool"/>
+						Name="VCResourceCompilerTool"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release LIB GUI|Win32"
-					ExcludedFromBuild="TRUE">
+					Name="Release GUI|Win32"
+					ExcludedFromBuild="true"
+					>
 					<Tool
-						Name="VCResourceCompilerTool"/>
+						Name="VCResourceCompilerTool"
+					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug CMD|x64"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release CMD|x64"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug GUI|x64"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release GUI|x64"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\pano13vc.def">
+				RelativePath=".\pano13vc.def"
+				>
 			</File>
 		</Filter>
 	</Files>

Modified: trunk/libpano/tools/PTAInterpolate.vcproj
===================================================================
--- trunk/libpano/tools/PTAInterpolate.vcproj	2009-11-08 03:05:46 UTC (rev 1136)
+++ trunk/libpano/tools/PTAInterpolate.vcproj	2009-11-08 03:09:24 UTC (rev 1137)
@@ -1,216 +1,347 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="9.00"
 	Name="PTAInterpolate"
 	ProjectGUID="{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}"
-	Keyword="Win32Proj">
+	RootNamespace="PTAInterpolate"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="Debug LIB|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			Name="Debug CMD|Win32"
+			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
-			CharacterSet="2">
+			CharacterSet="2"
+			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="compat_win32;..\;&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="TRUE"
+				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="4"/>
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib"
 				OutputFile="$(OutDir)/PTAInterpolate.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib&quot;"
 				IgnoreDefaultLibraryNames="LIBCMT"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/PTAInterpolate.pdb"
 				SubSystem="1"
-				TargetMachine="1"/>
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
-			Name="Release LIB|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			Name="Release CMD|Win32"
+			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
-			CharacterSet="2">
+			CharacterSet="2"
+			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="compat_win32;..\;&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib"
 				OutputFile="$(OutDir)/PTAInterpolate.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib&quot;"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
-			Name="Debug DLL|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			Name="Debug CMD|x64"
+			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
-			CharacterSet="2">
+			CharacterSet="2"
+			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="compat_win32;..\;&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="TRUE"
+				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="4"/>
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib"
 				OutputFile="$(OutDir)/PTAInterpolate.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib&quot;"
+				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib64&quot;"
 				IgnoreDefaultLibraryNames="LIBCMT"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/PTAInterpolate.pdb"
 				SubSystem="1"
-				TargetMachine="1"/>
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
-			Name="Release DLL|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			Name="Release CMD|x64"
+			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
-			CharacterSet="2">
+			CharacterSet="2"
+			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="compat_win32;..\;&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib"
 				OutputFile="$(OutDir)/PTAInterpolate.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib&quot;"
-				GenerateDebugInformation="TRUE"
+				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib64&quot;"
+				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -219,22 +350,27 @@
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
 			<File
-				RelativePath=".\PTAInterpolate.c">
+				RelativePath=".\PTAInterpolate.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
 		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
 			<File
-				RelativePath=".\PTainterpolate.rc">
+				RelativePath=".\PTainterpolate.rc"
+				>
 			</File>
 		</Filter>
 	</Files>

Modified: trunk/libpano/tools/PTOptimizer.vcproj
===================================================================
--- trunk/libpano/tools/PTOptimizer.vcproj	2009-11-08 03:05:46 UTC (rev 1136)
+++ trunk/libpano/tools/PTOptimizer.vcproj	2009-11-08 03:09:24 UTC (rev 1137)
@@ -1,225 +1,355 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="9.00"
 	Name="PTOptimizer"
 	ProjectGUID="{20D1E094-A4B5-4294-85CE-229529065785}"
 	RootNamespace="PTOptimizer"
-	Keyword="Win32Proj">
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="Debug LIB|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			Name="Debug CMD|Win32"
+			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
-			CharacterSet="2">
+			CharacterSet="2"
+			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="compat_win32;..\;&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="TRUE"
+				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="4"/>
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib"
 				OutputFile="$(OutDir)/PToptimizer.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib&quot;"
 				IgnoreDefaultLibraryNames="LIBCMT"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/PTOptimizer.pdb"
 				SubSystem="1"
-				TargetMachine="1"/>
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
-			Name="Release LIB|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			Name="Release CMD|Win32"
+			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
-			CharacterSet="2">
+			CharacterSet="2"
+			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="compat_win32;..\;&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib"
 				OutputFile="$(OutDir)/PTOptimizer.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib&quot;"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
-			Name="Debug DLL|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			Name="Debug CMD|x64"
+			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
-			CharacterSet="2">
+			CharacterSet="2"
+			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="compat_win32;..\;&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="TRUE"
+				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="4"/>
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib"
 				OutputFile="$(OutDir)/PToptimizer.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib&quot;"
+				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib64&quot;"
 				IgnoreDefaultLibraryNames="LIBCMT"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/PTOptimizer.pdb"
 				SubSystem="1"
-				TargetMachine="1"/>
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
-			Name="Release DLL|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			Name="Release CMD|x64"
+			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
-			CharacterSet="2">
+			CharacterSet="2"
+			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="compat_win32;..\;&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib"
 				OutputFile="$(OutDir)/PTOptimizer.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib&quot;"
-				GenerateDebugInformation="TRUE"
+				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib64&quot;"
+				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -228,22 +358,27 @@
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
 			<File
-				RelativePath=".\PToptimizer.c">
+				RelativePath=".\PToptimizer.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
 		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
 			<File
-				RelativePath=".\PToptimizer.rc">
+				RelativePath=".\PToptimizer.rc"
+				>
 			</File>
 		</Filter>
 	</Files>

Modified: trunk/libpano/tools/PTblender.vcproj
===================================================================
--- trunk/libpano/tools/PTblender.vcproj	2009-11-08 03:05:46 UTC (rev 1136)
+++ trunk/libpano/tools/PTblender.vcproj	2009-11-08 03:09:24 UTC (rev 1137)
@@ -1,217 +1,347 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="9.00"
 	Name="PTblender"
 	ProjectGUID="{20D1E094-A4B5-4294-85CE-229529065789}"
 	RootNamespace="PTblender"
-	Keyword="Win32Proj">
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="Debug LIB|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			Name="Debug CMD|Win32"
+			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
-			CharacterSet="2">
+			CharacterSet="2"
+			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="compat_win32;..\;&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="TRUE"
+				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="4"/>
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib"
 				OutputFile="$(OutDir)/PTblender.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib&quot;"
 				IgnoreDefaultLibraryNames="LIBCMT"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/PTblender.pdb"
 				SubSystem="1"
-				TargetMachine="1"/>
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
-			Name="Release LIB|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			Name="Release CMD|Win32"
+			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
-			CharacterSet="2">
+			CharacterSet="2"
+			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="compat_win32;..\;&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib"
 				OutputFile="$(OutDir)/PTblender.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib&quot;"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
-			Name="Debug DLL|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			Name="Debug CMD|x64"
+			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
-			CharacterSet="2">
+			CharacterSet="2"
+			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="compat_win32;..\;&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="TRUE"
+				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="4"/>
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib"
 				OutputFile="$(OutDir)/PTblender.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib&quot;"
+				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib64&quot;"
 				IgnoreDefaultLibraryNames="LIBCMT"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/PTblender.pdb"
 				SubSystem="1"
-				TargetMachine="1"/>
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
-			Name="Release DLL|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			Name="Release CMD|x64"
+			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
-			CharacterSet="2">
+			CharacterSet="2"
+			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="compat_win32;..\;&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib"
 				OutputFile="$(OutDir)/PTblender.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib&quot;"
-				GenerateDebugInformation="TRUE"
+				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib64&quot;"
+				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -220,25 +350,31 @@
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
 			<File
-				RelativePath=".\compat_win32\getopt.c">
+				RelativePath=".\compat_win32\getopt.c"
+				>
 			</File>
 			<File
-				RelativePath=".\PTblender.c">
+				RelativePath=".\PTblender.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
 		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
 			<File
-				RelativePath=".\PTblender.rc">
+				RelativePath=".\PTblender.rc"
+				>
 			</File>
 		</Filter>
 	</Files>

Modified: trunk/libpano/tools/PTcrop.vcproj
===================================================================
--- trunk/libpano/tools/PTcrop.vcproj	2009-11-08 03:05:46 UTC (rev 1136)
+++ trunk/libpano/tools/PTcrop.vcproj	2009-11-08 03:09:24 UTC (rev 1137)
@@ -1,216 +1,347 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="9.00"
 	Name="PTcrop"
 	ProjectGUID="{20D1E094-A4B5-4294-85CE-229529065781}"
-	Keyword="Win32Proj">
+	RootNamespace="PTcrop"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="Debug LIB|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			Name="Debug CMD|Win32"
+			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
-			CharacterSet="2">
+			CharacterSet="2"
+			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="compat_win32;..\;&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="TRUE"
+				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="4"/>
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib"
 				OutputFile="$(OutDir)/PTcrop.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib&quot;"
 				IgnoreDefaultLibraryNames="LIBCMT"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/PTcrop.pdb"
 				SubSystem="1"
-				TargetMachine="1"/>
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
-			Name="Release LIB|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			Name="Release CMD|Win32"
+			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
-			CharacterSet="2">
+			CharacterSet="2"
+			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="compat_win32;..\;&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib"
 				OutputFile="$(OutDir)/PTcrop.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib&quot;"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
-			Name="Debug DLL|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			Name="Debug CMD|x64"
+			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
-			CharacterSet="2">
+			CharacterSet="2"
+			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"

@@ Diff output truncated at 100000 characters. @@

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

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

From: <dmg@us...> - 2009-11-10 22:33

Revision: 1145
          http://panotools.svn.sourceforge.net/panotools/?rev=1145&view=rev
Author:   dmg
Date:     2009-11-10 22:33:19 +0000 (Tue, 10 Nov 2009)

Log Message:
-----------
reverting to revisions 1118 due to compilation errors

Modified Paths:
--------------
    trunk/libpano/ChangeLog
    trunk/libpano/libpano.sln
    trunk/libpano/libpano.vcproj
    trunk/libpano/libpano13.def
    trunk/libpano/math.c
    trunk/libpano/pano13vc.def
    trunk/libpano/sys_ansi.c
    trunk/libpano/sys_ansi.h
    trunk/libpano/tools/PTAInterpolate.vcproj
    trunk/libpano/tools/PTOptimizer.vcproj
    trunk/libpano/tools/PTblender.c
    trunk/libpano/tools/PTblender.vcproj
    trunk/libpano/tools/PTcrop.vcproj
    trunk/libpano/tools/PTinfo.vcproj
    trunk/libpano/tools/PTmasker.vcproj
    trunk/libpano/tools/PTmender.vcproj
    trunk/libpano/tools/PTroller.vcproj
    trunk/libpano/tools/PTtiff2psd.vcproj
    trunk/libpano/tools/PTtiffdump.vcproj
    trunk/libpano/tools/PTuncrop.vcproj

Removed Paths:
-------------
    trunk/libpano/tools/mpremap/
    trunk/libpano/tools/mpremap.c
    trunk/libpano/tools/mpremap.rc
    trunk/libpano/tools/mpremap.vcproj
    trunk/libpano/tools/ppmstream.c
    trunk/libpano/tools/ppmstream.h
    trunk/libpano/tools/preprocess.c
    trunk/libpano/tools/spline.c
    trunk/libpano/tools/string2.c
    trunk/libpano/tools/string2.h

Property Changed:
----------------
    trunk/libpano/tests/simpleStitch/reference/tiff_m_cropped0000.tif
    trunk/libpano/tests/simpleStitch/reference/tiff_m_cropped0001.tif
    trunk/libpano/tests/simpleStitch/reference/tiff_m_uncropped0000.tif
    trunk/libpano/tests/simpleStitch/reference/tiff_m_uncropped0001.tif

Modified: trunk/libpano/ChangeLog
===================================================================
--- trunk/libpano/ChangeLog	2009-11-10 20:49:43 UTC (rev 1144)
+++ trunk/libpano/ChangeLog	2009-11-10 22:33:19 UTC (rev 1145)
@@ -1,12 +1,3 @@
-2009-11-07 Jim Watters
-
-    * Added MPRemap
-      tools/mpremap.c, tools/mpremap.rc, tools/mpremap.vcproj, tools/ppmstream.c, tools/ppmstream.h, 
-      tools/preprocess.c, tools/spline.c, tools/string2.c, tools/string2.h, and  libpano/tools/mpremap/*.*
-      An updated version of Helmut Dersch's Moving Panoramas Remap for libPano13
-      http://webuser.fh-furtwangen.de/~dersch/mp/MotionPanoramas.html
-
-
 2009-10-11 dangelo
 
 	* filter.h, math.c: Use Te0 as plane_yaw and Te1 as

Modified: trunk/libpano/libpano.sln
===================================================================
--- trunk/libpano/libpano.sln	2009-11-10 20:49:43 UTC (rev 1144)
+++ trunk/libpano/libpano.sln	2009-11-10 22:33:19 UTC (rev 1145)
@@ -1,6 +1,7 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 8.00
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pano13", "libpano.vcproj", "{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTblender", "tools\PTblender.vcproj", "{20D1E094-A4B5-4294-85CE-229529065789}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -57,126 +58,115 @@
 		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B} = {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpremap", "tools\mpremap.vcproj", "{D6E6335C-274E-4FE4-8954-AF542F972C1B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B} = {9B19A5C0-8DB0-448B-BF99-DC6374E9751B}
-	EndProjectSection
-EndProject
 Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug CMD|Win32 = Debug CMD|Win32
-		Debug CMD|x64 = Debug CMD|x64
-		Release CMD|Win32 = Release CMD|Win32
-		Release CMD|x64 = Release CMD|x64
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug DLL CMD = Debug DLL CMD
+		Debug LIB CMD = Debug LIB CMD
+		Release DLL CMD = Release DLL CMD
+		Release LIB CMD = Release LIB CMD
 	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32
-		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug CMD|Win32.Build.0 = Debug CMD|Win32
-		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug CMD|x64.ActiveCfg = Debug CMD|x64
-		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug CMD|x64.Build.0 = Debug CMD|x64
-		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug CMD|x64.Build.2 = Debug GUI|x64
-		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release CMD|Win32.ActiveCfg = Release CMD|Win32
-		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release CMD|Win32.Build.0 = Release CMD|Win32
-		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release CMD|x64.ActiveCfg = Release CMD|x64
-		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release CMD|x64.Build.0 = Release CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065789}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065789}.Debug CMD|Win32.Build.0 = Debug CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065789}.Debug CMD|x64.ActiveCfg = Debug CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065789}.Debug CMD|x64.Build.0 = Debug CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065789}.Release CMD|Win32.ActiveCfg = Release CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065789}.Release CMD|Win32.Build.0 = Release CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065789}.Release CMD|x64.ActiveCfg = Release CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065789}.Release CMD|x64.Build.0 = Release CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065781}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065781}.Debug CMD|Win32.Build.0 = Debug CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065781}.Debug CMD|x64.ActiveCfg = Debug CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065781}.Debug CMD|x64.Build.0 = Debug CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065781}.Release CMD|Win32.ActiveCfg = Release CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065781}.Release CMD|Win32.Build.0 = Release CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065781}.Release CMD|x64.ActiveCfg = Release CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065781}.Release CMD|x64.Build.0 = Release CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065782}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065782}.Debug CMD|Win32.Build.0 = Debug CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065782}.Debug CMD|x64.ActiveCfg = Debug CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065782}.Debug CMD|x64.Build.0 = Debug CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065782}.Release CMD|Win32.ActiveCfg = Release CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065782}.Release CMD|Win32.Build.0 = Release CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065782}.Release CMD|x64.ActiveCfg = Release CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065782}.Release CMD|x64.Build.0 = Release CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065783}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065783}.Debug CMD|Win32.Build.0 = Debug CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065783}.Debug CMD|x64.ActiveCfg = Debug CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065783}.Debug CMD|x64.Build.0 = Debug CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065783}.Release CMD|Win32.ActiveCfg = Release CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065783}.Release CMD|Win32.Build.0 = Release CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065783}.Release CMD|x64.ActiveCfg = Release CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065783}.Release CMD|x64.Build.0 = Release CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065784}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065784}.Debug CMD|Win32.Build.0 = Debug CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065784}.Debug CMD|x64.ActiveCfg = Debug CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065784}.Debug CMD|x64.Build.0 = Debug CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065784}.Release CMD|Win32.ActiveCfg = Release CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065784}.Release CMD|Win32.Build.0 = Release CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065784}.Release CMD|x64.ActiveCfg = Release CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065784}.Release CMD|x64.Build.0 = Release CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065785}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065785}.Debug CMD|Win32.Build.0 = Debug CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065785}.Debug CMD|x64.ActiveCfg = Debug CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065785}.Debug CMD|x64.Build.0 = Debug CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065785}.Release CMD|Win32.ActiveCfg = Release CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065785}.Release CMD|Win32.Build.0 = Release CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065785}.Release CMD|x64.ActiveCfg = Release CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065785}.Release CMD|x64.Build.0 = Release CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065716}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065716}.Debug CMD|Win32.Build.0 = Debug CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065716}.Debug CMD|x64.ActiveCfg = Debug CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065716}.Debug CMD|x64.Build.0 = Debug CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065716}.Release CMD|Win32.ActiveCfg = Release CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065716}.Release CMD|Win32.Build.0 = Release CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065716}.Release CMD|x64.ActiveCfg = Release CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065716}.Release CMD|x64.Build.0 = Release CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065711}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065711}.Debug CMD|Win32.Build.0 = Debug CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065711}.Debug CMD|x64.ActiveCfg = Debug CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065711}.Debug CMD|x64.Build.0 = Debug CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065711}.Release CMD|Win32.ActiveCfg = Release CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065711}.Release CMD|Win32.Build.0 = Release CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065711}.Release CMD|x64.ActiveCfg = Release CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065711}.Release CMD|x64.Build.0 = Release CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065712}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065712}.Debug CMD|Win32.Build.0 = Debug CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065712}.Debug CMD|x64.ActiveCfg = Debug CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065712}.Debug CMD|x64.Build.0 = Debug CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065712}.Release CMD|Win32.ActiveCfg = Release CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065712}.Release CMD|Win32.Build.0 = Release CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065712}.Release CMD|x64.ActiveCfg = Release CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065712}.Release CMD|x64.Build.0 = Release CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065786}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065786}.Debug CMD|Win32.Build.0 = Debug CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065786}.Debug CMD|x64.ActiveCfg = Debug CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065786}.Debug CMD|x64.Build.0 = Debug CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065786}.Release CMD|Win32.ActiveCfg = Release CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065786}.Release CMD|Win32.Build.0 = Release CMD|Win32
-		{20D1E094-A4B5-4294-85CE-229529065786}.Release CMD|x64.ActiveCfg = Release CMD|x64
-		{20D1E094-A4B5-4294-85CE-229529065786}.Release CMD|x64.Build.0 = Release CMD|x64
-		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32
-		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug CMD|Win32.Build.0 = Debug CMD|Win32
-		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug CMD|x64.ActiveCfg = Debug CMD|x64
-		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug CMD|x64.Build.0 = Debug CMD|x64
-		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|Win32.ActiveCfg = Release CMD|Win32
-		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|Win32.Build.0 = Release CMD|Win32
-		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|x64.ActiveCfg = Release CMD|x64
-		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release CMD|x64.Build.0 = Release CMD|x64
-		{D6E6335C-274E-4FE4-8954-AF542F972C1B}.Debug CMD|Win32.ActiveCfg = Debug CMD|Win32
-		{D6E6335C-274E-4FE4-8954-AF542F972C1B}.Debug CMD|Win32.Build.0 = Debug CMD|Win32
-		{D6E6335C-274E-4FE4-8954-AF542F972C1B}.Debug CMD|x64.ActiveCfg = Debug CMD|x64
-		{D6E6335C-274E-4FE4-8954-AF542F972C1B}.Debug CMD|x64.Build.0 = Debug CMD|x64
-		{D6E6335C-274E-4FE4-8954-AF542F972C1B}.Release CMD|Win32.ActiveCfg = Release CMD|Win32
-		{D6E6335C-274E-4FE4-8954-AF542F972C1B}.Release CMD|Win32.Build.0 = Release CMD|Win32
-		{D6E6335C-274E-4FE4-8954-AF542F972C1B}.Release CMD|x64.ActiveCfg = Release CMD|x64
-		{D6E6335C-274E-4FE4-8954-AF542F972C1B}.Release CMD|x64.Build.0 = Release CMD|x64
+	GlobalSection(ProjectDependencies) = postSolution
 	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
+	GlobalSection(ProjectConfiguration) = postSolution
+		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug DLL CMD.ActiveCfg = Debug DLL CMD|Win32
+		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug DLL CMD.Build.0 = Debug DLL CMD|Win32
+		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug LIB CMD.ActiveCfg = Debug LIB CMD|Win32
+		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Debug LIB CMD.Build.0 = Debug LIB CMD|Win32
+		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release DLL CMD.ActiveCfg = Release DLL CMD|Win32
+		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release DLL CMD.Build.0 = Release DLL CMD|Win32
+		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release LIB CMD.ActiveCfg = Release LIB CMD|Win32
+		{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}.Release LIB CMD.Build.0 = Release LIB CMD|Win32
+		{20D1E094-A4B5-4294-85CE-229529065789}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065789}.Debug DLL CMD.Build.0 = Debug DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065789}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065789}.Debug LIB CMD.Build.0 = Debug LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065789}.Release DLL CMD.ActiveCfg = Release DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065789}.Release DLL CMD.Build.0 = Release DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065789}.Release LIB CMD.ActiveCfg = Release LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065789}.Release LIB CMD.Build.0 = Release LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065781}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065781}.Debug DLL CMD.Build.0 = Debug DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065781}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065781}.Debug LIB CMD.Build.0 = Debug LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065781}.Release DLL CMD.ActiveCfg = Release DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065781}.Release DLL CMD.Build.0 = Release DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065781}.Release LIB CMD.ActiveCfg = Release LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065781}.Release LIB CMD.Build.0 = Release LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065782}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065782}.Debug DLL CMD.Build.0 = Debug DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065782}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065782}.Debug LIB CMD.Build.0 = Debug LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065782}.Release DLL CMD.ActiveCfg = Release DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065782}.Release DLL CMD.Build.0 = Release DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065782}.Release LIB CMD.ActiveCfg = Release LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065782}.Release LIB CMD.Build.0 = Release LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065783}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065783}.Debug DLL CMD.Build.0 = Debug DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065783}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065783}.Debug LIB CMD.Build.0 = Debug LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065783}.Release DLL CMD.ActiveCfg = Release DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065783}.Release DLL CMD.Build.0 = Release DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065783}.Release LIB CMD.ActiveCfg = Release LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065783}.Release LIB CMD.Build.0 = Release LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065784}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065784}.Debug DLL CMD.Build.0 = Debug DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065784}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065784}.Debug LIB CMD.Build.0 = Debug LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065784}.Release DLL CMD.ActiveCfg = Release DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065784}.Release DLL CMD.Build.0 = Release DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065784}.Release LIB CMD.ActiveCfg = Release LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065784}.Release LIB CMD.Build.0 = Release LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065785}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065785}.Debug DLL CMD.Build.0 = Debug DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065785}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065785}.Debug LIB CMD.Build.0 = Debug LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065785}.Release DLL CMD.ActiveCfg = Release DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065785}.Release DLL CMD.Build.0 = Release DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065785}.Release LIB CMD.ActiveCfg = Release LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065785}.Release LIB CMD.Build.0 = Release LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065716}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065716}.Debug DLL CMD.Build.0 = Debug DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065716}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065716}.Debug LIB CMD.Build.0 = Debug LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065716}.Release DLL CMD.ActiveCfg = Release DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065716}.Release DLL CMD.Build.0 = Release DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065716}.Release LIB CMD.ActiveCfg = Release LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065716}.Release LIB CMD.Build.0 = Release LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065711}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065711}.Debug DLL CMD.Build.0 = Debug DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065711}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065711}.Debug LIB CMD.Build.0 = Debug LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065711}.Release DLL CMD.ActiveCfg = Release DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065711}.Release DLL CMD.Build.0 = Release DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065711}.Release LIB CMD.ActiveCfg = Release LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065711}.Release LIB CMD.Build.0 = Release LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065712}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065712}.Debug DLL CMD.Build.0 = Debug DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065712}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065712}.Debug LIB CMD.Build.0 = Debug LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065712}.Release DLL CMD.ActiveCfg = Release DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065712}.Release DLL CMD.Build.0 = Release DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065712}.Release LIB CMD.ActiveCfg = Release LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065712}.Release LIB CMD.Build.0 = Release LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065786}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065786}.Debug DLL CMD.Build.0 = Debug DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065786}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065786}.Debug LIB CMD.Build.0 = Debug LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065786}.Release DLL CMD.ActiveCfg = Release DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065786}.Release DLL CMD.Build.0 = Release DLL|Win32
+		{20D1E094-A4B5-4294-85CE-229529065786}.Release LIB CMD.ActiveCfg = Release LIB|Win32
+		{20D1E094-A4B5-4294-85CE-229529065786}.Release LIB CMD.Build.0 = Release LIB|Win32
+		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug DLL CMD.ActiveCfg = Debug DLL|Win32
+		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug DLL CMD.Build.0 = Debug DLL|Win32
+		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug LIB CMD.ActiveCfg = Debug LIB|Win32
+		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Debug LIB CMD.Build.0 = Debug LIB|Win32
+		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release DLL CMD.ActiveCfg = Release DLL|Win32
+		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release DLL CMD.Build.0 = Release DLL|Win32
+		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release LIB CMD.ActiveCfg = Release LIB|Win32
+		{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}.Release LIB CMD.Build.0 = Release LIB|Win32
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
 EndGlobal

Modified: trunk/libpano/libpano.vcproj
===================================================================
--- trunk/libpano/libpano.vcproj	2009-11-10 20:49:43 UTC (rev 1144)
+++ trunk/libpano/libpano.vcproj	2009-11-10 22:33:19 UTC (rev 1145)
@@ -1,589 +1,425 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="7.10"
 	Name="pano13"
 	ProjectGUID="{9B19A5C0-8DB0-448B-BF99-DC6374E9751B}"
 	RootNamespace="Panotools"
-	Keyword="MakeFileProj"
-	TargetFrameworkVersion="131072"
-	>
+	Keyword="MakeFileProj">
 	<Platforms>
 		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
+			Name="Win32"/>
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="Debug CMD|Win32"
-			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
-			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
-			>
+			Name="Release DLL CMD|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="0">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="2"
+				InlineFunctionExpansion="0"
+				FavorSizeOrSpeed="0"
 				AdditionalIncludeDirectories="&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;;&quot;$(JDK_HOME)\include&quot;;&quot;$(JDK_HOME)\include\win32&quot;"
-				PreprocessorDefinitions="WIN32;_CONSOLE;_LIB"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				PreprocessorDefinitions="WIN32;_CONSOLE;_USRDLL;HasJava"
+				RuntimeLibrary="2"
 				StructMemberAlignment="4"
-				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="0"
 				CallingConvention="0"
-				CompileAs="0"
-			/>
+				CompileAs="0"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				ResourceOutputFileName=""
-			/>
+				Name="VCLinkerTool"
+				RegisterOutput="FALSE"
+				IgnoreImportLibrary="FALSE"
+				AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib"
+				OutputFile="$(OutDir)/pano13.dll"
+				LinkIncremental="0"
+				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib&quot;"
+				IgnoreAllDefaultLibraries="FALSE"
+				IgnoreDefaultLibraryNames="LIBCMT"
+				ModuleDefinitionFile="pano13vc.def"
+				GenerateDebugInformation="FALSE"
+				EntryPointSymbol=""
+				ImportLibrary="$(OutDir)/pano13.lib"
+				TargetMachine="1"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine=""
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCLibrarianTool"
-				IgnoreAllDefaultLibraries="true"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCResourceCompilerTool"
+				ResourceOutputFileName="$(IntDir)/pano13.res"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release CMD|Win32"
-			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
-			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
-			>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug DLL CMD|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="0">
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="0"
-				FavorSizeOrSpeed="0"
+				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;;&quot;$(JDK_HOME)\include&quot;;&quot;$(JDK_HOME)\include\win32&quot;"
-				PreprocessorDefinitions="WIN32;_CONSOLE;_LIB"
-				RuntimeLibrary="0"
+				PreprocessorDefinitions="WIN32;_CONSOLE;_USRDLL;HasJava"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
 				StructMemberAlignment="4"
-				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="0"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="3"
 				CallingConvention="0"
-				CompileAs="0"
-			/>
+				CompileAs="0"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				ResourceOutputFileName=""
-			/>
+				Name="VCLinkerTool"
+				AdditionalDependencies="wxtiffd.lib wxzlibd.lib wxjpegd.lib wxpngd.lib Ws2_32.lib odbc32.lib odbccp32.lib version.lib"
+				OutputFile="$(OutDir)/pano13.dll"
+				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib&quot;"
+				IgnoreAllDefaultLibraries="FALSE"
+				IgnoreDefaultLibraryNames="LIBCMTD"
+				ModuleDefinitionFile="pano13vc.def"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				EntryPointSymbol=""
+				ImportLibrary="$(OutDir)/pano13.lib"
+				TargetMachine="1"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine=""
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCLibrarianTool"
-				IgnoreAllDefaultLibraries="true"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCResourceCompilerTool"
+				ResourceOutputFileName="$(IntDir)/pano13.res"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Debug GUI|Win32"
-			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
-			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
+			Name="Debug LIB CMD|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
-			CharacterSet="0"
-			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
-			>
+			CharacterSet="0">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;;&quot;$(JDK_HOME)\include&quot;;&quot;$(JDK_HOME)\include\win32&quot;"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_LIB"
-				MinimalRebuild="true"
+				PreprocessorDefinitions="WIN32;_CONSOLE;_LIB;HasJava"
+				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				StructMemberAlignment="4"
-				EnableFunctionLevelLinking="true"
-				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
+				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
 				CallingConvention="0"
-				CompileAs="0"
-			/>
+				CompileAs="0"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				ResourceOutputFileName=""
-			/>
+				Name="VCLibrarianTool"
+				IgnoreAllDefaultLibraries="TRUE"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine=""
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCLibrarianTool"
-				IgnoreAllDefaultLibraries="true"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCResourceCompilerTool"
+				ResourceOutputFileName=""/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Release GUI|Win32"
-			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
-			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
+			Name="Release LIB CMD|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
-			CharacterSet="0"
-			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
-			>
+			CharacterSet="0">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="0"
 				FavorSizeOrSpeed="0"
 				AdditionalIncludeDirectories="&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;;&quot;$(JDK_HOME)\include&quot;;&quot;$(JDK_HOME)\include\win32&quot;"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_LIB"
+				PreprocessorDefinitions="WIN32;_CONSOLE;_LIB;HasJava"
 				RuntimeLibrary="0"
 				StructMemberAlignment="4"
-				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
+				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="0"
 				CallingConvention="0"
-				CompileAs="0"
-			/>
+				CompileAs="0"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				ResourceOutputFileName=""
-			/>
+				Name="VCLibrarianTool"
+				IgnoreAllDefaultLibraries="TRUE"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine=""
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCLibrarianTool"
-				IgnoreAllDefaultLibraries="true"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCResourceCompilerTool"
+				ResourceOutputFileName=""/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Debug CMD|x64"
-			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
-			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
+			Name="Debug LIB GUI|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
-			CharacterSet="0"
-			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
-			>
+			CharacterSet="0">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;;&quot;$(JDK_HOME)\include&quot;;&quot;$(JDK_HOME)\include\win32&quot;"
-				PreprocessorDefinitions="WIN32;_CONSOLE;_LIB"
-				MinimalRebuild="true"
+				PreprocessorDefinitions="WIN32;_WINDOWS;_LIB;HasJava"
+				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				StructMemberAlignment="4"
-				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
+				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
 				CallingConvention="0"
-				CompileAs="0"
-			/>
+				CompileAs="0"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				ResourceOutputFileName=""
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine=""
-			/>
-			<Tool
 				Name="VCLibrarianTool"
-				IgnoreAllDefaultLibraries="true"
-			/>
+				IgnoreAllDefaultLibraries="TRUE"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release CMD|x64"
-			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
-			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
-			>
+				Name="VCResourceCompilerTool"
+				ResourceOutputFileName=""/>
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug DLL GUI|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="0">
 			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="0"
-				FavorSizeOrSpeed="0"
+				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;;&quot;$(JDK_HOME)\include&quot;;&quot;$(JDK_HOME)\include\win32&quot;"
-				PreprocessorDefinitions="WIN32;_CONSOLE;_LIB"
-				RuntimeLibrary="0"
+				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;HasJava"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
 				StructMemberAlignment="4"
-				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="0"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="3"
 				CallingConvention="0"
-				CompileAs="0"
-			/>
+				CompileAs="0"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				ResourceOutputFileName=""
-			/>
+				Name="VCLinkerTool"
+				AdditionalDependencies="wxtiffd.lib wxzlibd.lib wxjpegd.lib wxpngd.lib Ws2_32.lib odbc32.lib odbccp32.lib version.lib"
+				OutputFile="$(OutDir)/pano13.dll"
+				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib&quot;"
+				IgnoreAllDefaultLibraries="FALSE"
+				IgnoreDefaultLibraryNames="LIBCMTD"
+				ModuleDefinitionFile="pano13vc.def"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				EntryPointSymbol=""
+				ImportLibrary="$(OutDir)/pano13.lib"
+				TargetMachine="1"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine=""
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCLibrarianTool"
-				IgnoreAllDefaultLibraries="true"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCResourceCompilerTool"
+				ResourceOutputFileName="$(IntDir)/pano13.res"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Debug GUI|x64"
-			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
-			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
+			Name="Release LIB GUI|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
-			CharacterSet="0"
-			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
-			>
+			CharacterSet="0">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="2"
+				InlineFunctionExpansion="0"
+				FavorSizeOrSpeed="0"
 				AdditionalIncludeDirectories="&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;;&quot;$(JDK_HOME)\include&quot;;&quot;$(JDK_HOME)\include\win32&quot;"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_LIB"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				PreprocessorDefinitions="WIN32;_WINDOWS;_LIB;HasJava"
+				RuntimeLibrary="0"
 				StructMemberAlignment="4"
-				EnableFunctionLevelLinking="true"
-				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="0"
 				CallingConvention="0"
-				CompileAs="0"
-			/>
+				CompileAs="0"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				ResourceOutputFileName=""
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine=""
-			/>
-			<Tool
 				Name="VCLibrarianTool"
-				IgnoreAllDefaultLibraries="true"
-			/>
+				IgnoreAllDefaultLibraries="TRUE"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release GUI|x64"
-			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
-			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
-			>
+				Name="VCResourceCompilerTool"
+				ResourceOutputFileName=""/>
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release DLL GUI|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="0">
 			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="0"
 				FavorSizeOrSpeed="0"
 				AdditionalIncludeDirectories="&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;;&quot;$(JDK_HOME)\include&quot;;&quot;$(JDK_HOME)\include\win32&quot;"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_LIB"
-				RuntimeLibrary="0"
+				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;HasJava"
+				RuntimeLibrary="2"
 				StructMemberAlignment="4"
-				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
+				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="0"
 				CallingConvention="0"
-				CompileAs="0"
-			/>
+				CompileAs="0"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				ResourceOutputFileName=""
-			/>
+				Name="VCLinkerTool"
+				RegisterOutput="FALSE"
+				IgnoreImportLibrary="FALSE"
+				AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib"
+				OutputFile="$(OutDir)/pano13.dll"
+				LinkIncremental="0"
+				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib&quot;"
+				IgnoreAllDefaultLibraries="FALSE"
+				IgnoreDefaultLibraryNames="LIBCMT"
+				ModuleDefinitionFile="pano13vc.def"
+				GenerateDebugInformation="FALSE"
+				EntryPointSymbol=""
+				ImportLibrary="$(OutDir)/pano13.lib"
+				TargetMachine="1"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine=""
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCLibrarianTool"
-				IgnoreAllDefaultLibraries="true"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCResourceCompilerTool"
+				ResourceOutputFileName="$(IntDir)/pano13.res"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -592,451 +428,316 @@
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath=".\adjust.c"
-				>
+				RelativePath=".\adjust.c">
 			</File>
 			<File
-				RelativePath=".\bmp.c"
-				>
+				RelativePath=".\bmp.c">
 			</File>
 			<File
-				RelativePath=".\ColourBrightness.c"
-				>
+				RelativePath=".\ColourBrightness.c">
 			</File>
 			<File
-				RelativePath=".\correct.c"
-				>
+				RelativePath=".\correct.c">
 			</File>
 			<File
-				RelativePath=".\fftn.c"
-				>
+				RelativePath=".\fftn.c">
 			</File>
 			<File
-				RelativePath=".\file.c"
-				>
+				RelativePath=".\file.c">
 			</File>
 			<File
-				RelativePath=".\filter.c"
-				>
+				RelativePath=".\filter.c">
 			</File>
 			<File
-				RelativePath=".\fourier.c"
-				>
+				RelativePath=".\fourier.c">
 			</File>
 			<File
-				RelativePath=".\tools\compat_win32\getopt.c"
-				>
+				RelativePath=".\tools\compat_win32\getopt.c">
 			</File>
 			<File
-				RelativePath=".\hdrfile.c"
-				>
+				RelativePath=".\hdrfile.c">
 			</File>
 			<File
-				RelativePath=".\jpeg.c"
-				>
+				RelativePath=".\jpeg.c">
 			</File>
 			<File
-				RelativePath=".\jpegicc.c"
-				>
+				RelativePath=".\jpegicc.c">
 			</File>
 			<File
-				RelativePath=".\lmdif.c"
-				>
+				RelativePath=".\lmdif.c">
 			</File>
 			<File
-				RelativePath=".\math.c"
-				>
+				RelativePath=".\math.c">
 			</File>
 			<File
-				RelativePath=".\metadata.c"
-				>
+				RelativePath=".\metadata.c">
 			</File>
 			<File
-				RelativePath=".\morpher.c"
-				>
+				RelativePath=".\morpher.c">
 			</File>
 			<File
-				RelativePath=".\multilayer.c"
-				>
+				RelativePath=".\multilayer.c">
 			</File>
 			<File
-				RelativePath=".\optimize.c"
-				>
+				RelativePath=".\optimize.c">
 			</File>
 			<File
-				RelativePath=".\parser.c"
-				>
+				RelativePath=".\parser.c">
 			</File>
 			<File
-				RelativePath=".\perspect.c"
-				>
+				RelativePath=".\perspect.c">
 			</File>
 			<File
-				RelativePath=".\png.c"
-				>
+				RelativePath=".\png.c">
 			</File>
 			<File
-				RelativePath=".\ppm.c"
-				>
+				RelativePath=".\ppm.c">
 			</File>
 			<File
-				RelativePath=".\PTcommon.c"
-				>
+				RelativePath=".\PTcommon.c">
 			</File>
 			<File
-				RelativePath=".\PTDialogs.c"
-				>
+				RelativePath=".\PTDialogs.c">
 			</File>
 			<File
-				RelativePath=".\pteditor.c"
-				>
+				RelativePath=".\pteditor.c">
 			</File>
 			<File
-				RelativePath=".\ptfeather.c"
-				>
+				RelativePath=".\ptfeather.c">
 			</File>
 			<File
-				RelativePath=".\ptpicker.c"
-				>
+				RelativePath=".\ptpicker.c">
 			</File>
 			<File
-				RelativePath=".\ptstitch.c"
-				>
+				RelativePath=".\ptstitch.c">
 			</File>
 			<File
-				RelativePath=".\queryfeature.c"
-				>
+				RelativePath=".\queryfeature.c">
 			</File>
 			<File
-				RelativePath=".\remap.c"
-				>
+				RelativePath=".\remap.c">
 			</File>
 			<File
-				RelativePath=".\resample.c"
-				>
+				RelativePath=".\resample.c">
 			</File>
 			<File
-				RelativePath=".\rgbe.c"
-				>
+				RelativePath=".\rgbe.c">
 			</File>
 			<File
-				RelativePath=".\seamer.c"
-				>
+				RelativePath=".\seamer.c">
 			</File>
 			<File
-				RelativePath=".\sys_ansi.c"
-				>
+				RelativePath=".\sys_ansi.c">
 				<FileConfiguration
-					Name="Debug GUI|Win32"
-					ExcludedFromBuild="true"
-					>
+					Name="Debug LIB GUI|Win32"
+					ExcludedFromBuild="TRUE">
 					<Tool
-						Name="VCCLCompilerTool"
-					/>
+						Name="VCCLCompilerTool"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release GUI|Win32"
-					ExcludedFromBuild="true"
-					>
+					Name="Debug DLL GUI|Win32"
+					ExcludedFromBuild="TRUE">
 					<Tool
-						Name="VCCLCompilerTool"
-					/>
+						Name="VCCLCompilerTool"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug GUI|x64"
-					ExcludedFromBuild="true"
-					>
+					Name="Release LIB GUI|Win32"
+					ExcludedFromBuild="TRUE">
 					<Tool
-						Name="VCCLCompilerTool"
-					/>
+						Name="VCCLCompilerTool"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release GUI|x64"
-					ExcludedFromBuild="true"
-					>
+					Name="Release DLL GUI|Win32"
+					ExcludedFromBuild="TRUE">
 					<Tool
-						Name="VCCLCompilerTool"
-					/>
+						Name="VCCLCompilerTool"/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\sys_common.c"
-				>
+				RelativePath=".\sys_common.c">
 			</File>
 			<File
-				RelativePath=".\sys_win.c"
-				>
+				RelativePath=".\sys_win.c">
 				<FileConfiguration
-					Name="Debug CMD|Win32"
-					ExcludedFromBuild="true"
-					>
+					Name="Release DLL CMD|Win32"
+					ExcludedFromBuild="TRUE">
 					<Tool
-						Name="VCCLCompilerTool"
-					/>
+						Name="VCCLCompilerTool"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release CMD|Win32"
-					ExcludedFromBuild="true"
-					>
+					Name="Debug DLL CMD|Win32"
+					ExcludedFromBuild="TRUE">
 					<Tool
-						Name="VCCLCompilerTool"
-					/>
+						Name="VCCLCompilerTool"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug CMD|x64"
-					ExcludedFromBuild="true"
-					>
+					Name="Debug LIB CMD|Win32"
+					ExcludedFromBuild="TRUE">
 					<Tool
-						Name="VCCLCompilerTool"
-					/>
+						Name="VCCLCompilerTool"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release CMD|x64"
-					ExcludedFromBuild="true"
-					>
+					Name="Release LIB CMD|Win32"
+					ExcludedFromBuild="TRUE">
 					<Tool
-						Name="VCCLCompilerTool"
-					/>
+						Name="VCCLCompilerTool"/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\tiff.c"
-				>
+				RelativePath=".\tiff.c">
 			</File>
 			<File
-				RelativePath=".\Triangulate.c"
-				>
+				RelativePath=".\Triangulate.c">
 			</File>
 			<File
-				RelativePath=".\ZComb.c"
-				>
+				RelativePath=".\ZComb.c">
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
 			<File
-				RelativePath=".\ColourBrightness.h"
-				>
+				RelativePath=".\ColourBrightness.h">
 			</File>
 			<File
-				RelativePath=".\f2c.h"
-				>
+				RelativePath=".\f2c.h">
 			</File>
 			<File
-				RelativePath=".\fftn.h"
-				>
+				RelativePath=".\fftn.h">
 			</File>
 			<File
-				RelativePath=".\file.h"
-				>
+				RelativePath=".\file.h">
 			</File>
 			<File
-				RelativePath=".\filter.h"
-				>
+				RelativePath=".\filter.h">
 			</File>
 			<File
-				RelativePath=".\tools\compat_win32\getopt.h"
-				>
+				RelativePath=".\tools\compat_win32\getopt.h">
 			</File>
 			<File
-				RelativePath=".\metadata.h"
-				>
+				RelativePath=".\metadata.h">
 			</File>
 			<File
-				RelativePath=".\panorama.h"
-				>
+				RelativePath=".\panorama.h">
 			</File>
 			<File
-				RelativePath=".\pt_stdint.h"
-				>
+				RelativePath=".\pt_stdint.h">
 			</File>
 			<File
-				RelativePath=".\PTcommon.h"
-				>
+				RelativePath=".\PTcommon.h">
 			</File>
 			<File
-				RelativePath=".\pteditor.h"
-				>
+				RelativePath=".\pteditor.h">
 			</File>
 			<File
-				RelativePath=".\ptutils.h"
-				>
+				RelativePath=".\ptutils.h">
 			</File>
 			<File
-				RelativePath=".\resource.h"
-				>
+				RelativePath=".\resource.h">
 			</File>
 			<File
-				RelativePath=".\rgbe.h"
-				>
+				RelativePath=".\rgbe.h">
 			</File>
 			<File
-				RelativePath=".\seamer.h"
-				>
+				RelativePath=".\seamer.h">
 			</File>
 			<File
-				RelativePath=".\sys_ansi.h"
-				>
+				RelativePath=".\sys_ansi.h">
 				<FileConfiguration
-					Name="Debug GUI|Win32"
-					ExcludedFromBuild="true"
-					>
+					Name="Debug LIB GUI|Win32"
+					ExcludedFromBuild="TRUE">
 					<Tool
-						Name="VCCustomBuildTool"
-					/>
+						Name="VCCustomBuildTool"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release GUI|Win32"
-					ExcludedFromBuild="true"
-					>
+					Name="Debug DLL GUI|Win32"
+					ExcludedFromBuild="TRUE">
 					<Tool
-						Name="VCCustomBuildTool"
-					/>
+						Name="VCCustomBuildTool"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug GUI|x64"
-					ExcludedFromBuild="true"
-					>
+					Name="Release LIB GUI|Win32"
+					ExcludedFromBuild="TRUE">
 					<Tool
-						Name="VCCustomBuildTool"
-					/>
+						Name="VCCustomBuildTool"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release GUI|x64"
-					ExcludedFromBuild="true"
-					>
+					Name="Release DLL GUI|Win32"
+					ExcludedFromBuild="TRUE">
 					<Tool
-						Name="VCCustomBuildTool"
-					/>
+						Name="VCCustomBuildTool"/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\sys_win.h"
-				>
+				RelativePath=".\sys_win.h">
 				<FileConfiguration
-					Name="Debug CMD|Win32"
-					ExcludedFromBuild="true"
-					>
+					Name="Release DLL CMD|Win32"
+					ExcludedFromBuild="TRUE">
 					<Tool
-						Name="VCCustomBuildTool"
-					/>
+						Name="VCCustomBuildTool"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release CMD|Win32"
-					ExcludedFromBuild="true"
-					>
+					Name="Debug DLL CMD|Win32"
+					ExcludedFromBuild="TRUE">
 					<Tool
-						Name="VCCustomBuildTool"
-					/>
+						Name="VCCustomBuildTool"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug CMD|x64"
-					ExcludedFromBuild="true"
-					>
+					Name="Debug LIB CMD|Win32"
+					ExcludedFromBuild="TRUE">
 					<Tool
-						Name="VCCustomBuildTool"
-					/>
+						Name="VCCustomBuildTool"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release CMD|x64"
-					ExcludedFromBuild="true"
-					>
+					Name="Release LIB CMD|Win32"
+					ExcludedFromBuild="TRUE">
 					<Tool
-						Name="VCCustomBuildTool"
-					/>
+						Name="VCCustomBuildTool"/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\version.h"
-				>
+				RelativePath=".\version.h">
 			</File>
 			<File
-				RelativePath=".\ZComb.h"
-				>
+				RelativePath=".\ZComb.h">
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
 			<File
-				RelativePath=".\pano13.rc"
-				>
+				RelativePath=".\pano13.rc">
 				<FileConfiguration
-					Name="Debug CMD|Win32"
-					ExcludedFromBuild="true"
-					>
+					Name="Debug LIB CMD|Win32"
+					ExcludedFromBuild="TRUE">
 					<Tool
-						Name="VCResourceCompilerTool"
-					/>
+						Name="VCResourceCompilerTool"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release CMD|Win32"
-					ExcludedFromBuild="true"
-					>
+					Name="Release LIB CMD|Win32"
+					ExcludedFromBuild="TRUE">
 					<Tool
-						Name="VCResourceCompilerTool"
-					/>
+						Name="VCResourceCompilerTool"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug GUI|Win32"
-					ExcludedFromBuild="true"
-					>
+					Name="Debug LIB GUI|Win32"
+					ExcludedFromBuild="TRUE">
 					<Tool
-						Name="VCResourceCompilerTool"
-					/>
+						Name="VCResourceCompilerTool"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release GUI|Win32"
-					ExcludedFromBuild="true"
-					>
+					Name="Release LIB GUI|Win32"
+					ExcludedFromBuild="TRUE">
 					<Tool
-						Name="VCResourceCompilerTool"
-					/>
+						Name="VCResourceCompilerTool"/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug CMD|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release CMD|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug GUI|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release GUI|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\pano13vc.def"
-				>
+				RelativePath=".\pano13vc.def">
 			</File>
 		</Filter>
 	</Files>

Modified: trunk/libpano/libpano13.def
===================================================================
--- trunk/libpano/libpano13.def	2009-11-10 20:49:43 UTC (rev 1144)
+++ trunk/libpano/libpano13.def	2009-11-10 22:33:19 UTC (rev 1145)
@@ -14,27 +14,27 @@
 			writePrefs		@5
 			writeTIFF		@6
 			PrintError		@7
-;			DispPrg	= DispPrg@...		@8
-;			SetCPrefs = SetCPrefs@...		@9
+			DispPrg	= DispPrg@...		@8
+			SetCPrefs = SetCPrefs@...		@9
 			SetWindowOwner	@10
-;			SetLumOpt = SetLumOpt@...		@11
-;			DLLInit = DLLInit@...			@12
-;			SetRadOpt = SetRadOpt@...		@13
-;			SetHorOpt = SetHorOpt@...		@15
-;			SetVerOpt = SetVerOpt@...		@16
-;			SetScOpt = SetScOpt@...		@17
-;			SetShOpt = SetShOpt@...		@18
-;			SetCrOpt = SetCrOpt@...		@19
-;			SetAdPrefs = SetAdPrefs@...		@20
-;			SetPerspPrefs = SetPerspPrefs@...  @21
-;			SetRem = SetRem@...			@22
-;			SetSiz = SetSiz@...			@23
-;			SetIntp	= SetIntp@...		@24
+			SetLumOpt = SetLumOpt@...		@11
+			DLLInit = DLLInit@...			@12
+			SetRadOpt = SetRadOpt@...		@13
+			SetHorOpt = SetHorOpt@...		@15
+			SetVerOpt = SetVerOpt@...		@16
+			SetScOpt = SetScOpt@...		@17
+			SetShOpt = SetShOpt@...		@18
+			SetCrOpt = SetCrOpt@...		@19
+			SetAdPrefs = SetAdPrefs@...		@20
+			SetPerspPrefs = SetPerspPrefs@...  @21
+			SetRem = SetRem@...			@22
+			SetSiz = SetSiz@...			@23
+			SetIntp	= SetIntp@...		@24
 			CopyImageData	@25
-;			InfoPrg	= InfoPrg@...		@26
-;			SetCutOpt = SetCutOpt@...		@27
-;			SetPanOpt = SetPanOpt@...		@28
-;			SetFrPrefs = SetFrPrefs@...	@29
+			InfoPrg	= InfoPrg@...		@26
+			SetCutOpt = SetCutOpt@...		@27
+			SetPanOpt = SetPanOpt@...		@28
+			SetFrPrefs = SetFrPrefs@...	@29
 			writePSD		@30
 			addLayerToFile	@31
 			writePSDwithLayer	@32
@@ -78,10 +78,10 @@
 			FindFile	@70
 			DisposeAlignInfo	@71
 			showScript	@72
-;			readImage	@73
-;			writeImage	@74
+			readImage	@73
+			writeImage	@74
 			writeJPEG	@75
-;			makeTempPath	@76
+			makeTempPath	@76
 			MorphImageFile	@77
 			blendImages	@78
 			InterpolateImageFile	@79
@@ -94,44 +94,44 @@
 			SetMakeParams	@86
 			fwiener	@87
 			noisefilter	@88
-;			Java_ptutils_CLoadImage = Java_ptutils_CLoadImage@...	@89
-;			Java_ptutils_CGetImageRow = Java_ptutils_CGetImageRow@...	@90
-;			Java_ptutils_CGetImageWidth = Java_ptutils_CGetImageWidth@...	@91
-;			Java_ptutils_CGetImageHeight = Java_ptutils_CGetImageHeight@...	@92
-;			Java_ptutils_CLoadProject = Java_ptutils_CLoadProject@... 	@93
-;			Java_ptutils_CGetImageCount = Java_ptutils_CGetImageCount@...	@94
-;			Java_ptutils_CGetImageName = Java_ptutils_CGetImageName@...	@95
-;			Java_ptutils_CGetControlPointCount = Java_ptutils_CGetControlPointCount@...	@96
-;			Java_ptutils_CGetCP_1n = Java_ptutils_CGetCP_1n@...	@97
-;			Java_ptutils_CGetCP_1x = Java_ptutils_CGetCP_1x@...	@98
-;			Java_ptutils_CGetCP_1y = Java_ptutils_CGetCP_1y@...	@99
-;			Java_ptutils_CGetCP_1t = Java_ptutils_CGetCP_1t@...	@100
-;			Java_ptutils_CGetTriangleCount = Java_ptutils_CGetTriangleCount@...	@101
-;			Java_ptutils_CGetTR_1v = Java_ptutils_CGetTR_1v@...	@102
-;			Java_ptutils_CGetTR_1i = Java_ptutils_CGetTR_1i@...	@103
-;			Java_ptutils_CSaveProject = Java_ptutils_CSaveProject@...	@104
-;			Java_ptutils_CSetImageName = Java_ptutils_CSetImageName@...	@105
-;			Java_ptutils_CSetControlPointCount = Java_ptutils_CSetControlPointCount@...	@106
-;			Java_ptutils_CSetCP = Java_ptutils_CSetCP@...	@107
-;			Java_ptutils_CSetTriangleCount = Java_ptutils_CSetTriangleCount@...	@108
-;			Java_ptutils_CSetTR = Java_ptutils_CSetTR@...	@109
-;			Java_ptutils_CGetIndex = Java_ptutils_CGetIndex@...	@110
-;			Java_ptutils_CCreateProject = Java_ptutils_CCreateProject@...	@111
-;			Java_ptutils_CTriangulate = Java_ptutils_CTriangulate@...	@112
-;			Java_ptutils_CReduce = Java_ptutils_CReduce@...	@113
-;			Java_ptutils_CCallOptimizer = Java_ptutils_CCallOptimizer@...	@114
-;			Java_ptutils_CShowScript = Java_ptutils_CShowScript@...	@115
-;			Java_ptutils_CLaunchAndSendScript = Java_ptutils_CLaunchAndSendScript@...	@116
+			Java_ptutils_CLoadImage = Java_ptutils_CLoadImage@...	@89
+			Java_ptutils_CGetImageRow = Java_ptutils_CGetImageRow@...	@90
+			Java_ptutils_CGetImageWidth = Java_ptutils_CGetImageWidth@...	@91
+			Java_ptutils_CGetImageHeight = Java_ptutils_CGetImageHeight@...	@92
+			Java_ptutils_CLoadProject = Java_ptutils_CLoadProject@... 	@93
+			Java_ptutils_CGetImageCount = Java_ptutils_CGetImageCount@...	@94
+			Java_ptutils_CGetImageName = Java_ptutils_CGetImageName@...	@95
+			Java_ptutils_CGetControlPointCount = Java_ptutils_CGetControlPointCount@...	@96
+			Java_ptutils_CGetCP_1n = Java_ptutils_CGetCP_1n@...	@97
+			Java_ptutils_CGetCP_1x = Java_ptutils_CGetCP_1x@...	@98
+			Java_ptutils_CGetCP_1y = Java_ptutils_CGetCP_1y@...	@99
+			Java_ptutils_CGetCP_1t = Java_ptutils_CGetCP_1t@...	@100
+			Java_ptutils_CGetTriangleCount = Java_ptutils_CGetTriangleCount@...	@101
+			Java_ptutils_CGetTR_1v = Java_ptutils_CGetTR_1v@...	@102
+			Java_ptutils_CGetTR_1i = Java_ptutils_CGetTR_1i@...	@103
+			Java_ptutils_CSaveProject = Java_ptutils_CSaveProject@...	@104
+			Java_ptutils_CSetImageName = Java_ptutils_CSetImageName@...	@105
+			Java_ptutils_CSetControlPointCount = Java_ptutils_CSetControlPointCount@...	@106
+			Java_ptutils_CSetCP = Java_ptutils_CSetCP@...	@107
+			Java_ptutils_CSetTriangleCount = Java_ptutils_CSetTriangleCount@...	@108
+			Java_ptutils_CSetTR = Java_ptutils_CSetTR@...	@109
+			Java_ptutils_CGetIndex = Java_ptutils_CGetIndex@...	@110
+			Java_ptutils_CCreateProject = Java_ptutils_CCreateProject@...	@111
+			Java_ptutils_CTriangulate = Java_ptutils_CTriangulate@...	@112
+			Java_ptutils_CReduce = Java_ptutils_CReduce@...	@113
+			Java_ptutils_CCallOptimizer = Java_ptutils_CCallOptimizer@...	@114
+			Java_ptutils_CShowScript = Java_ptutils_CShowScript@...	@115
+			Java_ptutils_CLaunchAndSendScript = Java_ptutils_CLaunchAndSendScript@...	@116
 			IsTextFile	@117
 			StringtoFullPath	@118
-;			Java_ptutils_CAlignPoint = Java_ptutils_CAlignPoint@...	@119
-;			Java_pteditor_CLoadImage = Java_pteditor_CLoadImage@...	@120
-;			Java_pteditor_CSaveImage = Java_pteditor_CSaveImage@...	@121
-;			Java_pteditor_CGetImageWidth = Java_pteditor_CGetImageWidth@...	@122
-;			Java_pteditor_CGetImageHeight = Java_pteditor_CGetImageHeight@...	@123
-;			Java_pteditor_CGetImageRow = Java_pteditor_CGetImageRow@...	@124
-;			Java_pteditor_CExtract 	= Java_pteditor_CExtract@... @125
-;			Java_pteditor_CInsert = Java_pteditor_CInsert@...	@126
+			Java_ptutils_CAlignPoint = Java_ptutils_CAlignPoint@...	@119
+			Java_pteditor_CLoadImage = Java_pteditor_CLoadImage@...	@120
+			Java_pteditor_CSaveImage = Java_pteditor_CSaveImage@...	@121
+			Java_pteditor_CGetImageWidth = Java_pteditor_CGetImageWidth@...	@122
+			Java_pteditor_CGetImageHeight = Java_pteditor_CGetImageHeight@...	@123
+			Java_pteditor_CGetImageRow = Java_pteditor_CGetImageRow@...	@124
+			Java_pteditor_CExtract 	= Java_pteditor_CExtract@... @125
+			Java_pteditor_CInsert = Java_pteditor_CInsert@...	@126
 			Progress	@127
 			TIFFOpen	@128
 			TIFFClose	@129
@@ -152,14 +152,14 @@
 			RGBAtoARGB	@145
 			readTIFF	@146
 			CheckParams	@147
-;			Java_ptutils_CGetImageFormat	= Java_ptutils_CGetImageFormat@... @148
-;			Java_ptutils_CGetHfov	=	Java_ptutils_CGetHfov@...	@149
-;			Java_ptutils_CGetYaw	=	Java_ptutils_CGetYaw@...	@150
-;			Java_ptutils_CGetPitch	=	Java_ptutils_CGetPitch@...	@151
-;			Java_ptutils_CGetRoll	=	Java_ptutils_CGetRoll@...	@152
-;			Java_pteditor_CSetImageWidth = Java_pteditor_CSetImageWidth@... @153
-;			Java_pteditor_CSetImageHeight = Java_pteditor_CSetImageHeight@... @154
-;			Java_pteditor_CSetImageRow = Java_pteditor_CSetImageRow@... @155
+			Java_ptutils_CGetImageFormat	= Java_ptutils_CGetImageFormat@... @148
+			Java_ptutils_CGetHfov	=	Java_ptutils_CGetHfov@...	@149
+			Java_ptutils_CGetYaw	=	Java_ptutils_CGetYaw@...	@150
+			Java_ptutils_CGetPitch	=	Java_ptutils_CGetPitch@...	@151
+			Java_ptutils_CGetRoll	=	Java_ptutils_CGetRoll@...	@152
+			Java_pteditor_CSetImageWidth = Java_pteditor_CSetImageWidth@... @153
+			Java_pteditor_CSetImageHeight = Java_pteditor_CSetImageHeight@... @154
+			Java_pteditor_CSetImageRow = Java_pteditor_CSetImageRow@... @155
 			TwoToOneByte @156
 			CropImage @157
 			numLines @158
@@ -181,17 +181,17 @@
 			PT_setErrorFcn @174
 			execute_stack_new @175
 			InsertFileName @176
-;			VerifyTiffsAreCompatible @177
-;			AddStitchingMasks @178
-			panoFlattenTIFF @179
-;			CreatePSD @180
-			panoCreatePanorama @181
+			VerifyTiffsAreCompatible @177
+			AddStitchingMasks @178
+			FlattenTIFF @179
+			CreatePSD @180
+			CreatePanorama @181
 			ptQuietFlag @182
-			panoReplaceExt @183
+			ReplaceExt @183
 			ColourBrightness @184
-;			TiffSetImageParameters @185
-;			TiffGetImageParameters @186
+			TiffSetImageParameters @185
+			TiffGetImageParameters @186
 			getCropInformationFromTiff @187
 			setCropInformationInTiff @188 
-			writeCroppedTIFF @189
+			writeCroppedTIFF @ 189
 			dieWithError @190			 
\ No newline at end of file

Modified: trunk/libpano/math.c
===================================================================
--- trunk/libpano/math.c	2009-11-10 20:49:43 UTC (rev 1144)
+++ trunk/libpano/math.c	2009-11-10 22:33:19 UTC (rev 1145)
@@ -1824,8 +1824,6 @@
 {
 	*x_src = atan2(xyz[0],-xyz[2]) * distance;
 	*y_src = asin(xyz[1]/sqrt(xyz[0]*xyz[0]+xyz[1]*xyz[1]+xyz[2]*xyz[2])) * distance;
-
-  return 1;
 }
 
 

Modified: trunk/libpano/pano13vc.def
===================================================================
--- trunk/libpano/pano13vc.def	2009-11-10 20:49:43 UTC (rev 1144)
+++ trunk/libpano/pano13vc.def	2009-11-10 22:33:19 UTC (rev 1145)
@@ -10,27 +10,27 @@
 			writePrefs		@5
 			writeTIFF		@6
 			PrintError		@7
-;			DispPrg@...	= DispPrg		@8
-;			SetCPrefs@... = SetCPrefs		@9
+			DispPrg@...	= DispPrg		@8
+			SetCPrefs@... = SetCPrefs		@9
 			SetWindowOwner	@10
-;			SetLumOpt@... = SetLumOpt		@11	
-;			DLLInit@... = DLLInit			@12
-;			SetRadOpt@... = SetRadOpt		@13
-;			SetHorOpt@... = SetHorOpt		@15
-;			SetVerOpt@... = SetVerOpt		@16
-;			SetScOpt@... = SetScOpt		@17
-;			SetShOpt@... = SetShOpt		@18
-;			SetCrOpt@... = SetCrOpt		@19
-;			SetAdPrefs@... = SetAdPrefs		@20
-;			SetPerspPrefs@... = SetPerspPrefs  @21
-;			SetRem@... = SetRem			@22
-;			SetSiz@... = SetSiz			@23
-;			SetIntp@...	= SetIntp		@24
+			SetLumOpt@... = SetLumOpt		@11	
+			DLLInit@... = DLLInit			@12
+			SetRadOpt@... = SetRadOpt		@13
+			SetHorOpt@... = SetHorOpt		@15
+			SetVerOpt@... = SetVerOpt		@16
+			SetScOpt@... = SetScOpt		@17
+			SetShOpt@... = SetShOpt		@18
+			SetCrOpt@... = SetCrOpt		@19
+			SetAdPrefs@... = SetAdPrefs		@20
+			SetPerspPrefs@... = SetPerspPrefs  @21
+			SetRem@... = SetRem			@22
+			SetSiz@... = SetSiz			@23
+			SetIntp@...	= SetIntp		@24
 			CopyImageData	@25
-;			InfoPrg@...	= InfoPrg		@26
-;			SetCutOpt@... = SetCutOpt		@27
-;			SetPanOpt@... = SetPanOpt		@28
-;			SetFrPrefs@... = SetFrPrefs	@29	
+			InfoPrg@...	= InfoPrg		@26
+			SetCutOpt@... = SetCutOpt		@27
+			SetPanOpt@... = SetPanOpt		@28
+			SetFrPrefs@... = SetFrPrefs	@29	
 			writePSD		@30
 			addLayerToFile	@31
 			writePSDwithLayer	@32
@@ -90,44 +90,44 @@
 			SetMakeParams	@86
 			fwiener	@87
 			noisefilter	@88
-;			Java_ptutils_CLoadImage@... = Java_ptutils_CLoadImage	@89
-;			Java_ptutils_CGetImageRow@... = Java_ptutils_CGetImageRow	@90
-;			Java_ptutils_CGetImageWidth@... = Java_ptutils_CGetImageWidth	@91
-;			Java_ptutils_CGetImageHeight@... = Java_ptutils_CGetImageHeight	@92
-;			Java_ptutils_CLoadProject@... = Java_ptutils_CLoadProject 	@93
-;			Java_ptutils_CGetImageCount@... = Java_ptutils_CGetImageCount	@94
-;			Java_ptutils_CGetImageName@... = Java_ptutils_CGetImageName	@95
-;			Java_ptutils_CGetControlPointCount@... = Java_ptutils_CGetControlPointCount	@96
-;			Java_ptutils_CGetCP_1n@... = Java_ptutils_CGetCP_1n	@97
-;			Java_ptutils_CGetCP_1x@... = Java_ptutils_CGetCP_1x	@98
-;			Java_ptutils_CGetCP_1y@... = Java_ptutils_CGetCP_1y	@99
-;			Java_ptutils_CGetCP_1t@... = Java_ptutils_CGetCP_1t	@100
-;			Java_ptutils_CGetTriangleCount@... = Java_ptutils_CGetTriangleCount	@101
-;			Java_ptutils_CGetTR_1v@... = Java_ptutils_CGetTR_1v	@102
-;			Java_ptutils_CGetTR_1i@... = Java_ptutils_CGetTR_1i	@103
-;			Java_ptutils_CSaveProject@... = Java_ptutils_CSaveProject	@104
-;			Java_ptutils_CSetImageName@... = Java_ptutils_CSetImageName	@105
-;			Java_ptutils_CSetControlPointCount@... = Java_ptutils_CSetControlPointCount	@106
-;			Java_ptutils_CSetCP@... = Java_ptutils_CSetCP	@107
-;			Java_ptutils_CSetTriangleCount@... = Java_ptutils_CSetTriangleCount	@108
-;			Java_ptutils_CSetTR@... = Java_ptutils_CSetTR	@109
-;			Java_ptutils_CGetIndex@... = Java_ptutils_CGetIndex	@110
-;			Java_ptutils_CCreateProject@... = Java_ptutils_CCreateProject	@111
-;			Java_ptutils_CTriangulate@... = Java_ptutils_CTriangulate	@112
-;			Java_ptutils_CReduce@... = Java_ptutils_CReduce	@113
-;			Java_ptutils_CCallOptimizer@... = Java_ptutils_CCallOptimizer	@114
-;			Java_ptutils_CShowScript@... = Java_ptutils_CShowScript	@115
-;			Java_ptutils_CLaunchAndSendScript@... = Java_ptutils_CLaunchAndSendScript	@116
+			Java_ptutils_CLoadImage@... = Java_ptutils_CLoadImage	@89
+			Java_ptutils_CGetImageRow@... = Java_ptutils_CGetImageRow	@90
+			Java_ptutils_CGetImageWidth@... = Java_ptutils_CGetImageWidth	@91
+			Java_ptutils_CGetImageHeight@... = Java_ptutils_CGetImageHeight	@92
+			Java_ptutils_CLoadProject@... = Java_ptutils_CLoadProject 	@93
+			Java_ptutils_CGetImageCount@... = Java_ptutils_CGetImageCount	@94
+			Java_ptutils_CGetImageName@... = Java_ptutils_CGetImageName	@95
+			Java_ptutils_CGetControlPointCount@... = Java_ptutils_CGetControlPointCount	@96
+			Java_ptutils_CGetCP_1n@... = Java_ptutils_CGetCP_1n	@97
+			Java_ptutils_CGetCP_1x@... = Java_ptutils_CGetCP_1x	@98
+			Java_ptutils_CGetCP_1y@... = Java_ptutils_CGetCP_1y	@99
+			Java_ptutils_CGetCP_1t@... = Java_ptutils_CGetCP_1t	@100
+			Java_ptutils_CGetTriangleCount@... = Java_ptutils_CGetTriangleCount	@101
+			Java_ptutils_CGetTR_1v@... = Java_ptutils_CGetTR_1v	@102
+			Java_ptutils_CGetTR_1i@... = Java_ptutils_CGetTR_1i	@103
+			Java_ptutils_CSaveProject@... = Java_ptutils_CSaveProject	@104
+			Java_ptutils_CSetImageName@... = Java_ptutils_CSetImageName	@105
+			Java_ptutils_CSetControlPointCount@... = Java_ptutils_CSetControlPointCount	@106
+			Java_ptutils_CSetCP@... = Java_ptutils_CSetCP	@107
+			Java_ptutils_CSetTriangleCount@... = Java_ptutils_CSetTriangleCount	@108
+			Java_ptutils_CSetTR@... = Java_ptutils_CSetTR	@109
+			Java_ptutils_CGetIndex@... = Java_ptutils_CGetIndex	@110
+			Java_ptutils_CCreateProject@... = Java_ptutils_CCreateProject	@111
+			Java_ptutils_CTriangulate@... = Java_ptutils_CTriangulate	@112
+			Java_ptutils_CReduce@... = Java_ptutils_CReduce	@113
+			Java_ptutils_CCallOptimizer@... = Java_ptutils_CCallOptimizer	@114
+			Java_ptutils_CShowScript@... = Java_ptutils_CShowScript	@115
+			Java_ptutils_CLaunchAndSendScript@... = Java_ptutils_CLaunchAndSendScript	@116
 			IsTextFile	@117
 			StringtoFullPath	@118
-;			Java_ptutils_CAlignPoint@... = Java_ptutils_CAlignPoint	@119
-;			Java_pteditor_CLoadImage@... = Java_pteditor_CLoadImage	@120
-;			Java_pteditor_CSaveImage@... = Java_pteditor_CSaveImage	@121
-;			Java_pteditor_CGetImageWidth@... = Java_pteditor_CGetImageWidth	@122
-;			Java_pteditor_CGetImageHeight@... = Java_pteditor_CGetImageHeight	@123
-;			Java_pteditor_CGetImageRow@... = Java_pteditor_CGetImageRow	@124
-;			Java_pteditor_CExtract@... 	= Java_pteditor_CExtract @125
-;			Java_pteditor_CInsert@... = Java_pteditor_CInsert	@126
+			Java_ptutils_CAlignPoint@... = Java_ptutils_CAlignPoint	@119
+			Java_pteditor_CLoadImage@... = Java_pteditor_CLoadImage	@120
+			Java_pteditor_CSaveImage@... = Java_pteditor_CSaveImage	@121
+			Java_pteditor_CGetImageWidth@... = Java_pteditor_CGetImageWidth	@122
+			Java_pteditor_CGetImageHeight@... = Java_pteditor_CGetImageHeight	@123
+			Java_pteditor_CGetImageRow@... = Java_pteditor_CGetImageRow	@124
+			Java_pteditor_CExtract@... 	= Java_pteditor_CExtract @125
+			Java_pteditor_CInsert@... = Java_pteditor_CInsert	@126
 			Progress	@127
 			TIFFOpen	@128
 			TIFFClose	@129
@@ -148,14 +148,14 @@
 			RGBAtoARGB	@145
 			readTIFF	@146
 			CheckParams	@147
-;			Java_ptutils_CGetImageFormat@...	= Java_ptutils_CGetImageFormat @148
-;			Java_ptutils_CGetHfov@...	=	Java_ptutils_CGetHfov	@149
-;			Java_ptutils_CGetYaw@...	=	Java_ptutils_CGetYaw	@150
-;			Java_ptutils_CGetPitch@...	=	Java_ptutils_CGetPitch	@151
-;			Java_ptutils_CGetRoll@...	=	Java_ptutils_CGetRoll	@152
-;			Java_pteditor_CSetImageWidth@... = Java_pteditor_CSetImageWidth @153
-;			Java_pteditor_CSetImageHeight@... = Java_pteditor_CSetImageHeight @154
-;			Java_pteditor_CSetImageRow@... = Java_pteditor_CSetImageRow @155
+			Java_ptutils_CGetImageFormat@...	= Java_ptutils_CGetImageFormat @148
+			Java_ptutils_CGetHfov@...	=	Java_ptutils_CGetHfov	@149
+			Java_ptutils_CGetYaw@...	=	Java_ptutils_CGetYaw	@150
+			Java_ptutils_CGetPitch@...	=	Java_ptutils_CGetPitch	@151
+			Java_ptutils_CGetRoll@...	=	Java_ptutils_CGetRoll	@152
+			Java_pteditor_CSetImageWidth@... = Java_pteditor_CSetImageWidth @153
+			Java_pteditor_CSetImageHeight@... = Java_pteditor_CSetImageHeight @154
+			Java_pteditor_CSetImageRow@... = Java_pteditor_CSetImageRow @155
 			TwoToOneByte @156
 			CropImage @157
 			numLines @158
@@ -179,11 +179,11 @@
 			InsertFileName              @176
 ;			VerifyTiffsAreCompatible    @177
 ;			AddStitchingMasks           @178
-			panoFlattenTIFF             @179
+;			FlattenTIFF                 @179
 ;			CreatePSD                   @180
-			panoCreatePanorama          @181
+;			CreatePanorama              @181
 			ptQuietFlag                 @182
-			panoReplaceExt              @183
+;			ReplaceExt                  @183
 			ColourBrightness            @184
 ;			TiffSetImageParameters      @185
 ;			TiffGetImageParameters      @186

Modified: trunk/libpano/sys_ansi.c
===================================================================
--- trunk/libpano/sys_ansi.c	2009-11-10 20:49:43 UTC (rev 1144)
+++ trunk/libpano/sys_ansi.c	2009-11-10 22:33:19 UTC (rev 1145)
@@ -25,8 +25,6 @@
 //------------------ Public functions required by filter.h -------------------------------
 
 
-void SetWindowOwner(HWND Owner) {return;}
-void CenterDialog(HWND hDlg) {return;}
 
 void filter_main( TrformStr *TrPtr, struct size_Prefs *spref)
 {

Modified: trunk/libpano/sys_ansi.h
===================================================================
--- trunk/libpano/sys_ansi.h	2009-11-10 20:49:43 UTC (rev 1144)
+++ trunk/libpano/sys_ansi.h	2009-11-10 22:33:19 UTC (rev 1145)
@@ -41,9 +41,6 @@
 																			\
 			return( FALSE );
 
-void SetWindowOwner(HWND Owner);
-void CenterDialog(HWND hDlg);
-
 #define		kSetRemapPrefs_dlg					"REMAP"	
 #define		kSetRemapPrefs_InRect				350
 #define		kSetRemapPrefs_InPano				351


Property changes on: trunk/libpano/tests/simpleStitch/reference/tiff_m_cropped0000.tif
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libpano/tests/simpleStitch/reference/tiff_m_cropped0001.tif
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libpano/tests/simpleStitch/reference/tiff_m_uncropped0000.tif
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libpano/tests/simpleStitch/reference/tiff_m_uncropped0001.tif
___________________________________________________________________
Deleted: svn:mergeinfo
   - 

Modified: trunk/libpano/tools/PTAInterpolate.vcproj
===================================================================
--- trunk/libpano/tools/PTAInterpolate.vcproj	2009-11-10 20:49:43 UTC (rev 1144)
+++ trunk/libpano/tools/PTAInterpolate.vcproj	2009-11-10 22:33:19 UTC (rev 1145)
@@ -1,347 +1,216 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="7.10"
 	Name="PTAInterpolate"
 	ProjectGUID="{9D68379B-FD84-4B81-B25D-6126AF2ABDA0}"
-	RootNamespace="PTAInterpolate"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
+			Name="Win32"/>
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="Debug CMD|Win32"
-			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
-			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
+			Name="Debug LIB|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
 			ConfigurationType="1"
-			CharacterSet="2"
-			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
-			>
+			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="compat_win32;..\;&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
+				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib"
 				OutputFile="$(OutDir)/PTAInterpolate.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib&quot;"
 				IgnoreDefaultLibraryNames="LIBCMT"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/PTAInterpolate.pdb"
 				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
+				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCManifestTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Release CMD|Win32"
-			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
-			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
+			Name="Release LIB|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
 			ConfigurationType="1"
-			CharacterSet="2"
-			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
-			>
+			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="compat_win32;..\;&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib"
 				OutputFile="$(OutDir)/PTAInterpolate.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib&quot;"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="TRUE"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
+				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCManifestTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Debug CMD|x64"
-			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
-			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
+			Name="Debug DLL|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
-			CharacterSet="2"
-			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
-			>
+			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="compat_win32;..\;&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
+				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib"
 				OutputFile="$(OutDir)/PTAInterpolate.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib64&quot;"
+				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib&quot;"
 				IgnoreDefaultLibraryNames="LIBCMT"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/PTAInterpolate.pdb"
 				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
+				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCManifestTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Release CMD|x64"
-			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
-			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
+			Name="Release DLL|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
-			CharacterSet="2"
-			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
-			>
+			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="compat_win32;..\;&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib"
 				OutputFile="$(OutDir)/PTAInterpolate.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib64&quot;"
-				GenerateDebugInformation="true"
+				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib&quot;"
+				GenerateDebugInformation="TRUE"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
+				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCManifestTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -350,27 +219,22 @@
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath=".\PTAInterpolate.c"
-				>
+				RelativePath=".\PTAInterpolate.c">
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
 		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
 			<File
-				RelativePath=".\PTainterpolate.rc"
-				>
+				RelativePath=".\PTainterpolate.rc">
 			</File>
 		</Filter>
 	</Files>

Modified: trunk/libpano/tools/PTOptimizer.vcproj
===================================================================
--- trunk/libpano/tools/PTOptimizer.vcproj	2009-11-10 20:49:43 UTC (rev 1144)
+++ trunk/libpano/tools/PTOptimizer.vcproj	2009-11-10 22:33:19 UTC (rev 1145)
@@ -1,355 +1,225 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="7.10"
 	Name="PTOptimizer"
 	ProjectGUID="{20D1E094-A4B5-4294-85CE-229529065785}"
 	RootNamespace="PTOptimizer"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
+			Name="Win32"/>
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="Debug CMD|Win32"
-			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
-			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
+			Name="Debug LIB|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
 			ConfigurationType="1"
-			CharacterSet="2"
-			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
-			>
+			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="compat_win32;..\;&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
+				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib"
 				OutputFile="$(OutDir)/PToptimizer.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib&quot;"
 				IgnoreDefaultLibraryNames="LIBCMT"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/PTOptimizer.pdb"
 				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
+				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCManifestTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Release CMD|Win32"
-			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
-			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
+			Name="Release LIB|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
 			ConfigurationType="1"
-			CharacterSet="2"
-			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
-			>
+			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="compat_win32;..\;&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib"
 				OutputFile="$(OutDir)/PTOptimizer.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib&quot;"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="TRUE"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
+				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCManifestTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Debug CMD|x64"
-			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
-			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
+			Name="Debug DLL|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
-			CharacterSet="2"
-			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
-			>
+			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="compat_win32;..\;&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
+				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib"
 				OutputFile="$(OutDir)/PToptimizer.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib64&quot;"
+				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib&quot;"
 				IgnoreDefaultLibraryNames="LIBCMT"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/PTOptimizer.pdb"
 				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
+				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCManifestTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Release CMD|x64"
-			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
-			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
+			Name="Release DLL|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
-			CharacterSet="2"
-			BuildLogFile="$(IntDir)\$(InputName)BuildLog.htm"
-			>
+			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="compat_win32;..\;&quot;$(WXWIDGETS_HOME)\src\zlib&quot;;&quot;$(WXWIDGETS_HOME)\src\png&quot;;&quot;$(WXWIDGETS_HOME)\src\tiff&quot;;&quot;$(WXWIDGETS_HOME)\src\jpeg&quot;;&quot;$(WXWIDGETS_HOME)\src&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(IntDir)\$(InputName).pdb"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxtiff.lib wxzlib.lib wxjpeg.lib wxpng.lib Ws2_32.lib"
 				OutputFile="$(OutDir)/PTOptimizer.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib64&quot;"
-				GenerateDebugInformation="true"
+				AdditionalLibraryDirectories="&quot;$(WXWIDGETS_HOME)\lib\vc_lib&quot;"
+				GenerateDebugInformation="TRUE"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
+				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCManifestTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -358,27 +228,22 @@
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath=".\PToptimizer.c"
-				>
+				RelativePath=".\PToptimizer.c">
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
 		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
 			<File
-				RelativePath=".\PToptimizer.rc"
-				>
+				RelativePath=".\PToptimizer.rc">
 			</File>
 		</Filter>

@@ Diff output truncated at 100000 characters. @@

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

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

From: <dmg@us...> - 2009-11-12 04:12

Revision: 1151
          http://panotools.svn.sourceforge.net/panotools/?rev=1151&view=rev
Author:   dmg
Date:     2009-11-12 04:12:26 +0000 (Thu, 12 Nov 2009)

Log Message:
-----------
rebased changes from Jim, except ansi_sys.c

Modified Paths:
--------------
    trunk/libpano/libpano.sln
    trunk/libpano/libpano.vcproj
    trunk/libpano/libpano13.def
    trunk/libpano/math.c
    trunk/libpano/pano13vc.def
    trunk/libpano/tools/PTAInterpolate.vcproj
    trunk/libpano/tools/PTOptimizer.vcproj
    trunk/libpano/tools/PTblender.vcproj
    trunk/libpano/tools/PTcrop.vcproj
    trunk/libpano/tools/PTinfo.vcproj
    trunk/libpano/tools/PTmasker.vcproj
    trunk/libpano/tools/PTmender.vcproj
    trunk/libpano/tools/PTroller.vcproj
    trunk/libpano/tools/PTtiff2psd.vcproj
    trunk/libpano/tools/PTtif