Merge lot of cool stuff in master

Make it stable and release it
This commit is contained in:
2015-01-17 03:52:19 +00:00
parent 3e6b04e983
commit 58a0b11c8f
69 changed files with 1854 additions and 2487 deletions
+3 -14
View File
@@ -1,6 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
* Copyright (C) 2014-2015 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -29,19 +29,9 @@
namespace plaYUVer
{
static PlaYUVerModuleDefinition DisparityStereoVarDef =
{
FRAME_PROCESSING_MODULE,
"Disparity",
"StereoVar",
"Measure the disparity between two images using the Stereo Var method (OpenCV)",
MODULE_REQUIRES_TWO_FRAMES,
MODULE_REQUIRES_NEW_WINDOW,
!APPLY_WHILE_PLAYING,
};
DisparityStereoVar::DisparityStereoVar()
{
/* Module Definition */
m_iModuleType = FRAME_PROCESSING_MODULE;
m_pchModuleCategory = "Disparity";
m_pchModuleName = "StereoVar";
@@ -50,7 +40,6 @@ DisparityStereoVar::DisparityStereoVar()
m_uiModuleRequirements = MODULE_REQUIRES_NEW_WINDOW;
m_bApplyWhilePlaying = !APPLY_WHILE_PLAYING;
setModuleDefinition( DisparityStereoVarDef );
m_pcDisparityFrame = NULL;
m_cStereoVar.levels = 3; // ignored with USE_AUTO_PARAMS
m_cStereoVar.pyrScale = 0.5; // ignored with USE_AUTO_PARAMS