From 04dca6452966a9bb9153b562c2f64a0318189281 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Mon, 13 Jun 2011 14:01:10 +0200
Subject: [PATCH] COMP: bug found when compiling on Windows
---
Code/Core/otbWrapperParameter.h | 8 ++++----
Code/Core/otbWrapperParameterGroup.cxx | 2 +-
Code/Wrappers/SWIG/otbApplication.i | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Code/Core/otbWrapperParameter.h b/Code/Core/otbWrapperParameter.h
index 4e73cf157c..d36218796f 100644
--- a/Code/Core/otbWrapperParameter.h
+++ b/Code/Core/otbWrapperParameter.h
@@ -35,18 +35,18 @@ enum DefaultValueMode
* This parameter has no default behaviour and should be set by
* the user.
*/
- UNKNOWN,
+ DefaultValueMode_UNKNOWN,
/**
* The default value of this parameter can be estimated from
* other parameters.
*/
- RELATIVE,
+ DefaultValueMode_RELATIVE,
/**
* The default value of this parameter is not depending on any
* other parameter.
*/
- ABSOLUTE
+ DefaultValueMode_ABSOLUTE
};
@@ -167,7 +167,7 @@ protected:
m_Description(""),
m_Key(""),
m_Mandatory(true),
- m_DefaultValueMode(UNKNOWN)
+ m_DefaultValueMode(DefaultValueMode_UNKNOWN)
{}
/** Destructor */
diff --git a/Code/Core/otbWrapperParameterGroup.cxx b/Code/Core/otbWrapperParameterGroup.cxx
index fc92a5e327..7568b05c98 100644
--- a/Code/Core/otbWrapperParameterGroup.cxx
+++ b/Code/Core/otbWrapperParameterGroup.cxx
@@ -371,7 +371,7 @@ ParameterGroup::GetParameterByKey(std::string name)
unsigned int
ParameterGroup::GetNumberOfParameters()
{
- m_ParameterList.size();
+ return m_ParameterList.size();
}
}
diff --git a/Code/Wrappers/SWIG/otbApplication.i b/Code/Wrappers/SWIG/otbApplication.i
index 4f61f03b12..2ed6b05fec 100644
--- a/Code/Wrappers/SWIG/otbApplication.i
+++ b/Code/Wrappers/SWIG/otbApplication.i
@@ -17,9 +17,9 @@ namespace Wrapper
enum DefaultValueMode
{
- UNKNOWN,
- RELATIVE,
- ABSOLUTE
+ DefaultValueMode_UNKNOWN,
+ DefaultValueMode_RELATIVE,
+ DefaultValueMode_ABSOLUTE
};
typedef enum
--
GitLab