generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

partially recovered binary compatibility (ticket #2415)

Browse Source
This commit is contained in:
Vadim Pisarevsky
2012-10-08 17:06:05 +04:00
parent 25a9b0a255
commit 94b97b7a63
11 changed files with 138 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/src/opengl_interop.cpp
View File

@@ -1257,7 +1257,7 @@ cv::GlFont::GlFont(const string& _family, int _height, Weight _weight, Style _st
#endif
}
void cv::GlFont::draw(const char* str, size_t len) const
void cv::GlFont::draw(const char* str, int len) const
{
#ifndef HAVE_OPENGL
(void)str;
@@ -1409,7 +1409,7 @@ void cv::render(const string& str, const Ptr<GlFont>& font, Scalar color, Point2
glRasterPos2d(2.0 * (viewport[0] + pos.x) / viewport[2] - 1.0, 1.0 - 2.0 * (viewport[1] + pos.y + font->height()) / viewport[3]);
font->draw(str.c_str(), str.length());
font->draw(str.c_str(), (int)str.length());
glPopAttrib();
#endif