From 3a43289fa145bcc1605fae1dc2b19a3a105d572f Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Thu, 15 Mar 2018 23:09:57 +0000 Subject: [PATCH] Fix visual studio error --- tools/CalypTools.cpp | 8 +++++++- tools/CalypTools.h | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/CalypTools.cpp b/tools/CalypTools.cpp index e0f423e..8cb6a01 100644 --- a/tools/CalypTools.cpp +++ b/tools/CalypTools.cpp @@ -138,6 +138,12 @@ int CalypTools::Open( int argc, char* argv[] ) { int iRet = 0; + // check requirements + if( CalypPixel::getMaxNumberOfComponents() > MAX_NUMBER_CHANNELS ) + { + log( CLP_LOG_ERROR, "Cannot parse the maximum number of components!" ); + return 1; + } if( ( iRet = parseToolsArgs( argc, argv ) ) > 0 ) { return iRet; @@ -424,7 +430,7 @@ int CalypTools::QualityOperation() const char* pchQualityMetricName = CalypFrame::supportedQualityMetricsList()[m_uiQualityMetric].c_str(); CalypFrame* apcCurrFrame[MAX_NUMBER_INPUTS]; bool abEOF[MAX_NUMBER_INPUTS]; - double adAverageQuality[MAX_NUMBER_INPUTS - 1][CalypPixel::getMaxNumberOfComponents()]; + double adAverageQuality[MAX_NUMBER_INPUTS - 1][MAX_NUMBER_CHANNELS]; double dQuality; ClpString metric_fmt = " "; diff --git a/tools/CalypTools.h b/tools/CalypTools.h index ef75d0a..c60382c 100644 --- a/tools/CalypTools.h +++ b/tools/CalypTools.h @@ -53,6 +53,7 @@ class CalypStream; class CalypModuleIf; #define MAX_NUMBER_INPUTS 10 +#define MAX_NUMBER_CHANNELS 4 class CalypTools : public CalypToolsCmdParser {