From 58d180600d60ba49057ddf3c9ac4f23f762fda81 Mon Sep 17 00:00:00 2001
From: Cyrille Valladeau <cyrille.valladeau@c-s.fr>
Date: Wed, 23 Nov 2011 12:03:27 +0100
Subject: [PATCH] ENH: set the sizefactor optionnal
---
Testing/Code/Visualization/CMakeLists.txt | 2 +-
.../Code/Visualization/otbImageWidgetImageDump.cxx | 12 +++++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/Testing/Code/Visualization/CMakeLists.txt b/Testing/Code/Visualization/CMakeLists.txt
index ef53f39423..17c029d428 100644
--- a/Testing/Code/Visualization/CMakeLists.txt
+++ b/Testing/Code/Visualization/CMakeLists.txt
@@ -48,8 +48,8 @@ ${TEMP}/vrTvImageWidgetImageDumpWithoutGlAcceleration.png
otbImageWidgetImageDump
${INPUTDATA}/qb_RoadExtract2sub200x200.tif # input image
0 # use glAcceleration
-2 # resize factor
${TEMP}/vrTvImageWidgetImageDumpWithoutGlAcceleration.png
+2 # resize factor
)
IF(OTB_GL_USE_ACCEL)
diff --git a/Testing/Code/Visualization/otbImageWidgetImageDump.cxx b/Testing/Code/Visualization/otbImageWidgetImageDump.cxx
index 27cef4bbd3..4853924e71 100644
--- a/Testing/Code/Visualization/otbImageWidgetImageDump.cxx
+++ b/Testing/Code/Visualization/otbImageWidgetImageDump.cxx
@@ -24,10 +24,9 @@
int otbImageWidgetImageDump(int argc, char * argv[])
{
- const char * infname = argv[1];
+ const char * infname = argv[1];
const bool useAccel = atoi(argv[2]);
- unsigned int sizeFactor = atoi(argv[3]);
- const char * filename = argv[4];
+ const char * filename = argv[3];
// typedefs
@@ -43,8 +42,11 @@ int otbImageWidgetImageDump(int argc, char * argv[])
ImageType::RegionType region = reader->GetOutput()->GetLargestPossibleRegion();
ImageType::RegionType::SizeType size = region.GetSize();
- size[0] /= sizeFactor;
- size[1] /= sizeFactor;
+ if( argc == 5 )
+ {
+ size[0] /= atoi(argv[4]);
+ size[1] /= atoi(argv[4]);
+ }
region.SetSize(size);
// Create a widget
--
GitLab