more retrocompatible changes

Author: atsju

camwizardpage1.cpp

@@ -240,11 +240,11 @@ void CamWizardPage1::on_compute_clicked()
                 if (found)
                     break;
                 if ( i == 1){
-                    cv::SimpleBlobDetector detector;
+                    static Ptr<SimpleBlobDetector> detector = cv::SimpleBlobDetector::create();
 
                     // Detect blobs.
                     std::vector<cv::KeyPoint> keypoints;
-                    detector.detect( dial, keypoints);
+                    detector->detect( dial, keypoints);
 
                     /*int horz = 1;
                     int vert = 1;
@@ -329,13 +329,13 @@ void CamWizardPage1::on_compute_clicked()
             msg << "Grid of " << ui->columns->value() << " X " << ui->rows->value() << " not found. Press any key.";
             ui->Results->append("Pattern not found. Calibration failed.");
             // Set up the detector with default parameters.
-            cv::SimpleBlobDetector detector;
+            static Ptr<SimpleBlobDetector> detector = cv::SimpleBlobDetector::create();
 
             cv::threshold(raw,view, 200, 255, cv::THRESH_BINARY);
 
             // Detect blobs.
             std::vector<cv::KeyPoint> keypoints;
-            detector.detect( view, keypoints);
+            detector->detect( view, keypoints);
 
             // Draw detected blobs as red circles.
             // DrawMatchesFlags::DRAW_RICH_KEYPOINTS flag ensures the size of the circle corresponds to the size of blob

dftarea.cpp

@@ -30,6 +30,7 @@
 #include <QLabel>
 #include <QShortcut>
 #include <opencv2/core/core_c.h>
+using namespace cv;
 
 
 cv::Mat  makeMask(CircleOutline outside, CircleOutline center, cv::Mat data,

dftarea.h

@@ -28,7 +28,7 @@
 #include <string>
 #include "psi_dlg.h"
 #include "psiphasedisplay.h"
-using namespace cv;
+
 extern void showData(const std::string& txt, cv::Mat mat, bool useLog = false);
 extern QImage showMag(cv::Mat complexI, bool show = false, const char *title = "FFT", bool doLog = true, double gamma = 0);
 extern void shiftDFT(cv::Mat &magI);