From fe1af81d6adb5ff8d2c07233ee310485c8ac7914 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Fri, 24 Mar 2017 01:05:43 +0000 Subject: [PATCH] Minor fixes in examples and CMakeLists.txt --- app/CMakeLists.txt | 2 +- app/ConfigureFormatDialog.cpp | 2 +- examples/modules/CMakeLists.txt | 2 +- examples/modules/FrameBinarization_APIv1.cpp | 12 ++++++------ examples/modules/FrameBinarization_APIv1.h | 14 +++++++------- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 801e71e..bf73cd2 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -136,7 +136,7 @@ IF( USE_FERVOR ) ENDIF() ENDIF() -SET_PACKAGE_PROPERTIES(Fervor PROPERTIES URL "http://ffmpeg.org/" DESCRIPTION "Fervor lib includes check for updates feature" TYPE OPTIONAL ) +SET_PACKAGE_PROPERTIES(Fervor PROPERTIES URL "https://github.com/pypt/fervor" DESCRIPTION "Fervor lib includes check for updates feature" TYPE OPTIONAL ) ADD_FEATURE_INFO(Fervor USE_FERVOR "Fervor lib includes check for updates feature.") IF( USE_QT4 ) diff --git a/app/ConfigureFormatDialog.cpp b/app/ConfigureFormatDialog.cpp index 9a9f836..50c68c2 100644 --- a/app/ConfigureFormatDialog.cpp +++ b/app/ConfigureFormatDialog.cpp @@ -142,7 +142,7 @@ ConfigureFormatDialog::ConfigureFormatDialog( QWidget* parent ) : QDialog( paren UInt uiWidth, uiHeight; readSettings(); - for( UInt i = 0; i < aRCustomFileFormats.size(); i++ ) + for( Int i = 0; i < aRCustomFileFormats.size(); i++ ) { Name = QString::fromStdString( aRCustomFileFormats[i].shortName ); uiWidth = aRCustomFileFormats[i].uiWidth; diff --git a/examples/modules/CMakeLists.txt b/examples/modules/CMakeLists.txt index 3a0aff7..f3c10b7 100644 --- a/examples/modules/CMakeLists.txt +++ b/examples/modules/CMakeLists.txt @@ -7,7 +7,7 @@ CMAKE_MINIMUM_REQUIRED( VERSION 2.8.9 ) PROJECT( "modules_example" ) -FIND_PACKAGE( PlaYUVer ) +# FIND_PACKAGE( PlaYUVer ) INCLUDE_DIRECTORIES( ${PLAYUVER_INCLUDE_DIRS} ) diff --git a/examples/modules/FrameBinarization_APIv1.cpp b/examples/modules/FrameBinarization_APIv1.cpp index 6f5c47d..273fe31 100644 --- a/examples/modules/FrameBinarization_APIv1.cpp +++ b/examples/modules/FrameBinarization_APIv1.cpp @@ -24,14 +24,14 @@ #include "FrameBinarization_APIv1.h" -REGISTER_CLASS_MAKER( FrameBinarization ) +REGISTER_CLASS_MAKER( FrameBinarization_APIv1 ) -FrameBinarization::FrameBinarization() +FrameBinarization_APIv1::FrameBinarization_APIv1() { /* Module Definition */ m_iModuleType = FRAME_PROCESSING_MODULE; m_pchModuleCategory = "Utilities"; - m_pchModuleName = "FrameBinarization"; + m_pchModuleName = "FrameBinarization_APIv1"; m_pchModuleTooltip = "Binarize frame"; m_uiNumberOfFrames = MODULE_REQUIRES_ONE_FRAME; m_uiModuleRequirements = MODULE_REQUIRES_OPTIONS; @@ -43,13 +43,13 @@ FrameBinarization::FrameBinarization() m_uiThreshold = 128; } -Void FrameBinarization::create( PlaYUVerFrame* frame ) +Void FrameBinarization_APIv1::create( PlaYUVerFrame* frame ) { m_pcBinFrame = NULL; m_pcBinFrame = new PlaYUVerFrame( frame->getWidth(), frame->getHeight(), PlaYUVerFrame::GRAY, 8 ); } -PlaYUVerFrame* FrameBinarization::process( PlaYUVerFrame* frame ) +PlaYUVerFrame* FrameBinarization_APIv1::process( PlaYUVerFrame* frame ) { Pel* pPelInput = frame->getPelBufferYUV()[0][0]; Pel* pPelBin = m_pcBinFrame->getPelBufferYUV()[0][0]; @@ -61,7 +61,7 @@ PlaYUVerFrame* FrameBinarization::process( PlaYUVerFrame* frame ) return m_pcBinFrame; } -Void FrameBinarization::destroy() +Void FrameBinarization_APIv1::destroy() { if( m_pcBinFrame ) delete m_pcBinFrame; diff --git a/examples/modules/FrameBinarization_APIv1.h b/examples/modules/FrameBinarization_APIv1.h index 6a67115..8658de8 100644 --- a/examples/modules/FrameBinarization_APIv1.h +++ b/examples/modules/FrameBinarization_APIv1.h @@ -22,25 +22,25 @@ * \brief Binarize frame module (example of APIv1) */ -#ifndef __FRAMEBINARIZATION_H__ -#define __FRAMEBINARIZATION_H__ +#ifndef __FRAMEBINARIZATION_APIV1_H__ +#define __FRAMEBINARIZATION_APIV1_H__ #include "PlaYUVerModuleIf.h" -class FrameBinarization : public PlaYUVerModuleIf +class FrameBinarization_APIv1 : public PlaYUVerModuleIf { - REGISTER_CLASS_FACTORY( FrameBinarization ) + REGISTER_CLASS_FACTORY( FrameBinarization_APIv1 ) private: PlaYUVerFrame* m_pcBinFrame; UInt m_uiThreshold; public: - FrameBinarization(); - virtual ~FrameBinarization() {} + FrameBinarization_APIv1(); + virtual ~FrameBinarization_APIv1() {} Void create( PlaYUVerFrame* ); PlaYUVerFrame* process( PlaYUVerFrame* ); Void destroy(); }; -#endif // __FRAMEBINARIZATION_H__ +#endif // __FRAMEBINARIZATION_APIV1_H__