WebSVN – seema-scanner – Diff – /src/SMCaptureWorker.cpp

 #include <QSettings>
 #include <QtTest/QTest>
 void SMCaptureWorker::setup(){
-    // Create rotation stage
-    rotationStage = new RotationStage();
     QSettings settings;
     // Create cameras
     int iNum0 = settings.value("camera0/interfaceNumber", -1).toInt();
     int cNum0 = settings.value("camera0/cameraNumber", -1).toInt();
         projector = new ProjectorOpenGL(screenNum);
     unsigned int screenCols, screenRows;
     projector->getScreenRes(&screenCols, &screenRows);
+    // Create rotation stage
+    rotationStage = new RotationStage();
     // Create Algorithm
     CodingDir dir = (CodingDir)settings.value("pattern/direction", CodingDirHorizontal).toInt();
     if(dir == CodingDirNone)
         std::cerr << "SMCaptureWorker: invalid coding direction " << std::endl;
     working = false;
+}
 SMCaptureWorker::~SMCaptureWorker(){
     delete projector;
-    delete camera0;
+//    delete camera0;
-    delete camera1;
+//    delete camera1;
     delete rotationStage;
+}

Subversion Repositories seema-scanner