1
0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-20 12:55:15 +08:00

Minor documentation fixes:

- dpm, freetype: fixed documentation blocks
- datasets: removed tinyXml from public interface and documentation
This commit is contained in:
Maksim Shabunin
2017-01-17 16:33:46 +03:00
parent d1cbfa3bbf
commit bef177c718
6 changed files with 17 additions and 13 deletions

View File

@@ -41,7 +41,7 @@
#include "opencv2/datasets/or_pascal.hpp" #include "opencv2/datasets/or_pascal.hpp"
#include "opencv2/datasets/util.hpp" #include "opencv2/datasets/util.hpp"
#include <opencv2/datasets/tinyxml2/tinyxml2.h> #include "tinyxml2/tinyxml2.h"
#include <fstream> #include <fstream>
namespace cv namespace cv

View File

@@ -21,7 +21,7 @@ must not be misrepresented as being the original software.
distribution. distribution.
*/ */
#include "opencv2/datasets/tinyxml2/tinyxml2.h" #include "tinyxml2/tinyxml2.h"
#include <new> // yes, this one new style header, is in the Android SDK. #include <new> // yes, this one new style header, is in the Android SDK.
# ifdef ANDROID_NDK # ifdef ANDROID_NDK
@@ -2201,4 +2201,3 @@ bool XMLPrinter::Visit( const XMLUnknown& unknown )
} }
} // namespace tinyxml2 } // namespace tinyxml2

View File

@@ -42,7 +42,7 @@
#include "opencv2/datasets/tr_svt.hpp" #include "opencv2/datasets/tr_svt.hpp"
#include "opencv2/datasets/util.hpp" #include "opencv2/datasets/util.hpp"
#include <opencv2/datasets/tinyxml2/tinyxml2.h> #include "tinyxml2/tinyxml2.h"
namespace cv namespace cv
{ {

View File

@@ -96,6 +96,9 @@ namespace cv
namespace dpm namespace dpm
{ {
//! @addtogroup dpm
//! @{
/** @brief This is a C++ abstract class, it provides external user API to work with DPM. /** @brief This is a C++ abstract class, it provides external user API to work with DPM.
*/ */
class CV_EXPORTS_W DPMDetector class CV_EXPORTS_W DPMDetector
@@ -142,6 +145,8 @@ public:
virtual ~DPMDetector(){} virtual ~DPMDetector(){}
}; };
//! @}
} // namespace dpm } // namespace dpm
} // namespace cv } // namespace cv

View File

@@ -183,7 +183,7 @@ The function createFreeType2 create instance to draw UTF-8 strings.
*/ */
CV_EXPORTS_W Ptr<FreeType2> createFreeType2(); CV_EXPORTS_W Ptr<FreeType2> createFreeType2();
//! @] //! @}
} } // namespace freetype } } // namespace freetype
#endif #endif