[libcvd-members] libcvd/progs calibrate.cxx

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Edward Rosten <edrosten>        08/08/29 20:26:02

Modified files:
        progs          : calibrate.cxx 

Log message:
        Make it easier to switch cameras.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/progs/calibrate.cxx?cvsroot=libcvd&r1=1.9&r2=1.10

Patches:
Index: calibrate.cxx
===================================================================
RCS file: /cvsroot/libcvd/libcvd/progs/calibrate.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- calibrate.cxx       29 Aug 2008 03:33:26 -0000      1.9
+++ calibrate.cxx       29 Aug 2008 20:26:02 -0000      1.10
@@ -42,7 +42,7 @@
 string videoDevice = "v4l2:///dev/video0";
 #endif
 
-typedef Camera::Quintic CameraModel;
+typedef Camera::SHarris CameraModel;
 static const int NumCameraParams = CameraModel::num_parameters;
 
 Vector<NumCameraParams> badVector()
@@ -669,7 +669,13 @@
     ImageRef imageSize;
 
        if(cameraParameters[0] == -1)
-               cameraParameters = (make_Vector, 500, 500,  
videoBuffer->size().x/2,  videoBuffer->size().y/2,  0, 0);
+       {
+               Zero(cameraParameters);
+               cameraParameters[0] = 500;
+               cameraParameters[1] = 500;
+               cameraParameters[2] = videoBuffer->size().x/2;
+               cameraParameters[3] = videoBuffer->size().y/2;
+       }
 
     //XEvent e;
     //disp.select_events(KeyPressMask);