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

Converted tabs to spaces.

Browse Source
This commit is contained in:
Roman Donchenko
2013-08-21 18:52:15 +04:00
parent e9a28f66ee
commit 3c137f7a04
33 changed files with 755 additions and 755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/highgui/src/cap_ffmpeg.cpp
View File

@@ -161,7 +161,7 @@ private:
class CvCapture_FFMPEG_proxy :
public CvCapture
public CvCapture
{
public:
CvCapture_FFMPEG_proxy() { ffmpegCapture = 0; }
@@ -186,7 +186,7 @@ public:
if (!ffmpegCapture ||
!icvRetrieveFrame_FFMPEG_p(ffmpegCapture, &data, &step, &width, &height, &cn))
return 0;
return 0;
cvInitImageHeader(&frame, cvSize(width, height), 8, cn);
cvSetData(&frame, data, step);
return &frame;
@@ -225,7 +225,7 @@ CvCapture* cvCreateFileCapture_FFMPEG_proxy(const char * filename)
}
class CvVideoWriter_FFMPEG_proxy :
public CvVideoWriter
public CvVideoWriter
{
public:
CvVideoWriter_FFMPEG_proxy() { ffmpegWriter = 0; }

14
modules/highgui/src/cap_ffmpeg_impl.hpp
View File

@@ -343,8 +343,8 @@ void CvCapture_FFMPEG::close()
class ImplMutex
{
public:
ImplMutex() { init(); }
~ImplMutex() { destroy(); }
ImplMutex() { init(); }
~ImplMutex() { destroy(); }
void init();
void destroy();
@@ -447,14 +447,14 @@ struct ImplMutex::Impl
void ImplMutex::init()
{
impl = (Impl*)malloc(sizeof(Impl));
impl->init();
impl = (Impl*)malloc(sizeof(Impl));
impl->init();
}
void ImplMutex::destroy()
{
impl->destroy();
free(impl);
impl = NULL;
impl->destroy();
free(impl);
impl = NULL;
}
void ImplMutex::lock() { impl->lock(); }
void ImplMutex::unlock() { impl->unlock(); }