fixed namespaces

modules/viz2d/include/opencv2/viz2d/dialog.hpp

@@ -14,7 +14,6 @@
 
 namespace cv {
 namespace viz {
-namespace detail {
 
 using std::string;
 
@@ -56,7 +55,6 @@ public:
     CV_EXPORTS bool isMinimized();
 };
 
-} /* namespace detail */
 } /* namespace viz */
 } /* namespace cv */
 

modules/viz2d/include/opencv2/viz2d/formhelper.hpp

@@ -14,7 +14,6 @@
 
 namespace cv {
 namespace viz {
-namespace detail {
 using std::string;
 
 /*!
@@ -124,7 +123,6 @@ public:
     CV_EXPORTS nanogui::Button* makeButton(const string& caption, std::function<void()> fn);
 };
 
-} /* namespace detail */
 } /* namespace viz */
 } /* namespace cv */
 

modules/viz2d/include/opencv2/viz2d/source.hpp

@@ -26,7 +26,7 @@ public:
     /*!
      * Constructs the Source object from a generator functor.
      * @param generator A function object that accepts a reference to a UMat frame
-     * that it manipulates. This is ultimatively used to provide video data to #Viz2D
+     * that it manipulates. This is ultimatively used to provide video data to #cv::viz::Viz2D
      * @param fps The fps the Source object provides data with.
      */
     CV_EXPORTS Source(std::function<bool(cv::OutputArray&)> generator, float fps);

modules/viz2d/include/opencv2/viz2d/util.hpp

@@ -50,7 +50,6 @@ CV_EXPORTS void printSystemInfo();
 /*!
  * Tells the application if it's alright to keep on running.
  * Note: If you use this mechanism signal handlers are installed
- * using #install_signal_handlers()
  * @return true if the program should keep on running
  */
 CV_EXPORTS bool keepRunning();
@@ -60,12 +59,12 @@ CV_EXPORTS bool keepRunning();
  * @param v2d The Viz2D object to operate on
  * @param graphical if this parameter is true the FPS drawn on display
  */
-CV_EXPORTS void updateFps(cv::Ptr<Viz2D> viz2d, bool graphical);
+CV_EXPORTS void updateFps(cv::Ptr<Viz2D> v2d, bool graphical);
 
 #ifndef __EMSCRIPTEN__
 /*!
  * Creates an Intel VAAPI enabled VideoWriter sink object to use in conjunction with #Viz2D::setSink().
- * Usually you would call #make_writer_sink() and let it automatically decide if VAAPI is available.
+ * Usually you would call #makeWriterSink() and let it automatically decide if VAAPI is available.
  * @param outputFilename The filename to write the video to.
  * @param fourcc    The fourcc code of the codec to use.
  * @param fps       The fps of the target video.
@@ -77,7 +76,7 @@ CV_EXPORTS Sink makeVaSink(const string& outputFilename, const int fourcc, const
         const cv::Size& frameSize, const int vaDeviceIndex);
 /*!
  * Creates an Intel VAAPI enabled VideoCapture source object to use in conjunction with #Viz2D::setSource().
- * Usually you would call #make_capture_source() and let it automatically decide if VAAPI is available.
+ * Usually you would call #makeCaptureSource() and let it automatically decide if VAAPI is available.
  * @param inputFilename The file to read from.
  * @param vaDeviceIndex The VAAPI device index to use.
  * @return A VAAPI enabled source object.

modules/viz2d/include/opencv2/viz2d/viz2d.hpp

@@ -251,7 +251,7 @@ public:
     CV_EXPORTS void write(std::function<void(const cv::InputArray&)> fn);
 
     /*!
-     * Set the current #cv::viz::Source object. Usually created using #make_capture_source().
+     * Set the current #cv::viz::Source object. Usually created using #makeCaptureSource().
      * @param src A #cv::viz::Source object.
      */
     CV_EXPORTS void setSource(const Source& src);
@@ -261,7 +261,7 @@ public:
      */
     CV_EXPORTS bool isSourceReady();
     /*!
-     * Set the current #cv::viz::Sink object. Usually created using #make_writer_sink().
+     * Set the current #cv::viz::Sink object. Usually created using #makeWriterSink().
      * @param sink A #cv::viz::Sink object.
      */
     CV_EXPORTS void setSink(const Sink& sink);

modules/viz2d/src/dialog.cpp

@@ -9,7 +9,6 @@
 
 namespace cv {
 namespace viz {
-namespace detail {
 
 std::function<bool(Dialog*, Dialog*)> Dialog::viz2DWin_Xcomparator([](Dialog* lhs, Dialog* rhs) {
     return lhs->position()[0] < rhs->position()[0];
@@ -123,6 +122,5 @@ bool Dialog::mouse_drag_event(const nanogui::Vector2i& p, const nanogui::Vector2
     return false;
 }
 
-} /* namespace detail */
 } /* namespace viz */
 } /* namespace cv */

modules/viz2d/src/formhelper.cpp

@@ -7,7 +7,6 @@
 
 namespace cv {
 namespace viz {
-namespace detail {
 
 FormHelper::FormHelper(nanogui::Screen* screen) :
         nanogui::FormHelper(screen) {
@@ -17,7 +16,7 @@ FormHelper::~FormHelper() {
 }
 
 Dialog* FormHelper::makeDialog(int x, int y, const string& title) {
-    auto* win = new cv::viz::detail::Dialog(m_screen, x, y, title);
+    auto* win = new cv::viz::Dialog(m_screen, x, y, title);
     this->set_window(win);
     return win;
 }
@@ -54,6 +53,5 @@ nanogui::Button* FormHelper::makeButton(const string& caption, std::function<voi
     return add_button(caption, fn);
 }
 
-} /* namespace detail */
 } /* namespace viz */
 } /* namespace cv */