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

fixed memory leaks

Browse Source
This commit is contained in:
Alexey Ershov 2015-07-29 11:07:11 +03:00
parent 47e7a7a7ce
commit b102bc6678
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
samples/opengl/opengl_interop.cpp
View File

@ -223,9 +223,9 @@ public:
cv::cvtColor(m_frame_bgr, m_frame_rgba, CV_RGB2RGBA); cv::cvtColor(m_frame_bgr, m_frame_rgba, CV_RGB2RGBA);
if (use_buffer()) if (use_buffer())
buffer.copyFrom(m_frame_rgba); buffer.copyFrom(m_frame_rgba, cv::ogl::Buffer::PIXEL_UNPACK_BUFFER, true);
else else
texture.copyFrom(m_frame_rgba); texture.copyFrom(m_frame_rgba, true);
return 0; return 0;
} }
@ -287,6 +287,9 @@ public:
cv::ogl::Texture2D texture; cv::ogl::Texture2D texture;
cv::ogl::Buffer buffer; cv::ogl::Buffer buffer;
texture.setAutoRelease(true);
buffer.setAutoRelease(true);
r = get_frame(texture, buffer); r = get_frame(texture, buffer);
if (r != 0) if (r != 0)
{ {
@ -317,9 +320,9 @@ public:
} }
if (do_buffer) if (do_buffer)
buffer.copyFrom(m); buffer.copyFrom(m, cv::ogl::Buffer::PIXEL_UNPACK_BUFFER, true);
else else
texture.copyFrom(m); texture.copyFrom(m, true);
break; break;
} }
@ -354,7 +357,7 @@ public:
{ {
cv::Mat m(m_height, m_width, CV_8UC4); cv::Mat m(m_height, m_width, CV_8UC4);
buffer.copyTo(m); buffer.copyTo(m);
texture.copyFrom(m); texture.copyFrom(m, true);
} }
#if defined(__linux__) #if defined(__linux__)

2
samples/opengl/winapp.hpp
View File

@ -162,9 +162,9 @@ public:
idle(); idle();
} }
} while (!m_end_loop); } while (!m_end_loop);
#endif
return 0; return 0;
#endif
} }
protected: protected: