From 35f5e11f6165c5be2c37e9d6940afc73a43d87d0 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Fri, 20 Mar 2015 19:40:40 +0000 Subject: [PATCH] Remove variable declaration of variables --- lib/PlaYUVerCmdParser.cpp | 1 - lib/PlaYUVerFrame.h | 2 ++ tools/PlaYUVerTools.cpp | 8 ++++---- tools/PlaYUVerTools.h | 2 ++ 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/PlaYUVerCmdParser.cpp b/lib/PlaYUVerCmdParser.cpp index b6fdc20..65bda94 100644 --- a/lib/PlaYUVerCmdParser.cpp +++ b/lib/PlaYUVerCmdParser.cpp @@ -43,7 +43,6 @@ PlaYUVerCmdParser::PlaYUVerCmdParser() ( "quality_metrics", "list supported quality metrics" )/**/ ( "module_list", "list supported modules" ) /**/ ( "module_list_full", "detailed list supported modules" ); - } PlaYUVerCmdParser::~PlaYUVerCmdParser() diff --git a/lib/PlaYUVerFrame.h b/lib/PlaYUVerFrame.h index 271c8d7..0625cd1 100644 --- a/lib/PlaYUVerFrame.h +++ b/lib/PlaYUVerFrame.h @@ -40,6 +40,8 @@ namespace plaYUVer struct PlaYUVerPixFmtDescriptor; +#define MAX_NUMBER_COMPONENTS 4 + /** * \class PlaYUVerFrame * \ingroup PlaYUVerLib PlaYUVerLib_Frame diff --git a/tools/PlaYUVerTools.cpp b/tools/PlaYUVerTools.cpp index c99a3b6..7f52abb 100644 --- a/tools/PlaYUVerTools.cpp +++ b/tools/PlaYUVerTools.cpp @@ -74,7 +74,7 @@ Int PlaYUVerTools::openInputs() std::vector inputFileNames = m_cCmdLineHandler.m_apcInputs; PlaYUVerStream* pcStream; - for( UInt i = 0; i < inputFileNames.size(); i++ ) + for( UInt i = 0; i < inputFileNames.size() && i < MAX_NUMBER_INPUTS; i++ ) { pcStream = new PlaYUVerStream; try @@ -233,9 +233,9 @@ Int PlaYUVerTools::Close() Int PlaYUVerTools::QualityOperation() { - PlaYUVerFrame* apcCurrFrame[m_apcInputStreams.size()]; - Bool abEOF[m_apcInputStreams.size()]; - Double adAverageQuality[m_apcInputStreams.size() - 1][m_uiNumberOfComponents]; + PlaYUVerFrame* apcCurrFrame[MAX_NUMBER_INPUTS]; + Bool abEOF[MAX_NUMBER_INPUTS]; + Double adAverageQuality[MAX_NUMBER_INPUTS - 1][MAX_NUMBER_COMPONENTS]; Double dQuality; m_cCmdLineHandler.log( CommandLineHandle::INFO, " Measuring Quality using %s ... \n", diff --git a/tools/PlaYUVerTools.h b/tools/PlaYUVerTools.h index d39f9a7..6a87e3d 100644 --- a/tools/PlaYUVerTools.h +++ b/tools/PlaYUVerTools.h @@ -36,6 +36,8 @@ namespace plaYUVer class PlaYUVerModuleIf; +#define MAX_NUMBER_INPUTS 10 + class PlaYUVerTools { public: