mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 14:13:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12501 from alalek:fix_qt_build

Browse Source
This commit is contained in:
Alexander Alekhin 2018-09-12 17:14:23 +00:00
commit 796795ac89
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/highgui/src/window.cpp
View File

@ -469,23 +469,23 @@ CV_IMPL void cvUpdateWindow(const char*)
cv::QtFont cv::fontQt(const String& nameFont, int pointSize, Scalar color, int weight, int style, int spacing) cv::QtFont cv::fontQt(const String& nameFont, int pointSize, Scalar color, int weight, int style, int spacing)
{ {
CvFont f = cvFontQt(nameFont.c_str(), pointSize,color,weight, style, spacing); CvFont f = cvFontQt(nameFont.c_str(), pointSize, cvScalar(color), weight, style, spacing);
void* pf = &f; // to suppress strict-aliasing void* pf = &f; // to suppress strict-aliasing
return *(cv::QtFont*)pf; return *(cv::QtFont*)pf;
} }
void cv::addText( const Mat& img, const String& text, Point org, const QtFont& font) void cv::addText( const Mat& img, const String& text, Point org, const QtFont& font)
{ {
CvMat _img = img; CvMat _img = cvMat(img);
cvAddText( &_img, text.c_str(), org, (CvFont*)&font); cvAddText( &_img, text.c_str(), cvPoint(org), (CvFont*)&font);
} }
void cv::addText( const Mat& img, const String& text, Point org, const String& nameFont, void cv::addText( const Mat& img, const String& text, Point org, const String& nameFont,
int pointSize, Scalar color, int weight, int style, int spacing) int pointSize, Scalar color, int weight, int style, int spacing)
{ {
CvFont f = cvFontQt(nameFont.c_str(), pointSize,color,weight, style, spacing); CvFont f = cvFontQt(nameFont.c_str(), pointSize, cvScalar(color), weight, style, spacing);
CvMat _img = img; CvMat _img = cvMat(img);
cvAddText( &_img, text.c_str(), org, &f); cvAddText( &_img, text.c_str(), cvPoint(org), &f);
} }
void cv::displayStatusBar(const String& name, const String& text, int delayms) void cv::displayStatusBar(const String& name, const String& text, int delayms)