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

fixed several warnings (VS2010, Win64)

Browse Source 
added getParams method to VideoWriter_GPU
This commit is contained in:
Vladislav Vinogradov
2012-04-23 14:22:02 +00:00
parent 24be840c44
commit f65d841d6f
18 changed files with 163 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1257,11 +1257,11 @@ cv::GlFont::GlFont(const string& family, int height, Weight weight, Style style)
#endif
}
void cv::GlFont::draw(const char* str, int len) const
void cv::GlFont::draw(const char* str, size_t len) const
{
#ifndef HAVE_OPENGL
(void)str;
(void)len;
(void)str;
(void)len;
throw_nogl;
#else
if (base_ && len > 0)
@@ -1269,7 +1269,7 @@ void cv::GlFont::draw(const char* str, int len) const
glPushAttrib(GL_LIST_BIT);
glListBase(base_);
glCallLists(len, GL_UNSIGNED_BYTE, str);
glCallLists(static_cast<GLsizei>(len), GL_UNSIGNED_BYTE, str);
glPopAttrib();