Commit 0299897b authored by Rashad Kanavath's avatar Rashad Kanavath

Merge remote-tracking branch 'origin/release-5.8' into packaging_fixes

parents f27549f5 a81ff69f
...@@ -150,7 +150,7 @@ macro(otb_module_impl) ...@@ -150,7 +150,7 @@ macro(otb_module_impl)
else() else()
# if OTB_SOURCE_DIR is set all auto-generated export headers for a class # if OTB_SOURCE_DIR is set all auto-generated export headers for a class
# goes into OTBCommon_BINARY_DIR/src. # goes into OTBCommon_BINARY_DIR/src.
# Hence it is requred to include ${OTBCommon_BINARY_DIR} to list of # Hence it is required to include ${OTBCommon_BINARY_DIR} to list of
# ${otb-module}_INCLUDE_DIRS. Not doing this will force developer to # ${otb-module}_INCLUDE_DIRS. Not doing this will force developer to
# to include them explicitly for each module which can result in # to include them explicitly for each module which can result in
# more problems. ( stephane albert) # more problems. ( stephane albert)
......
...@@ -396,16 +396,17 @@ configure_file( ...@@ -396,16 +396,17 @@ configure_file(
add_custom_target(uninstall add_custom_target(uninstall
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/cmake_uninstall.cmake) COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/cmake_uninstall.cmake)
#----------------------------------------------------------------------------- # #-----------------------------------------------------------------------------
# Packaging options for Windows packages # # Packaging options for Windows packages
if(WIN32 OR CMAKE_CROSSCOMPILING) # if(WIN32 OR CMAKE_CROSSCOMPILING)
option(GENERATE_PACKAGE "Generate OTB package" OFF) # option(GENERATE_PACKAGE "Generate OTB package" OFF)
option(GENERATE_XDK "Generate XDK for OTB development" OFF) # option(GENERATE_XDK "Generate XDK for OTB development" OFF)
if(GENERATE_PACKAGE OR GENERATE_XDK) # if(GENERATE_PACKAGE OR GENERATE_XDK)
set(MXE_TARGET_DIR "" CACHE PATH "path to mxe directory") # set(MXE_TARGET_DIR "" CACHE PATH "path to mxe directory")
add_subdirectory(${OTB_SOURCE_DIR}/SuperBuild/Packaging ${CMAKE_BINARY_DIR}/Packaging) # set(PACKAGE_OTB_SRC_DIR ${OTB_SOURCE_DIR})
endif() # (GENERATE_PACKAGE OR GENERATE_XDK) # add_subdirectory(${OTB_SOURCE_DIR}/SuperBuild/Packaging ${CMAKE_BINARY_DIR}/Packaging)
endif() # (WIN32 OR CMAKE_CROSSCOMPILING) # endif() # (GENERATE_PACKAGE OR GENERATE_XDK)
# endif() # (WIN32 OR CMAKE_CROSSCOMPILING)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
#macro to put a fixed space between key, value in summary #macro to put a fixed space between key, value in summary
......
...@@ -124,7 +124,7 @@ private: ...@@ -124,7 +124,7 @@ private:
void DoInit() ITK_OVERRIDE void DoInit() ITK_OVERRIDE
{ {
SetName("OpticalCalibration"); SetName("OpticalCalibration");
SetDescription("Perform optical calibration TOA/TOC (Top Of Atmosphere/Top Of Canopy). Supported sensors: QuickBird, Ikonos, WorldView2, Formosat, Spot5, Pleiades, Spot6. For other sensors the application also allows providing calibration parameters manually."); SetDescription("Perform optical calibration TOA/TOC (Top Of Atmosphere/Top Of Canopy). Supported sensors: QuickBird, Ikonos, WorldView2, Formosat, Spot5, Pleiades, Spot6, Spot7. For other sensors the application also allows providing calibration parameters manually.");
// Documentation // Documentation
SetDocName("Optical calibration"); SetDocName("Optical calibration");
SetDocLongDescription("The application allows converting pixel values from DN (for Digital Numbers) to reflectance. Calibrated values are called surface reflectivity and its values lie in the range [0, 1].\nThe first level is called Top Of Atmosphere (TOA) reflectivity. It takes into account the sensor gain, sensor spectral response and the solar illuminations.\nThe second level is called Top Of Canopy (TOC) reflectivity. In addition to sensor gain and solar illuminations, it takes into account the optical thickness of the atmosphere, the atmospheric pressure, the water vapor amount, the ozone amount, as well as the composition and amount of aerosol gasses.\nIt is also possible to indicate an AERONET file which contains atmospheric parameters (version 1 and version 2 of Aeronet file are supported. Note that computing TOC reflectivity will internally compute first TOA and then TOC reflectance. \n" SetDocLongDescription("The application allows converting pixel values from DN (for Digital Numbers) to reflectance. Calibrated values are called surface reflectivity and its values lie in the range [0, 1].\nThe first level is called Top Of Atmosphere (TOA) reflectivity. It takes into account the sensor gain, sensor spectral response and the solar illuminations.\nThe second level is called Top Of Canopy (TOC) reflectivity. In addition to sensor gain and solar illuminations, it takes into account the optical thickness of the atmosphere, the atmospheric pressure, the water vapor amount, the ozone amount, as well as the composition and amount of aerosol gasses.\nIt is also possible to indicate an AERONET file which contains atmospheric parameters (version 1 and version 2 of Aeronet file are supported. Note that computing TOC reflectivity will internally compute first TOA and then TOC reflectance. \n"
...@@ -812,8 +812,11 @@ private: ...@@ -812,8 +812,11 @@ private:
} }
else if (IMIName != IMIOptDfltName) else if (IMIName != IMIOptDfltName)
{ {
if (lImageMetadataInterface->GetSpectralSensitivity()->Size() > 0) //Avoid to call GetSpectralSensitivity() multiple times
m_paramAcqui->SetWavelengthSpectralBand(lImageMetadataInterface->GetSpectralSensitivity()); OpticalImageMetadataInterface::WavelengthSpectralBandVectorType spectralSensitivity = lImageMetadataInterface->GetSpectralSensitivity();
if (spectralSensitivity->Size() > 0)
m_paramAcqui->SetWavelengthSpectralBand(spectralSensitivity);
} }
// Check that m_paramAcqui contains a real spectral profile. // Check that m_paramAcqui contains a real spectral profile.
if (m_paramAcqui->GetWavelengthSpectralBand()->Size() == 0) if (m_paramAcqui->GetWavelengthSpectralBand()->Size() == 0)
......
...@@ -492,7 +492,7 @@ ImageFileReader<TOutputImage, ConvertPixelTraits> ...@@ -492,7 +492,7 @@ ImageFileReader<TOutputImage, ConvertPixelTraits>
} }
else else
{ {
// Read back from existing dictionnary // Read back from existing dictionary
ImageKeywordlist otb_kwl; ImageKeywordlist otb_kwl;
itk::ExposeMetaData<ImageKeywordlist>(this->GetOutput()->GetMetaDataDictionary(), itk::ExposeMetaData<ImageKeywordlist>(this->GetOutput()->GetMetaDataDictionary(),
MetaDataKey::OSSIMKeywordlistKey,otb_kwl); MetaDataKey::OSSIMKeywordlistKey,otb_kwl);
......
...@@ -685,7 +685,7 @@ int TestHelper::RegressionTestDiffFile(const char * testAsciiFileName, const cha ...@@ -685,7 +685,7 @@ int TestHelper::RegressionTestDiffFile(const char * testAsciiFileName, const cha
// filter ignored lines // filter ignored lines
// TODO // TODO
// filter lines with hexa adress (isHexaPointerAddress) // filter lines with hexa address (isHexaPointerAddress)
// use isToBeIgnoredForAnyComparison() // use isToBeIgnoredForAnyComparison()
// Iterate over the baseline lines // Iterate over the baseline lines
...@@ -816,7 +816,7 @@ int TestHelper::RegressionTestDiffFile(const char * testAsciiFileName, const cha ...@@ -816,7 +816,7 @@ int TestHelper::RegressionTestDiffFile(const char * testAsciiFileName, const cha
else else
{ {
// examine other cases : // examine other cases :
// test if hexadecimal adress // test if hexadecimal address
bool isRefTokenHexa = isHexaPointerAddress( bool isRefTokenHexa = isHexaPointerAddress(
curLineRef, curLineRef,
tokenRef[i].begin()-curLineRef.begin(), tokenRef[i].begin()-curLineRef.begin(),
...@@ -827,7 +827,7 @@ int TestHelper::RegressionTestDiffFile(const char * testAsciiFileName, const cha ...@@ -827,7 +827,7 @@ int TestHelper::RegressionTestDiffFile(const char * testAsciiFileName, const cha
tokenTest[i].size()); tokenTest[i].size());
if (isRefTokenHexa && isTestTokenHexa) if (isRefTokenHexa && isTestTokenHexa)
{ {
// these tokens are equivalent (we don't compare pointer adress) // these tokens are equivalent (we don't compare pointer address)
areTokensEquivalent = true; areTokensEquivalent = true;
} }
else else
...@@ -2220,11 +2220,11 @@ bool TestHelper::isHexaPointerAddress(const std::string& str, size_t pos, size_t ...@@ -2220,11 +2220,11 @@ bool TestHelper::isHexaPointerAddress(const std::string& str, size_t pos, size_t
return false; return false;
} }
// pointer adress has to begin with '0x' // pointer address has to begin with '0x'
// it may also start with '00' with a size of 16 (64bit adress) // it may also start with '00' with a size of 16 (64bit address)
// or start with '0' with a size of 8 (32bit adress) // or start with '0' with a size of 8 (32bit address)
// Note: the last pattern seems a bit weak but cases like '00B5FA18' or // Note: the last pattern seems a bit weak but cases like '00B5FA18' or
// '01C46D80' both are valid hexadecimal adresses on windows // '01C46D80' both are valid hexadecimal addresses on windows
if (str[pos] != 48) if (str[pos] != 48)
{ {
return false; return false;
......
...@@ -198,7 +198,7 @@ endmacro(macro_create_targets_for_package) ...@@ -198,7 +198,7 @@ endmacro(macro_create_targets_for_package)
# #
# MATCH_STRINGS - list of cmake variables that are set in INPUT_FILE. # MATCH_STRINGS - list of cmake variables that are set in INPUT_FILE.
# - eg: set(OTB_VERSION_MAJOR "5") or set(OTB_VERSION_PATCH 85) # - eg: set(OTB_VERSION_MAJOR "5") or set(OTB_VERSION_PATCH 85)
# - It works on both qouted and non-quoted values. # - It works on both quoted and non-quoted values.
# #
# PREFIX - optional prefix string where you need to have the output stored # PREFIX - optional prefix string where you need to have the output stored
# #
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment