Update of /cvsroot/hugin/hugin/src/include/PT
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10042/include/PT
Modified Files:
PanoImage.h Panorama.h
Log Message:
detect and correct if image size specified in .pto file differs from the actual image size.
Index: PanoImage.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/PT/PanoImage.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- PanoImage.h 23 Feb 2006 23:29:10 -0000 1.11
+++ PanoImage.h 25 Feb 2006 19:00:34 -0000 1.12
@@ -360,7 +360,6 @@
: m_proj(proj), m_hfov(hfov), m_size(sz), m_roi(sz)
{
}
-
bool horizontalWarpNeeded()
{
switch (m_proj)
@@ -375,7 +374,6 @@
}
return false;
}
-
// data accessors
const Projection & getProjection() const
{ return m_proj; }
@@ -452,7 +450,10 @@
{ lensNr = l; }
unsigned int getLensNr() const
{ return lensNr; }
-
+
+ void setSize(const vigra::Size2D & sz)
+ { width =sz.x; height = sz.y; }
+
void setFeatherWidth(unsigned int w)
{ options.featherWidth = w; }
Index: Panorama.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/PT/Panorama.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- Panorama.h 5 Feb 2006 14:39:40 -0000 1.45
+++ Panorama.h 25 Feb 2006 19:00:34 -0000 1.46
@@ -388,6 +388,9 @@
*/
void removeImage(unsigned int nr);
+ /** set input image parameters */
+ void setSrcImg(unsigned int nr, const SrcPanoImage & img);
+
/** set a new image filename
*
* It is assumed that it is of the same size
|