Commit bef177c7 authored by Maksim Shabunin's avatar Maksim Shabunin

Minor documentation fixes:

- dpm, freetype: fixed documentation blocks
- datasets: removed tinyXml from public interface and documentation
parent d1cbfa3b
......@@ -41,7 +41,7 @@
#include "opencv2/datasets/or_pascal.hpp"
#include "opencv2/datasets/util.hpp"
#include <opencv2/datasets/tinyxml2/tinyxml2.h>
#include "tinyxml2/tinyxml2.h"
#include <fstream>
namespace cv
......
......@@ -21,7 +21,7 @@ must not be misrepresented as being the original software.
distribution.
*/
#include "opencv2/datasets/tinyxml2/tinyxml2.h"
#include "tinyxml2/tinyxml2.h"
#include <new> // yes, this one new style header, is in the Android SDK.
# ifdef ANDROID_NDK
......@@ -593,7 +593,7 @@ XMLNode::~XMLNode()
}
}
const char* XMLNode::Value() const
const char* XMLNode::Value() const
{
return _value.GetStr();
}
......@@ -1063,12 +1063,12 @@ bool XMLUnknown::Accept( XMLVisitor* visitor ) const
// --------- XMLAttribute ---------- //
const char* XMLAttribute::Name() const
const char* XMLAttribute::Name() const
{
return _name.GetStr();
}
const char* XMLAttribute::Value() const
const char* XMLAttribute::Value() const
{
return _value.GetStr();
}
......@@ -1271,7 +1271,7 @@ void XMLElement::SetText( const char* inText )
}
void XMLElement::SetText( int v )
void XMLElement::SetText( int v )
{
char buf[BUF_SIZE];
XMLUtil::ToStr( v, buf, BUF_SIZE );
......@@ -1279,7 +1279,7 @@ void XMLElement::SetText( int v )
}
void XMLElement::SetText( unsigned v )
void XMLElement::SetText( unsigned v )
{
char buf[BUF_SIZE];
XMLUtil::ToStr( v, buf, BUF_SIZE );
......@@ -1287,7 +1287,7 @@ void XMLElement::SetText( unsigned v )
}
void XMLElement::SetText( bool v )
void XMLElement::SetText( bool v )
{
char buf[BUF_SIZE];
XMLUtil::ToStr( v, buf, BUF_SIZE );
......@@ -1295,7 +1295,7 @@ void XMLElement::SetText( bool v )
}
void XMLElement::SetText( float v )
void XMLElement::SetText( float v )
{
char buf[BUF_SIZE];
XMLUtil::ToStr( v, buf, BUF_SIZE );
......@@ -1303,7 +1303,7 @@ void XMLElement::SetText( float v )
}
void XMLElement::SetText( double v )
void XMLElement::SetText( double v )
{
char buf[BUF_SIZE];
XMLUtil::ToStr( v, buf, BUF_SIZE );
......@@ -2201,4 +2201,3 @@ bool XMLPrinter::Visit( const XMLUnknown& unknown )
}
} // namespace tinyxml2
......@@ -42,7 +42,7 @@
#include "opencv2/datasets/tr_svt.hpp"
#include "opencv2/datasets/util.hpp"
#include <opencv2/datasets/tinyxml2/tinyxml2.h>
#include "tinyxml2/tinyxml2.h"
namespace cv
{
......
......@@ -96,6 +96,9 @@ namespace cv
namespace dpm
{
//! @addtogroup dpm
//! @{
/** @brief This is a C++ abstract class, it provides external user API to work with DPM.
*/
class CV_EXPORTS_W DPMDetector
......@@ -142,6 +145,8 @@ public:
virtual ~DPMDetector(){}
};
//! @}
} // namespace dpm
} // namespace cv
......
......@@ -183,7 +183,7 @@ The function createFreeType2 create instance to draw UTF-8 strings.
*/
CV_EXPORTS_W Ptr<FreeType2> createFreeType2();
//! @]
//! @}
} } // namespace freetype
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment