Commit bf4421ed authored by Otmane Lahlou's avatar Otmane Lahlou
Browse files

MRG

parents 37d5099b 1ddb2feb
......@@ -64,17 +64,21 @@ int main(int argc, char* argv[])
std::string language = "en_EN.UTF-8";
/** Write parameters to the configuration file*/
os << "#Auto generated by config-properties \n"
os << "# Auto generated by config-properties \n\n"
<< "# Language for the GUI application based on otb\n"
<< "# for example OTB_LANG=en_EN.UTF-8\n"
<< "OTB_LANG="
<< language
<< "\n"
<< "\n\n"
<< "# Image size (in byte) to activate the streaming\n"
<< "OTB_STREAM_IMAGE_SIZE_TO_ACTIVATE_STREAMING="
<< paramVector[0]
<< "\n"
<< "\n\n"
<< "# Buffer size when the streaming is activated\n"
<< "OTB_STREAM_MAX_SIZE_BUFFER_FOR_STREAMING="
<< paramVector[1]
<< "\n"
<< "#End of config file properties generation"
<< "\n\n"
<< "#End of config file properties generation\n"
<< std::endl;
os.close();
......
......@@ -620,6 +620,13 @@ IF(GETTEXT_FOUND)
SET(OTB_LANG $ENV{LANG} CACHE STRING "OTB internationalization (Experimental)")#might want to get the Locale from the system here
SET(OTB_LANG_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/I18n)
SUBDIRS(I18n)
FIND_PATH(GETTEXT_INCLUDE_DIR
libintl.h
DOC "Path to gettext include directory (where libintl.h can be found)")
MARK_AS_ADVANCED(GETTEXT_INCLUDE_DIR)
IF(GETTEXT_INCLUDE_DIR)
INCLUDE_DIRECTORIES(${GETTEXT_INCLUDE_DIR})
ENDIF(GETTEXT_INCLUDE_DIR)
ELSE(GETTEXT_FOUND)
SET(OTB_I18N 0)
MESSAGE(STATUS
......@@ -878,9 +885,10 @@ ENDIF(OTB_DISABLE_UTILITIES_COMPILATION)
#-----------------------------------------------------------------------------
# Option to define streaming activation in applications
# Use by otbConfigure.h.in
SET(OTB_STREAM_IMAGE_SIZE_TO_ACTIVATE_STREAMING 8*4000*4000 CACHE STRING "Image size to activate using streaming for applications.")
# Note: 8*4000*4000 = 128000000 (double 4000x4000 image)
SET(OTB_STREAM_IMAGE_SIZE_TO_ACTIVATE_STREAMING 128000000 CACHE STRING "Image size to activate using streaming for applications.")
MARK_AS_ADVANCED(OTB_STREAM_IMAGE_SIZE_TO_ACTIVATE_STREAMING)
SET(OTB_STREAM_MAX_SIZE_BUFFER_FOR_STREAMING 8*4000*4000 CACHE STRING "Max size buffer for streaming.")
SET(OTB_STREAM_MAX_SIZE_BUFFER_FOR_STREAMING 128000000 CACHE STRING "Max size buffer for streaming.")
MARK_AS_ADVANCED(OTB_STREAM_MAX_SIZE_BUFFER_FOR_STREAMING)
......
......@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
Copyright (c) CS Systemes d'information. All rights reserved.
See CSCopyright.txt for details.
See CSCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbBinaryImageDensityFunction_h
......
......@@ -7,15 +7,15 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
Copyright (c) Institut Telecom ; Telecom bretagne. All rights reserved.
See ITCopyright.txt for details.
See ITCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbBoxAndWhiskerImageFilter__h
......
......@@ -7,15 +7,15 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
Copyright (c) Institut Telecom ; Telecom bretagne. All rights reserved.
See ITCopyright.txt for details.
See ITCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbBoxAndWhiskerImageFilter__txx
......
......@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbChangeLabelImageFilter_h
......
......@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbChangeLabelImageFilter_txx
......
......@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbClosePathFunctor_h
......
......@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbCorrectPolygonFunctor_h
......
......@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
Copyright (c) CS Systemes d'information. All rights reserved.
See CSCopyright.txt for details.
See CSCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbEdgeDensityImageFilter_h
......
......@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
Copyright (c) CS systèmes d'information. All rights reserved.
See CSCopyright.txt for details.
See CSCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
......
......@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
Copyright (c) CS Systemes d'information. All rights reserved.
See CSCopyright.txt for details.
See CSCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbEdgeDetectorImageFilter_h
......
......@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
Copyright (c) CS systèmes d'information. All rights reserved.
See CSCopyright.txt for details.
See CSCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
......
......@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageListToImageListApplyFilter_h
......
......@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageListToImageListApplyFilter_txx
......
......@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageListToVectorImageFilter_h
......
......@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageListToVectorImageFilter_txx
......
......@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImportGeoInformationImageFilter_h
......
......@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImportGeoInformationImageFilter_txx
......
......@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbInnerProductPCAImageFilter_h
......
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