Diff of /APSCpp/sphereAlign.h [f61243] .. [03d2ea]  Maximize  Restore

Switch to side-by-side view

--- a/APSCpp/sphereAlign.h
+++ b/APSCpp/sphereAlign.h
@@ -59,6 +59,8 @@
 };
 #endif	//ndef PANORAMA_H
 
+const char * formatName( int fmt );
+
 #ifndef Pi
   #define Pi 3.1415926535897932384626433832795
   #define DEG2RAD( x ) ((x) * Pi/180.0 )
@@ -182,7 +184,7 @@
 // create empty
 pCamLens CamLens_new0();
 // create with minimal info
-pCamLens CamLens_new1( int wid, int hgt, int fmt, double flpix, double flmm );
+pCamLens CamLens_new1( int wid, int hgt, int fmt, double hfov, double flmm );
 // create with database info
 pCamLens CamLens_new( pCameraInfo pc, pLensInfo pl );
 //  change projection type
@@ -241,24 +243,44 @@
 				  double *xsrc, double *ysrc
 				 );
 
-/* minimal image info for APSC++
-  source is project file 'i' lines
-  (LoadProjectImages() reads this)
+/* compute focal length in pixels from 
+	fov (deg)
+	dim (pixels full width)
+	fmt  projection type code 
+*/
+double flpix( double fov, int dim, int fmt );
+
+/* compute fov in degrees from
+  flpix
+  dim (pixels)
+  fmt
+*/
+double fovdeg( double flpix, int dim, int fmt );
+
+/* image info for APSC++, used when source is project file 
+  Rev 2.5.1+ 
+    flpix is set once when project is read, hfov computed 
+	when needed as fovdeg( flpix, width, format).
+	format and width can change during processing.  The
+	value read from project file is kept in fmtref.
 */
 typedef struct DIinfo {
   // 'i' line input
 	char name[262];
-	int width, height;
-	int format;
-	double hfov;
-	double yaw, pitch, roll;
+	int width, height;	// working
+	int format;			// working
+	int fmtref;		// as read
+	double flpix;		// working
+	double yaw, pitch, roll; // alignment
+	double a, b, c;		// correction poly
 } DIinfo, * pDIinfo;
 
 // create empty
 pDIinfo DIinfo_new0();
 // delete
 void DIinfo_delete( pDIinfo self );
-
+// test if is a dummy image (no file)
+int DIinfo_isDummy( pDIinfo self );
 
 #ifdef __cplusplus
 }

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:

JavaScript is required for this form.





No, thanks