Merge pull request #3426 from mshabunin:doxygen-imgproc

This commit is contained in:
Vadim Pisarevsky
2014-12-01 10:43:13 +00:00
14 changed files with 4429 additions and 922 deletions

View File

@@ -170,7 +170,7 @@ CV_EXPORTS void updateWindow(const String& winname);
struct QtFont
{
const char* nameFont; // Qt: nameFont
Scalar color; // Qt: ColorFont -> cvScalar(blue_component, green_component, red\_component[, alpha_component])
Scalar color; // Qt: ColorFont -> cvScalar(blue_component, green_component, red_component[, alpha_component])
int font_face; // Qt: bool italic
const int* ascii; // font data and metrics
const int* greek;