From bebd3b4318bdcd012c783bb3c4617ed7169551f4 Mon Sep 17 00:00:00 2001
From: Antoine Regimbeau <antoine.regimbeau@c-s.fr>
Date: Wed, 19 Jul 2017 16:27:57 +0200
Subject: [PATCH] Bug fix on inversion of line and column
---
.../test/otbContrastEnhancementFilter.cxx | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/Modules/Filtering/Contrast/test/otbContrastEnhancementFilter.cxx b/Modules/Filtering/Contrast/test/otbContrastEnhancementFilter.cxx
index 6f31abe7e8..c1f4df99a5 100644
--- a/Modules/Filtering/Contrast/test/otbContrastEnhancementFilter.cxx
+++ b/Modules/Filtering/Contrast/test/otbContrastEnhancementFilter.cxx
@@ -175,7 +175,7 @@ main( int argc,
// const char * outputfilename = argv[ 2 ];
if (argc<6)
{
- std::cout<<"error : otbContrastTestDriver -inputFilename -outputFilename -gainImageFilename -h -l"<<std::endl;
+ std::cout<<"error : otbContrastTestDriver -inputFilename -outputFilename -gainImageFilename -hThumbnail -wThumbnail"<<std::endl;
if (argc>1)
{
typedef otb::ImageFileReader< VectorImageType > ReaderType;
@@ -211,22 +211,22 @@ main( int argc,
int hThumbnail = atoi(argv[4]);
int wThumbnail = atoi(argv[5]);
ImageType::Pointer inputImage = vectorToImageFilter->GetOutput();
- if ( inputImage->GetLargestPossibleRegion().GetSize()[1]%wThumbnail != 0 )
+ if ( inputImage->GetLargestPossibleRegion().GetSize()[1]%hThumbnail != 0 )
{
- std::cout<<"error : l is not a divider of the input's width"<<std::endl;
+ std::cout<<"error : hThumbnail = "<<hThumbnail<<" is not a divider of the input's width"<<std::endl;
std::cout<<"Image Height = "<<input->GetLargestPossibleRegion().GetSize()[1]<<std::endl;
return 1;
}
- if ( inputImage->GetLargestPossibleRegion().GetSize()[0]%hThumbnail != 0 )
+ if ( inputImage->GetLargestPossibleRegion().GetSize()[0]%wThumbnail != 0 )
{
- std::cout<<"error : h is not a divider of the input's height"<<std::endl;
+ std::cout<<"error : wThumbnail = "<<wThumbnail<<"is not a divider of the input's height"<<std::endl;
std::cout<<"Image Width = "<<input->GetLargestPossibleRegion().GetSize()[0]<<std::endl;
return 1;
}
- int nH = inputImage->GetLargestPossibleRegion().GetSize()[0]/hThumbnail;
+ int nH = inputImage->GetLargestPossibleRegion().GetSize()[0]/wThumbnail;
std::cout<<"nH ="<<nH<<std::endl;
- int nW = inputImage->GetLargestPossibleRegion().GetSize()[1]/wThumbnail;
+ int nW = inputImage->GetLargestPossibleRegion().GetSize()[1]/hThumbnail;
std::cout<<"nW ="<<nW<<std::endl;
std::array< int , sizeh > histoTarget;
// createTarget( histoTarget , vectorToImageFilter->GetOutput() );
@@ -248,7 +248,6 @@ main( int argc,
// lutGrid[0][0].fill(0);
std::array< int , sizeh > histoGrid [(nH)*(nW)] = {};
- std::cout<<nH*nW<<std::endl;
for (int i = 0 ; i<(nH)*(nW) ; i++)
{
lutGrid[i].fill(0);
--
GitLab