[Git][debian-gis-team/pktools][upstream] New upstream version 2.6.7.5+ds
Bas Couwenberg
gitlab at salsa.debian.org
Sat Nov 24 22:35:57 GMT 2018
Bas Couwenberg pushed to branch upstream at Debian GIS Project / pktools
Commits:
f7eb2f95 by Bas Couwenberg at 2018-11-24T21:49:06Z
New upstream version 2.6.7.5+ds
- - - - -
5 changed files:
- CMakeLists.txt
- + CMakeLists.txt.orig
- + gdal-c++11.patch
- src/apps/pkfilterdem.cc
- src/apps/pkreclassogr.cc
Changes:
=====================================
CMakeLists.txt
=====================================
@@ -1,13 +1,14 @@
###############################################################################
#
# CMake build scripts for PKTOOLS
-#
+#
#
# History
# 2010/12/14 - Created by Peter Bunting for SPDLib
# 2012/02/07 - Edited by Peter Bunting for PKTOOLS
# 2014/11/22 - Edited by Peter Bunting for pktools
# 2015/12/10 - Edited by Pieter Kempeneers and Kris Vanhoof
+# 2018/08/18 - Patch bug 53725 by Bas Couwenberg
# Change log
# Find package lib
# Boost: disable auto linking: add_definitions("-DBOOST_ALL_NO_LIB")
@@ -35,7 +36,7 @@ set (PROJECT_SOURCE_DIR src)
# The version number.
set (PKTOOLS_VERSION_MAJOR 2)
set (PKTOOLS_VERSION_MINOR 6)
-set (PKTOOLS_VERSION_PATCH 7.4)
+set (PKTOOLS_VERSION_PATCH 7.5)
set (PKTOOLS_VERSION "${PKTOOLS_VERSION_MAJOR}.${PKTOOLS_VERSION_MINOR}.${PKTOOLS_VERSION_PATCH}")
set (PKTOOLS_PACKAGE_VERSION "${PKTOOLS_VERSION_MAJOR}.${PKTOOLS_VERSION_MINOR}.${PKTOOLS_VERSION_PATCH}")
set (PKTOOLS_PACKAGE_STRING "PKTOOLS ${PKTOOLS_VERSION_MAJOR}.${PKTOOLS_VERSION_MINOR}.${PKTOOLS_VERSION_PATCH}")
=====================================
CMakeLists.txt.orig
=====================================
@@ -0,0 +1,408 @@
+###############################################################################
+#
+# CMake build scripts for PKTOOLS
+#
+#
+# History
+# 2010/12/14 - Created by Peter Bunting for SPDLib
+# 2012/02/07 - Edited by Peter Bunting for PKTOOLS
+# 2014/11/22 - Edited by Peter Bunting for pktools
+# 2015/12/10 - Edited by Pieter Kempeneers and Kris Vanhoof
+# Change log
+# Find package lib
+# Boost: disable auto linking: add_definitions("-DBOOST_ALL_NO_LIB")
+# add cmake env variable Boost_COMPILER -vc110
+# FANN: create library CMake: add ADD_DEFINITIONS(-DFANN_DLL_EXPORTS)
+# GDAL: disabled macro for Visual Studio 2015
+#if defined(_MSC_VER) && (_MSC_VER < 1900)
+# define snprintf _snprintf
+#endif
+#set CMAKE_INSTALL_PREFIX to C:/OSGeo4W64;C:/Users/kempenep/Downloads/FANN-2.2.0-Source/FANN-2.2.0-Source/install;C:/Users/kempenep/Downloads/armadillo-6.200.4/install;C:\Users\kempenep\Downloads\nlopt-2.4.2-dll64
+#
+###############################################################################
+cmake_minimum_required(VERSION 2.6.0)
+#cmake_minimum_required(VERSION 2.8)
+###############################################################################
+# Set Project name and version
+project (PKTOOLS)
+
+set (PROJECT_BINARY_DIR bin)
+set (PROJECT_LIBRARY_DIR lib)
+set (PROJECT_INCLUDE_DIR include/pktools)
+set (PROJECT_DOC_DIR doc)
+set (PROJECT_SOURCE_DIR src)
+
+# The version number.
+set (PKTOOLS_VERSION_MAJOR 2)
+set (PKTOOLS_VERSION_MINOR 6)
+set (PKTOOLS_VERSION_PATCH 7.4)
+set (PKTOOLS_VERSION "${PKTOOLS_VERSION_MAJOR}.${PKTOOLS_VERSION_MINOR}.${PKTOOLS_VERSION_PATCH}")
+set (PKTOOLS_PACKAGE_VERSION "${PKTOOLS_VERSION_MAJOR}.${PKTOOLS_VERSION_MINOR}.${PKTOOLS_VERSION_PATCH}")
+set (PKTOOLS_PACKAGE_STRING "PKTOOLS ${PKTOOLS_VERSION_MAJOR}.${PKTOOLS_VERSION_MINOR}.${PKTOOLS_VERSION_PATCH}")
+set (PKTOOLS_PACKAGE_BUGREPORT "kempenep at gmail.com")
+set (PKTOOLS_PACKAGE "pktools")
+set (PKTOOLS_COPYRIGHT_YEAR 2016)
+
+set (PKTOOLS_BASE_VERSION_MAJOR 1)
+set (PKTOOLS_BASE_VERSION_MINOR 6)
+set (PKTOOLS_BASE_VERSION_PATCH 1)
+set (PKTOOLS_BASE_VERSION "${PKTOOLS_BASE_VERSION_MAJOR}.${PKTOOLS_BASE_VERSION_MINOR}.${PKTOOLS_BASE_VERSION_PATCH}")
+set (PKTOOLS_BASE_SOVERSION 1)
+
+set (PKTOOLS_ALGORITHMS_VERSION_MAJOR 1)
+set (PKTOOLS_ALGORITHMS_VERSION_MINOR 6)
+set (PKTOOLS_ALGORITHMS_VERSION_PATCH 1)
+set (PKTOOLS_ALGORITHMS_VERSION "${PKTOOLS_ALGORITHMS_VERSION_MAJOR}.${PKTOOLS_ALGORITHMS_VERSION_MINOR}.${PKTOOLS_ALGORITHMS_VERSION_PATCH}")
+set (PKTOOLS_ALGORITHMS_SOVERSION 1)
+
+set (PKTOOLS_FILECLASSES_VERSION_MAJOR 1)
+set (PKTOOLS_FILECLASSES_VERSION_MINOR 6)
+set (PKTOOLS_FILECLASSES_VERSION_PATCH 1)
+set (PKTOOLS_FILECLASSES_VERSION "${PKTOOLS_FILECLASSES_VERSION_MAJOR}.${PKTOOLS_FILECLASSES_VERSION_MINOR}.${PKTOOLS_FILECLASSES_VERSION_PATCH}")
+set (PKTOOLS_FILECLASSES_SOVERSION 1)
+
+set (PKTOOLS_IMAGECLASSES_VERSION_MAJOR 1)
+set (PKTOOLS_IMAGECLASSES_VERSION_MINOR 6)
+set (PKTOOLS_IMAGECLASSES_VERSION_PATCH 1)
+set (PKTOOLS_IMAGECLASSES_VERSION "${PKTOOLS_IMAGECLASSES_VERSION_MAJOR}.${PKTOOLS_IMAGECLASSES_VERSION_MINOR}.${PKTOOLS_IMAGECLASSES_VERSION_PATCH}")
+set (PKTOOLS_IMAGECLASSES_SOVERSION 1)
+
+set (PKTOOLS_LASCLASSES_VERSION_MAJOR 1)
+set (PKTOOLS_LASCLASSES_VERSION_MINOR 6)
+set (PKTOOLS_LASCLASSES_VERSION_PATCH 1)
+set (PKTOOLS_LASCLASSES_VERSION "${PKTOOLS_LASCLASSES_VERSION_MAJOR}.${PKTOOLS_LASCLASSES_VERSION_MINOR}.${PKTOOLS_LASCLASSES_VERSION_PATCH}")
+set (PKTOOLS_LASCLASSES_SOVERSION 1)
+
+# Name of C++ library
+set(PKTOOLS_BASE_LIB_NAME base)
+set(PKTOOLS_ALGORITHMS_LIB_NAME algorithms)
+set(PKTOOLS_FILECLASSES_LIB_NAME fileClasses)
+set(PKTOOLS_IMAGECLASSES_LIB_NAME imageClasses)
+set(PKTOOLS_LASCLASSES_LIB_NAME lasClasses)
+
+option (BUILD_SHARED_LIBS "Build with shared library" OFF)
+set(BUILD_WITH_LIBLAS FALSE CACHE BOOL "Choose if pktools is to be built with liblas")
+set(BUILD_WITH_FANN FALSE CACHE BOOL "Choose if pktools is to be built with fann")
+#set(BUILD_WITH_NLOPT FALSE CACHE BOOL "Choose if pktools is to be built with nlopt")
+set(PKTOOLS_WITH_UTILITIES TRUE CACHE BOOL "Choose if pktools utilities should be built")
+
+set(GSL_INCLUDE_DIR /usr/include CACHE PATH "Include PATH for GSL")
+set(GSL_LIB_PATH /usr/lib CACHE PATH "Library PATH for GSL")
+
+###############################################################################
+
+###############################################################################
+# CMake settings
+# cmake_minimum_required(VERSION 2.6.0)
+
+IF(NOT CMAKE_BUILD_TYPE)
+ #SET(CMAKE_BUILD_TYPE "DEBUG")
+ SET(CMAKE_BUILD_TYPE "RELEASE")
+ #SET(CMAKE_BUILD_TYPE "RELWITHDEBINFO")
+ #SET(CMAKE_BUILD_TYPE "MINSIZEREL")
+ENDIF()
+
+set(CMAKE_COLOR_MAKEFILE ON)
+
+# Allow advanced users to generate Makefiles printing detailed commands
+mark_as_advanced(CMAKE_VERBOSE_MAKEFILE)
+
+# Path to additional CMake modules
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
+###############################################################################
+
+###############################################################################
+# Setup configure file
+configure_file ( "cmake-config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/base/config.h" @ONLY)
+include_directories("${CMAKE_CURRENT_BINARY_DIR}/base")
+add_definitions(-DHAVE_CONFIG_H)
+###############################################################################
+
+###############################################################################
+# Documentation
+#file(READ "doc/index.txt" README )
+file(WRITE "README.txt" "${README}")
+###############################################################################
+
+###############################################################################
+# Platform and compiler specific settings
+
+if(WIN32)
+ if (MSVC)
+ if (MSVC80 OR MSVC90 OR MSVC10)
+ add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+ add_definitions(-D_CRT_NONSTDC_NO_WARNING)
+ add_definitions(-D_SCL_SECURE_NO_WARNINGS)
+ endif()
+ if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
+ string(REGEX REPLACE "/W[0-4]" "/W4"
+ CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ else()
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
+ endif()
+
+ # Generate dot-user file with user-specific settings for Visual Studio project
+ set(MSVC_ENVIRONMENT_PATH "" CACHE STRING
+ "Custom PATH for Environment property in Visual Studio project configuration")
+ mark_as_advanced(MSVC_ENVIRONMENT_PATH)
+ set(VCPROJ_USER_ENVIRONMENT_PATH_DEBUG "${ENVIRONMENT_PATH}")
+ mark_as_advanced(VCPROJ_USER_ENVIRONMENT_PATH_DEBUG)
+
+ endif()
+
+ set(CMAKE_INCLUDE_PATH c:/osgeo4w/include;$ENV{CMAKE_INCLUDE_PATH})
+ set(CMAKE_LIBRARY_PATH c:/osgeo4w/lib;$ENV{CMAKE_LIBRARY_PATH})
+else()
+ # Recommended C++ compilation flags
+ # -Weffc++
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pg")
+ set(PKTOOLS_COMMON_CXX_FLAGS
+ "-Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wredundant-decls -Wno-long-long")
+
+ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC ${PKTOOLS_COMMON_CXX_FLAGS}")
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
+ endif()
+
+ elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER}" MATCHES "clang")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PKTOOLS_COMMON_CXX_FLAGS}")
+ endif()
+endif(WIN32)
+
+if (APPLE)
+ set(SO_EXT dylib)
+ # set(CMAKE_FIND_FRAMEWORK "LAST")
+elseif(WIN32)
+ set(SO_EXT dll)
+else()
+ set(SO_EXT so)
+endif(APPLE)
+###############################################################################
+
+###############################################################################
+# Check the required libraries are present
+
+#include_directories(${GDAL_INCLUDE_DIR})
+#if (MSVC)
+# set(GDAL_LIBRARIES -LIBPATH:${GDAL_LIB_PATH} gdal_i.lib)
+#else()
+# set(GDAL_LIBRARIES -L${GDAL_LIB_PATH} -lgdal)
+#endif(MSVC)
+
+find_package(GDAL 1.10 REQUIRED)
+if(GDAL_FOUND)
+ include_directories(${GDAL_INCLUDE_DIRS})
+endif()
+
+find_package(GSL REQUIRED)
+if(GSL_FOUND)
+ include_directories(${GSL_INCLUDE_DIRS})
+ add_definitions(-DGSL_DLL)
+endif()
+
+find_package(Armadillo REQUIRED)
+if(ARMADILLO_FOUND)
+ include_directories(${ARMADILLO_INCLUDE_DIRS})
+endif()
+
+if (BUILD_WITH_LIBLAS)
+ find_package(LIBLAS)
+ if(LIBLAS_FOUND)
+ include_directories(${LIBLAS_INCLUDE_DIRS})
+ endif()
+ set(Boost_DEBUG 0)
+ find_package(Boost COMPONENTS filesystem system)
+ if(Boost_FOUND)
+ include_directories(${Boost_INCLUDE_DIRS})
+ add_definitions("-DBOOST_ALL_NO_LIB")
+ endif()
+# include_directories(${BOOST_INCLUDE_DIR})
+# if (MSVC)
+# set(BOOST_LIBRARIES -LIBPATH:${BOOST_LIB_PATH} libboost_filesystem-vc100-mt-1_56.lib libboost_system-vc100-mt-1_56.lib)
+# else()
+# set(BOOST_LIBRARIES -L${BOOST_LIB_PATH} -lboost_filesystem -lboost_system)
+# endif(MSVC)
+endif(BUILD_WITH_LIBLAS)
+
+if (BUILD_WITH_FANN)
+ find_package(FANN)
+ if(FANN_FOUND)
+ include_directories(${FANN_INCLUDE_DIRS})
+ add_definitions(-DFANN_DLL)
+ endif()
+endif(BUILD_WITH_FANN)
+
+# if (BUILD_WITH_NLOPT)
+# find_package(NLOPT)
+# if(NLOPT_FOUND)
+# include_directories(${NLOPT_INCLUDE_DIRS})
+# add_definitions(-DNLOPT_DLL)
+# endif()
+# endif(BUILD_WITH_NLOPT)
+###############################################################################
+
+###############################################################################
+# Build libraries
+include_directories("${PROJECT_SOURCE_DIR}")
+add_subdirectory ("${PROJECT_SOURCE_DIR}")
+###############################################################################
+
+###############################################################################
+# Build executables
+
+#configure_file ( "cmake-config.in" "${PROJECT_BINARY_DIR}/pktools-config" @ONLY )
+#test
+configure_file ( "cmake-config.in" "${CMAKE_CURRENT_BINARY_DIR}/pktools-config" @ONLY )
+configure_file ( "cmake.pc.in" "pktools.pc" @ONLY)
+
+
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+set(PKLIBS ${PKTOOLS_BASE_LIB_NAME} ${PKTOOLS_IMAGECLASSES_LIB_NAME} ${PKTOOLS_FILECLASSES_LIB_NAME} ${PKTOOLS_ALGORITHMS_LIB_NAME} ${GDAL_LIBRARIES} ${GSL_LIBRARIES} ${Boost_LIBRARIES})
+
+set(PKUTILITIES
+ pkinfo
+ pkcrop
+ pkdiff
+ pkgetmask
+ pksetmask
+ pkcreatect
+ pkdumpimg
+ pkdumpogr
+ pksieve
+ pkstat
+ pkstatascii
+ pkstatogr
+ pkstatprofile
+ pkegcs
+ pkextractimg
+ pkextractogr
+ pkfillnodata
+ pkfilter
+ pkfilterdem
+ pkfilterascii
+ pkdsm2shadow
+ pkcomposite
+ pkpolygonize
+ pkascii2img
+ pksvm
+ pksvmogr
+ pkfssvm
+ pkoptsvm
+ pkascii2ogr
+ pkreclass
+ pkreclassogr
+ pkkalman
+ )
+
+set(PKLASUTILITIES
+ pklas2img
+)
+
+set(PKFANNUTILITIES
+ pkann
+ pkannogr
+ pkfsann
+ pkregann
+)
+
+# set(PKNLOPTUTILITIES
+# pkoptsvm
+# )
+
+if (PKTOOLS_WITH_UTILITIES)
+ foreach(UTILITY ${PKUTILITIES})
+ add_executable(${UTILITY} src/apps/${UTILITY}.cc)
+ target_link_libraries(${UTILITY} ${PKLIBS})
+ set_target_properties(${UTILITY} PROPERTIES FOLDER utilities)
+ endforeach()
+
+ if (BUILD_WITH_LIBLAS)
+ set(PKLIBS ${PKLIBS} ${PKTOOLS_LASCLASSES_LIB_NAME})
+ foreach(PKLASUTILITY ${PKLASUTILITIES})
+ add_executable(${PKLASUTILITY} src/apps/${PKLASUTILITY}.cc)
+ target_link_libraries (${PKLASUTILITY}
+ ${PKLIBS} ${LIBLAS_LIBRARIES})
+ set_target_properties(${PKLASUTILITY} PROPERTIES FOLDER utilities)
+ endforeach()
+ endif()
+ if (BUILD_WITH_FANN)
+ set(PKLIBS ${PKLIBS} ${FANN_LIBRARIES})
+ foreach(PKFANNUTILITY ${PKFANNUTILITIES})
+ add_executable(${PKFANNUTILITY} src/apps/${PKFANNUTILITY}.cc)
+ # message(${PKLIBS})
+ target_link_libraries (${PKFANNUTILITY} ${PKLIBS})
+ set_target_properties(${PKFANNUTILITY} PROPERTIES FOLDER utilities)
+ endforeach()
+ endif()
+ # if (BUILD_WITH_NLOPT)
+ # set(PKLIBS ${PKLIBS} ${NLOPT_LIBRARIES})
+ # foreach(PKNLOPTUTILITY ${PKNLOPTUTILITIES})
+ # add_executable(${PKNLOPTUTILITY} src/apps/${PKNLOPTUTILITY}.cc)
+ # message(${PKLIBS})
+ # target_link_libraries (${PKNLOPTUTILITY} ${PKLIBS})
+ # set_target_properties(${PKNLOPTUTILITY} PROPERTIES FOLDER utilities)
+ # endforeach()
+ # endif()
+ # add_custom_target(utilities DEPENDS ${PKUTILITIES} ${PKLASUTILITIES} ${PKFANNUTILITIES} ${PKNLOPTUTILITIES})
+ add_custom_target(utilities DEPENDS ${PKUTILITIES} ${PKLASUTILITIES} ${PKFANNUTILITIES})
+ set_target_properties(utilities PROPERTIES FOLDER
+ phony)
+
+endif()
+
+
+###############################################################################
+
+###############################################################################
+# Installation
+#install (FILES "${PROJECT_BINARY_DIR}/pktools-config" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+#install (FILES "${PROJECT_BINARY_DIR}/pktools-config" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+#test
+install (FILES "${CMAKE_CURRENT_BINARY_DIR}/pktools-config" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+install (FILES "pktools.pc" DESTINATION lib/pkgconfig PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+
+if (PKTOOLS_WITH_UTILITIES)
+ install (TARGETS ${PKUTILITIES} DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ if (BUILD_WITH_LIBLAS)
+ install (TARGETS ${PKLASUTILITIES} DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ endif(BUILD_WITH_LIBLAS)
+ if (BUILD_WITH_FANN)
+ install (TARGETS ${PKFANNUTILITIES} DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ endif(BUILD_WITH_FANN)
+ # if (BUILD_WITH_NLOPT)
+ # install (TARGETS ${PKNLOPTUTILITIES} DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ # endif(BUILD_WITH_NLOPT)
+endif(PKTOOLS_WITH_UTILITIES)
+
+###############################################################################
+
+###############################################################################
+# Create Distribution
+SET(CPACK_SOURCE_GENERATOR "TGZ;ZIP;TBZ2")
+SET(CPACK_CMAKE_GENERATOR "Unix Makefiles")
+
+set(CPACK_SOURCE_PACKAGE_FILE_NAME
+ "${CMAKE_PROJECT_NAME}-${PKTOOLS_VERSION_MAJOR}.${PKTOOLS_VERSION_MINOR}.${PKTOOLS_VERSION_PATCH}")
+
+# Set files to ignore
+list(APPEND CPACK_SOURCE_IGNORE_FILES "_CPack_Packages")
+list(APPEND CPACK_SOURCE_IGNORE_FILES ".gz")
+list(APPEND CPACK_SOURCE_IGNORE_FILES ".bz2")
+list(APPEND CPACK_SOURCE_IGNORE_FILES ".zip")
+list(APPEND CPACK_SOURCE_IGNORE_FILES ".svn")
+list(APPEND CPACK_SOURCE_IGNORE_FILES ".git")
+list(APPEND CPACK_SOURCE_IGNORE_FILES "README")
+list(APPEND CPACK_SOURCE_IGNORE_FILES "HOWTORELEASE.txt")
+list(APPEND CPACK_SOURCE_IGNORE_FILES "CMakeCache.txt")
+list(APPEND CPACK_SOURCE_IGNORE_FILES "CPackConfig.cmake")
+list(APPEND CPACK_SOURCE_IGNORE_FILES "schemas")
+list(APPEND CPACK_SOURCE_IGNORE_FILES "/build/;~$;${CPACK_SOURCE_IGNORE_FILES}")
+
+include(CPack)
+
+add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
+###############################################################################
=====================================
gdal-c++11.patch
=====================================
@@ -0,0 +1,14 @@
+Description: Use C++11 for compatibility with GDAL 2.3.0.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -166,7 +166,7 @@ else()
+
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC ${PKTOOLS_COMMON_CXX_FLAGS}")
+ if (CMAKE_COMPILER_IS_GNUCXX)
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ endif()
+
+ elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER}" MATCHES "clang")
=====================================
src/apps/pkfilterdem.cc
=====================================
@@ -177,7 +177,7 @@ int main(int argc,char **argv) {
outputWriter.setProjection(input.getProjection());
outputWriter.copyGeoTransform(input);
if(colorTable_opt.size())
- outputWriter.setColorTable(colorTable_opt[0]);
+ outputWriter.setColorTable(colorTable_opt[0]);
//set nodata value
if(nodata_opt.size()){
@@ -347,7 +347,7 @@ int main(int argc,char **argv) {
outputData=tmpData;
//todo: interpolate
//outputData.setMask(tmpData,1,0);
- }
+ }
else if(postFilter_opt[0]=="etew_min"){
//Elevation Threshold with Expand Window (ETEW) Filter (p.73 from Airborne LIDAR Data Processing and Analysis Tools ALDPAT 1.0)
//first iteration is performed assuming only minima are selected using options -fir all -comp min
@@ -363,7 +363,7 @@ int main(int argc,char **argv) {
std::cout << "iteration " << iteration << ": " << nchange << " pixels changed" << std::endl;
++iteration;
}
- }
+ }
else if(postFilter_opt[0]=="promorph"){
//Progressive morphological filter tgrs2003_zhang vol41 pp 872-882
//first iteration is performed assuming only minima are selected using options -fir all -comp min
@@ -376,8 +376,8 @@ int main(int argc,char **argv) {
try{
nchange=theFilter.morphology(inputData,outputData,"erode",dim,dim,disc_opt[0],hThreshold);
theFilter.morphology(outputData,inputData,"dilate",dim,dim,disc_opt[0],hThreshold);
- theFilter.doit(inputData,outputData,"median",dim,dim,1,disc_opt[0]);
- inputData=outputData;
+ theFilter.doit(inputData,outputData,"median",dim,dim,1,disc_opt[0]);
+ inputData=outputData;
}
catch(std::string errorString){
cout << errorString << endl;
@@ -387,14 +387,14 @@ int main(int argc,char **argv) {
hThreshold=hThreshold_opt[0]+maxSlope_opt[0]*(newdim-dim)*input.getDeltaX();
dim=newdim;
if(hThreshold_opt.size()>1){
- if(hThreshold>hThreshold_opt[1]){
- hThreshold=hThreshold_opt[1];
- }
+ if(hThreshold>hThreshold_opt[1]){
+ hThreshold=hThreshold_opt[1];
+ }
}
std::cout << "iteration " << iteration << ": " << nchange << " pixels changed" << std::endl;
++iteration;
}
- }
+ }
else if(postFilter_opt[0]=="open"){
try{
theFilter.morphology(inputData,tmpData,"erode",dim_opt[0],dim_opt[0],disc_opt[0],hThreshold_opt[0]);
@@ -416,8 +416,22 @@ int main(int argc,char **argv) {
exit(1);
}
}
+ if(verbose_opt[0]){
+ std::cout << "writing data block" << std::endl;
+ std::cout << "outputData.nCols(): " << outputData.nCols() << std::endl;
+ std::cout << "outputData.nRows(): " << outputData.nRows() << std::endl;
+ std::cout << "outputWriter.nrOfCol(): " << outputWriter.nrOfCol() << std::endl;
+ std::cout << "outputWriter.nrOfRow(): " << outputWriter.nrOfRow() << std::endl;
+ std::cout << "outputWriter.getDataType(): " << outputWriter.getDataType() << std::endl;
+ }
//write outputData to outputWriter
- outputWriter.writeDataBlock(outputData,GDT_Float64,0,outputData.nCols()-1,0,outputData.nRows()-1);
+ try{
+ outputWriter.writeDataBlock(outputData,0,outputData.nCols()-1,0,outputData.nRows()-1);
+ }
+ catch(std::string errorString){
+ cout << errorString << endl;
+ exit(1);
+ }
// progress=1;
// pfnProgress(progress,pszMessage,pProgressArg);
=====================================
src/apps/pkreclassogr.cc
=====================================
@@ -41,7 +41,7 @@ along with pktools. If not, see <http://www.gnu.org/licenses/>.
|-----|----|----|-------|-----------|
| i | input | std::string | |Input vector dataset |
| nodata | nodata | int | 0 |nodata value to put in vector dataset if not valid (0) |
- | code | code | std::string | |Recode text file (2 colums: from to) |
+ | code | code | std::string | |Recode text file (2 columns: from to) |
| c | class | std::string | |list of classes to reclass (in combination with reclass option) |
| r | reclass | std::string | |list of recoded classes (in combination with class option) |
| o | output | std::string | |Output vector dataset |
@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
Optionpk<string> input_opt("i", "input", "Input vector dataset");
Optionpk<string> output_opt("o", "output", "Output file");
Optionpk<int> nodata_opt("nodata", "nodata", "nodata value to put in vector dataset if not valid (0)", 0);
- Optionpk<string> code_opt("code", "code", "Recode text file (2 colums: from to)");
+ Optionpk<string> code_opt("code", "code", "Recode text file (2 columns: from to)");
Optionpk<string> class_opt("c", "class", "list of classes to reclass (in combination with reclass option)");
Optionpk<string> reclass_opt("r", "reclass", "list of recoded classes (in combination with class option)");
Optionpk<string> fieldname_opt("n", "fname", "field name of the shape file to be replaced", "label");
View it on GitLab: https://salsa.debian.org/debian-gis-team/pktools/commit/f7eb2f95f073bf204dc40ffd3c49fcc3b845493c
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/pktools/commit/f7eb2f95f073bf204dc40ffd3c49fcc3b845493c
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20181124/9faf2411/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list