CMakeFiles/cmake.check_cache

+# This file is generated by cmake for dependency checking of the CMakeCache.txt file

CMakeLists.txt

@@ -35,7 +35,7 @@ set (PROJECT_SOURCE_DIR src)
 # The version number.
 set (PKTOOLS_VERSION_MAJOR 2)
 set (PKTOOLS_VERSION_MINOR 6)
-set (PKTOOLS_VERSION_PATCH 7.1)
+set (PKTOOLS_VERSION_PATCH 7.3)
 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}")
@@ -135,7 +135,6 @@ if(WIN32)
             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}")
@@ -220,7 +219,6 @@ if (BUILD_WITH_LIBLAS)
 		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)
@@ -357,7 +355,6 @@ if (PKTOOLS_WITH_UTILITIES)
 endif()
 
 
-	
 ###############################################################################
 
 ###############################################################################
@@ -379,7 +376,6 @@ if (PKTOOLS_WITH_UTILITIES)
 	# 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)
 
 ###############################################################################
@@ -398,11 +394,13 @@ 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)
 

debian/changelog

-pktools (2.6.7.1+ds-2) UNRELEASED; urgency=medium
+pktools (2.6.7.3+ds-1) unstable; urgency=medium
 
-  * Bump Standards-Version to 4.1.2, no changes.
+  * New upstream release.
+  * Bump Standards-Version to 4.1.3, no changes.
   * Update watch file to use HTTPS.
   * Update copyright-format URL to use HTTPS.
+  * Update watch file to check for uppercase releases too.
+  * Install libraries in Multi-Arch path.
+  * Update symbols for amd64.
 
- -- Bas Couwenberg <sebastic@debian.org>  Sat, 23 Sep 2017 18:31:50 +0200
+ -- Bas Couwenberg <sebastic@debian.org>  Wed, 07 Feb 2018 08:01:42 +0100
 
 pktools (2.6.7.1+ds-1) unstable; urgency=medium
 

debian/control

@@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 9),
                docbook-xsl,
                docbook-xml,
                xsltproc
-Standards-Version: 4.1.2
+Standards-Version: 4.1.3
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/pktools.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-grass/pktools.git
 Homepage: http://pktools.nongnu.org/

debian/libalgorithms1.install

-usr/lib/libalgorithms.so.*
+usr/lib/*/libalgorithms.so.*

debian/libalgorithms1.symbols

-# SymbolsHelper-Confirmed: 2.6.7 alpha amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64 x32
+# SymbolsHelper-Confirmed: 2.6.7.3 amd64
 libalgorithms.so.1 libalgorithms1 #MINVER#
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_Z11string2typeIiET_RKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.6.4
  _Z12compareClassRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES6_@Base 2.6.4
@@ -108,7 +108,6 @@ libalgorithms.so.1 libalgorithms1 #MINVER#
  _ZN6filter6Filter10morphologyER13ImgReaderGdalR13ImgWriterGdalRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEis@Base 2.6.7
  _ZN6filter6Filter12smoothNoDataER13ImgReaderGdalRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEER13ImgWriterGdal@Base 2.6.7
  (optional=templinst)_ZN6filter6Filter12smoothNoDataIdEEvRKSt6vectorIT_SaIS3_EERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERS5_@Base 2.6.4
- _ZN6filter6Filter13getFilterTypeENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.6.5
  _ZN6filter6Filter13initFilterMapERSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS_11FILTER_TYPEESt4lessIS7_ESaISt4pairIKS7_S8_EEE@Base 2.6.4
  (arch=amd64 arm64 hppa kfreebsd-amd64 mips64el ppc64el sparc64 x32)_ZN6filter6Filter14getWaveletTypeENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.6.7
  _ZN6filter6Filter15pushNoDataValueEd@Base 2.6.2
@@ -247,38 +246,41 @@ libalgorithms.so.1 libalgorithms1 #MINVER#
  (optional=templinst)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPSt6vectorIdSaIdEES5_EET0_T_S7_S6_@Base 2.6.4
  (optional=templinst)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPSt6vectorIfSaIfEES5_EET0_T_S7_S6_@Base 2.6.4
  (optional=templinst)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPSt6vectorIsSaIsEES5_EET0_T_S7_S6_@Base 2.5.2
+ (optional=templinst)_ZNSt22__uninitialized_fill_nILb0EE15__uninit_fill_nIPSt6vectorIdSaIdEEmS4_EET_S6_T0_RKT1_@Base 2.6.7.3
  (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN11statfactory11StatFactory18INTERPOLATION_TYPEESt4lessIS5_ESaISt4pairIKS5_S8_EEEixERSC_@Base 2.6.4
  (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 mips64el ppc64el sparc64 x32)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN3svm8SVM_TYPEESt4lessIS5_ESaISt4pairIKS5_S7_EEEixERSB_@Base 2.6.4
  (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN6filter11FILTER_TYPEESt4lessIS5_ESaISt4pairIKS5_S7_EEEixERSB_@Base 2.6.4
  (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN6filter7PADDINGESt4lessIS5_ESaISt4pairIKS5_S7_EEEixERSB_@Base 2.6.4
  (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN8filter2d11FILTER_TYPEESt4lessIS5_ESaISt4pairIKS5_S7_EEEixERSB_@Base 2.6.4
- (optional=templinst)_ZNSt3mapIliSt4lessIlESaISt4pairIKliEEEixERS3_@Base 2.5.3
  (optional=templinst|subst)_ZNSt6vectorI8Vector2dIfESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE{size_t}RKS1_@Base 2.5.2
- (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS5_S7_EERKS5_@Base 2.6.4
  (optional=templinst|subst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS5_S7_EE{size_t}RKS5_@Base 2.6.4
+ (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_realloc_insertEN9__gnu_cxx17__normal_iteratorIPS5_S7_EERKS5_@Base 2.6.7.3
  (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EED1Ev@Base 2.6.4
  (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EED2Ev@Base 2.6.4
  (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EEaSERKS7_@Base 2.6.4
- (optional=templinst)_ZNSt6vectorIS_IdSaIdEESaIS1_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_@Base 2.5.2
  (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZNSt6vectorIS_IdSaIdEESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_@Base 2.6.4
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIS_IdSaIdEESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_@Base 2.5.2
+ (optional=templinst)_ZNSt6vectorIS_IdSaIdEESaIS1_EE17_M_realloc_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_@Base 2.6.7.3
  (optional=templinst)_ZNSt6vectorIS_IdSaIdEESaIS1_EE8_M_eraseEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE@Base 2.5.2
  (optional=templinst|arch=!hurd-i386 !i386 !kfreebsd-i386 !mips !mipsel !powerpc)_ZNSt6vectorIS_IdSaIdEESaIS1_EE9push_backERKS1_@Base 2.6.4
  (optional=templinst)_ZNSt6vectorIS_IdSaIdEESaIS1_EED1Ev@Base 2.5.2
  (optional=templinst)_ZNSt6vectorIS_IdSaIdEESaIS1_EED2Ev@Base 2.5.2
- (optional=templinst)_ZNSt6vectorIS_IfSaIfEESaIS1_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_@Base 2.5.2
  (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZNSt6vectorIS_IfSaIfEESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_@Base 2.6.4
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIS_IfSaIfEESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_@Base 2.5.2
+ (optional=templinst)_ZNSt6vectorIS_IfSaIfEESaIS1_EE17_M_realloc_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_@Base 2.6.7.3
  (optional=templinst)_ZNSt6vectorIS_IfSaIfEESaIS1_EE8_M_eraseEN9__gnu_cxx17__normal_iteratorIPS1_S3_EES7_@Base 2.5.2
  (optional=templinst)_ZNSt6vectorIS_IfSaIfEESaIS1_EED1Ev@Base 2.5.2
  (optional=templinst)_ZNSt6vectorIS_IfSaIfEESaIS1_EED2Ev@Base 2.5.2
- (optional=templinst)_ZNSt6vectorIS_IsSaIsEESaIS1_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_@Base 2.5.2
  (optional=templinst|subst)_ZNSt6vectorIS_IsSaIsEESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE{size_t}RKS1_@Base 2.5.2
+ (optional=templinst)_ZNSt6vectorIS_IsSaIsEESaIS1_EE17_M_realloc_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_@Base 2.6.7.3
+ (optional=templinst)_ZNSt6vectorIS_IsSaIsEESaIS1_EED1Ev@Base 2.6.7.3
+ (optional=templinst)_ZNSt6vectorIS_IsSaIsEESaIS1_EED2Ev@Base 2.6.7.3
  (optional=templinst)_ZNSt6vectorIdSaIdEE13_M_assign_auxIN9__gnu_cxx17__normal_iteratorIPKdS1_EEEEvT_S8_St20forward_iterator_tag@Base 2.6.7
- (optional=templinst)_ZNSt6vectorIdSaIdEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPdS1_EERKd@Base 2.5.2
  (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZNSt6vectorIdSaIdEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPdS1_EEjRKd@Base 2.6.4
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIdSaIdEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPdS1_EEmRKd@Base 2.5.2
  (optional=templinst)_ZNSt6vectorIdSaIdEE15_M_range_insertIN9__gnu_cxx17__normal_iteratorIPdS1_EEEEvS6_T_S7_St20forward_iterator_tag@Base 2.6.7
+ (optional=templinst)_ZNSt6vectorIdSaIdEE17_M_realloc_insertEN9__gnu_cxx17__normal_iteratorIPdS1_EERKd@Base 2.6.7.3
+ (optional=templinst)_ZNSt6vectorIdSaIdEE6resizeEmd@Base 2.6.7.3
  (optional=templinst)_ZNSt6vectorIdSaIdEE8_M_eraseEN9__gnu_cxx17__normal_iteratorIPdS1_EE@Base 2.6.2
  (optional=templinst)_ZNSt6vectorIdSaIdEE8_M_eraseEN9__gnu_cxx17__normal_iteratorIPdS1_EES5_@Base 2.5.2
  (optional=templinst)_ZNSt6vectorIdSaIdEE9push_backERKd@Base 2.5.2
@@ -287,17 +289,13 @@ libalgorithms.so.1 libalgorithms1 #MINVER#
  (optional=templinst)_ZNSt6vectorIdSaIdEEC2ERKS1_@Base 2.6.4
  (optional=templinst|subst|arch=!amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64el !s390x !sparc64)_ZNSt6vectorIdSaIdEEC2E{size_t}RKdRKS0_@Base 2.6.4
  (optional=templinst)_ZNSt6vectorIdSaIdEEaSERKS1_@Base 2.5.2
- (optional=templinst)_ZNSt6vectorIfSaIfEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPfS1_EERKf@Base 2.5.2
  (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZNSt6vectorIfSaIfEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPfS1_EEjRKf@Base 2.6.4
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIfSaIfEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPfS1_EEmRKf@Base 2.5.2
  (optional=templinst)_ZNSt6vectorIfSaIfEE15_M_range_insertIN9__gnu_cxx17__normal_iteratorIPfS1_EEEEvS6_T_S7_St20forward_iterator_tag@Base 2.6.7
+ (optional=templinst)_ZNSt6vectorIfSaIfEE17_M_realloc_insertEN9__gnu_cxx17__normal_iteratorIPfS1_EERKf@Base 2.6.7.3
  (optional=templinst)_ZNSt6vectorIfSaIfEE8_M_eraseEN9__gnu_cxx17__normal_iteratorIPfS1_EES5_@Base 2.5.2
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 mips64el ppc64el sparc64 x32)_ZNSt6vectorIfSaIfEEC1ERKS1_@Base 2.6.4
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 mips64el ppc64el sparc64 x32)_ZNSt6vectorIfSaIfEEC2ERKS1_@Base 2.6.4
  (optional=templinst)_ZNSt6vectorIfSaIfEEaSERKS1_@Base 2.5.2
  (optional=templinst|subst)_ZNSt6vectorIsSaIsEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPsS1_EE{size_t}RKs@Base 2.5.2
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 mips64el ppc64el sparc64 x32)_ZNSt6vectorIsSaIsEEC1ERKS1_@Base 2.6.4
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 mips64el ppc64el sparc64 x32)_ZNSt6vectorIsSaIsEEC2ERKS1_@Base 2.6.4
  (optional=templinst)_ZNSt6vectorIsSaIsEEaSERKS1_@Base 2.5.2
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev@Base 2.6.4
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev@Base 2.6.4
@@ -329,7 +327,7 @@ libalgorithms.so.1 libalgorithms1 #MINVER#
  (optional=templinst)_ZNSt8_Rb_treeIlSt4pairIKliESt10_Select1stIS2_ESt4lessIlESaIS2_EE24_M_get_insert_unique_posERS1_@Base 2.5.3
  (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeIlSt4pairIKliESt10_Select1stIS2_ESt4lessIlESaIS2_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS2_ERS1_@Base 2.5.3
  (optional=templinst)_ZNSt8_Rb_treeIlSt4pairIKliESt10_Select1stIS2_ESt4lessIlESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E@Base 2.5.3
- (optional=templinst)_ZSt11__make_heapIN9__gnu_cxx17__normal_iteratorIPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt6vectorIS7_SaIS7_EEEENS0_5__ops15_Iter_comp_iterIPFbRKS7_SG_EEEEvT_SK_T0_@Base 2.6.4
+ (optional=templinst)_ZSt11__make_heapIN9__gnu_cxx17__normal_iteratorIPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt6vectorIS7_SaIS7_EEEENS0_5__ops15_Iter_comp_iterIPFbRKS7_SG_EEEEvT_SK_RT0_@Base 2.6.7.3
  (optional=templinst|subst)_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt6vectorIS7_SaIS7_EEEE{ssize_t}S7_NS0_5__ops15_Iter_comp_iterIPFbRKS7_SG_EEEEvT_T0_SL_T1_T2_@Base 2.6.4
  (optional=templinst|subst)_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPdSt6vectorIdSaIdEEEE{ssize_t}dNS0_5__ops15_Iter_less_iterEEvT_T0_SA_T1_T2_@Base 2.5.2
  (optional=templinst)_ZSt16__insertion_sortIN9__gnu_cxx17__normal_iteratorIPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt6vectorIS7_SaIS7_EEEENS0_5__ops15_Iter_comp_iterIPFbRKS7_SG_EEEEvT_SK_T0_@Base 2.6.4

debian/libbase1.install

-usr/lib/libbase.so.*
+usr/lib/*/libbase.so.*

debian/libfileclasses1.install

-usr/lib/libfileClasses.so.*
+usr/lib/*/libfileClasses.so.*

debian/libimageclasses1.install

-usr/lib/libimageClasses.so.*
+usr/lib/*/libimageClasses.so.*

debian/libimageclasses1.symbols

-# SymbolsHelper-Confirmed: 2.6.7 amd64 arm64 hurd-i386 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64
+# SymbolsHelper-Confirmed: 2.6.7.3 amd64
 libimageClasses.so.1 libimageclasses1 #MINVER#
  (optional=templinst)_Z15getGDALDataTypeIdE12GDALDataTypev@Base 2.6.7
  (optional=templinst)_Z15getGDALDataTypeIsE12GDALDataTypev@Base 2.6.7
@@ -136,18 +136,18 @@ libimageClasses.so.1 libimageclasses1 #MINVER#
  (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE8_M_eraseEN9__gnu_cxx17__normal_iteratorIPS5_S7_EE@Base 2.6.4
  (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EEaSERKS7_@Base 2.6.4
  (optional=templinst|subst)_ZNSt6vectorIP12OGRFieldDefnSaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE{size_t}RKS1_@Base 2.5.2
- (optional=templinst|arch=amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64el s390x sparc64 x32)_ZNSt6vectorIPvSaIS0_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_@Base 2.6.5
- (optional=templinst)_ZNSt6vectorIS_IfSaIfEESaIS1_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_@Base 2.5.2
+ (optional=templinst)_ZNSt6vectorIPvSaIS0_EE17_M_realloc_insertEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_@Base 2.6.7.3
  (optional=templinst|subst)_ZNSt6vectorIS_IfSaIfEESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE{size_t}RKS1_@Base 2.5.2
+ (optional=templinst)_ZNSt6vectorIS_IfSaIfEESaIS1_EE17_M_realloc_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_@Base 2.6.7.3
  (optional=templinst)_ZNSt6vectorIS_IfSaIfEESaIS1_EED1Ev@Base 2.5.2
  (optional=templinst)_ZNSt6vectorIS_IfSaIfEESaIS1_EED2Ev@Base 2.5.2
- (optional=templinst)_ZNSt6vectorIdSaIdEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPdS1_EERKd@Base 2.5.2
  (optional=templinst|subst)_ZNSt6vectorIdSaIdEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPdS1_EE{size_t}RKd@Base 2.5.2
  (optional=templinst)_ZNSt6vectorIdSaIdEE15_M_range_insertIN9__gnu_cxx17__normal_iteratorIPdS1_EEEEvS6_T_S7_St20forward_iterator_tag@Base 2.6.4
+ (optional=templinst)_ZNSt6vectorIdSaIdEE17_M_realloc_insertEN9__gnu_cxx17__normal_iteratorIPdS1_EERKd@Base 2.6.7.3
  (optional=templinst)_ZNSt6vectorIdSaIdEEaSERKS1_@Base 2.5.2
- (optional=templinst)_ZNSt6vectorIfSaIfEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPfS1_EERKf@Base 2.5.2
+ (optional=templinst)_ZNSt6vectorIfSaIfEE17_M_realloc_insertEN9__gnu_cxx17__normal_iteratorIPfS1_EERKf@Base 2.6.7.3
  (optional=templinst)_ZNSt6vectorIfSaIfEEaSERKS1_@Base 2.5.2
- (optional=templinst)_ZNSt6vectorIiSaIiEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPiS1_EERKi@Base 2.6.4
+ (optional=templinst)_ZNSt6vectorIiSaIiEE17_M_realloc_insertEN9__gnu_cxx17__normal_iteratorIPiS1_EERKi@Base 2.6.7.3
  (optional=templinst|subst)_ZNSt6vectorIsSaIsEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPsS1_EE{size_t}RKs@Base 2.5.2
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev@Base 2.6.4
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev@Base 2.6.4

debian/liblasclasses1.install

-usr/lib/liblasClasses.so.*
+usr/lib/*/liblasClasses.so.*

debian/liblasclasses1.symbols

-# SymbolsHelper-Confirmed: 2.6.7 alpha amd64 arm64 armel armhf hppa hurd-i386 mips mips64el mipsel powerpc ppc64el s390x sparc64
+# SymbolsHelper-Confirmed: 2.6.7.3 amd64
 liblasClasses.so.1 liblasclasses1 #MINVER#
  _ZN13FileReaderLas13readNextPointERN6liblas5PointE@Base 2.6.7
  _ZN13FileReaderLas14addClassFilterERKSt6vectorItSaItEE@Base 2.5.2
@@ -50,11 +50,11 @@ liblasClasses.so.1 liblasclasses1 #MINVER#
  _ZNK13FileReaderLas9getHeaderEv@Base 2.5.2
  _ZNK13FileReaderLas9las2asciiERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb@Base 2.6.4
  (optional=templinst)_ZNKSt5ctypeIcE8do_widenEc@Base 2.5.2
- (optional=templinst)_ZNSt6vectorIN5boost10shared_ptrIN6liblas7FilterIEEESaIS4_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS4_S6_EERKS4_@Base 2.5.2
+ (optional=templinst)_ZNSt6vectorIN5boost10shared_ptrIN6liblas7FilterIEEESaIS4_EE17_M_realloc_insertEN9__gnu_cxx17__normal_iteratorIPS4_S6_EERKS4_@Base 2.6.7.3
  (optional=templinst)_ZNSt6vectorIN5boost10shared_ptrIN6liblas7FilterIEEESaIS4_EED1Ev@Base 2.5.2
  (optional=templinst)_ZNSt6vectorIN5boost10shared_ptrIN6liblas7FilterIEEESaIS4_EED2Ev@Base 2.5.2
- (optional=templinst)_ZNSt6vectorIN6liblas14ClassificationESaIS1_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_@Base 2.5.2
- (optional=templinst)_ZNSt6vectorItSaItEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPtS1_EERKt@Base 2.5.2
+ (optional=templinst)_ZNSt6vectorIN6liblas14ClassificationESaIS1_EE17_M_realloc_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_@Base 2.6.7.3
+ (optional=templinst)_ZNSt6vectorItSaItEE17_M_realloc_insertEN9__gnu_cxx17__normal_iteratorIPtS1_EERKt@Base 2.6.7.3
  _ZTI16LastReturnFilter@Base 2.5.2
  _ZTIN5boost6detail15sp_counted_baseE@Base 2.5.2
  _ZTIN5boost6detail17sp_counted_impl_pIN6liblas12ReturnFilterEEE@Base 2.5.2

debian/patches/multiarch.patch

+Description: Add option to set install path for libraries.
+Author: Bas Couwenberg <sebastic@debian.org>
+Forwarded: https://savannah.nongnu.org/bugs/index.php?53082
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -86,6 +86,8 @@ set(BUILD_WITH_FANN FALSE CACHE BOOL "Ch
+ #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")
+ 
++option (INSTALL_LIBRARY_DIR "Install path for libraries" ${PROJECT_LIBRARY_DIR})
++
+ set(GSL_INCLUDE_DIR /usr/include CACHE PATH "Include PATH for GSL")
+ set(GSL_LIB_PATH /usr/lib CACHE PATH "Library PATH for GSL")
+ 
+@@ -363,7 +365,7 @@ endif()
+ #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)
++install (FILES "pktools.pc" DESTINATION ${INSTALL_LIBRARY_DIR}/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)
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -148,7 +148,7 @@ endif(BUILD_WITH_LIBLAS)
+ 
+ ###############################################################################
+ # Installation
+-install (TARGETS ${PKTOOLS_BASE_LIB_NAME} ${PKTOOLS_IMAGECLASSES_LIB_NAME} ${PKTOOLS_ALGORITHMS_LIB_NAME} ${PKTOOLS_FILECLASSES_LIB_NAME} DESTINATION lib)
++install (TARGETS ${PKTOOLS_BASE_LIB_NAME} ${PKTOOLS_IMAGECLASSES_LIB_NAME} ${PKTOOLS_ALGORITHMS_LIB_NAME} ${PKTOOLS_FILECLASSES_LIB_NAME} DESTINATION ${INSTALL_LIBRARY_DIR})
+ 
+ install (FILES ${BASE_H} DESTINATION ${PROJECT_INCLUDE_DIR}/base)
+ install (FILES ${IMGCLASS_H} DESTINATION ${PROJECT_INCLUDE_DIR}/imageclasses)
+@@ -156,7 +156,7 @@ install (FILES ${ALGOR_H} DESTINATION ${
+ install (FILES ${FILECLASS_H} DESTINATION ${PROJECT_INCLUDE_DIR}/fileclasses)
+ 
+ if (BUILD_WITH_LIBLAS)
+-install (TARGETS ${PKTOOLS_LASCLASSES_LIB_NAME} DESTINATION lib)
++install (TARGETS ${PKTOOLS_LASCLASSES_LIB_NAME} DESTINATION ${INSTALL_LIBRARY_DIR})
+ install (FILES ${LASCLASS_H} DESTINATION ${PROJECT_INCLUDE_DIR}/lasclasses)
+ endif(BUILD_WITH_LIBLAS)
+ ###############################################################################

debian/patches/series

 spelling-errors2.patch
+multiarch.patch

debian/pktools-dev.install

 usr/bin/pktools-config
 usr/include/pktools
-usr/lib/*.so
-usr/lib/pkgconfig
+usr/lib/*/*.so
+usr/lib/*/pkgconfig

debian/rules

@@ -17,6 +17,8 @@ ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
 	export DEB_CXXFLAGS_MAINT_APPEND := -I/usr/include/hdf5/serial
 endif
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 MANPAGES:=$(wildcard debian/man/*.*.xml)
 
 %:
@@ -27,7 +29,8 @@ MANPAGES:=$(wildcard debian/man/*.*.xml)
 override_dh_auto_configure:
 	dh_auto_configure -- -DBUILD_WITH_FANN=ON \
 	                     -DBUILD_WITH_LIBLAS=ON \
-	                     -DBUILD_SHARED_LIBS=ON
+	                     -DBUILD_SHARED_LIBS=ON \
+	                     -DINSTALL_LIBRARY_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_clean:
 	dh_clean debian/man/*.1

debian/watch

@@ -4,4 +4,4 @@ dversionmangle=s/\+(debian|dfsg|ds|deb|\d+)\d*$//,\
 uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/,\
 repacksuffix=+ds \
 https://download.savannah.gnu.org/releases/pktools/ \
-(?:|.*/)pktools(?:[_\-]v?|)(\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)
+(?:|.*/)(?:pktools|PKTOOLS)(?:[_\-]v?|)(\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)

src/algorithms/Filter.cc

@@ -72,7 +72,7 @@ void filter::Filter::dwtForward(ImgReaderGdal& input, ImgWriterGdal& output, con
   Vector2d<double> lineOutput(input.nrOfBand(),input.nrOfCol());
   for(int y=0;y<input.nrOfRow();++y){
     for(int iband=0;iband<input.nrOfBand();++iband)
-      input.readData(lineInput[iband],GDT_Float64,y,iband);
+      input.readData(lineInput[iband],y,iband);
     vector<double> pixelInput(input.nrOfBand());
     for(int x=0;x<input.nrOfCol();++x){
       pixelInput=lineInput.selectCol(x);
@@ -82,7 +82,7 @@ void filter::Filter::dwtForward(ImgReaderGdal& input, ImgWriterGdal& output, con
     }
     for(int iband=0;iband<input.nrOfBand();++iband){
       try{
-        output.writeData(lineOutput[iband],GDT_Float64,y,iband);
+        output.writeData(lineOutput[iband],y,iband);
       }
       catch(string errorstring){
         cerr << errorstring << "in band " << iband << ", line " << y << endl;
@@ -103,7 +103,7 @@ void filter::Filter::dwtInverse(ImgReaderGdal& input, ImgWriterGdal& output, con
   Vector2d<double> lineOutput(input.nrOfBand(),input.nrOfCol());
   for(int y=0;y<input.nrOfRow();++y){
     for(int iband=0;iband<input.nrOfBand();++iband)
-      input.readData(lineInput[iband],GDT_Float64,y,iband);
+      input.readData(lineInput[iband],y,iband);
     vector<double> pixelInput(input.nrOfBand());
     for(int x=0;x<input.nrOfCol();++x){
       pixelInput=lineInput.selectCol(x);
@@ -113,7 +113,7 @@ void filter::Filter::dwtInverse(ImgReaderGdal& input, ImgWriterGdal& output, con
     }
     for(int iband=0;iband<input.nrOfBand();++iband){
       try{
-        output.writeData(lineOutput[iband],GDT_Float64,y,iband);
+        output.writeData(lineOutput[iband],y,iband);
       }
       catch(string errorstring){
         cerr << errorstring << "in band " << iband << ", line " << y << endl;
@@ -134,7 +134,7 @@ void filter::Filter::dwtCut(ImgReaderGdal& input, ImgWriterGdal& output, const s
   Vector2d<double> lineOutput(input.nrOfBand(),input.nrOfCol());
   for(int y=0;y<input.nrOfRow();++y){
     for(int iband=0;iband<input.nrOfBand();++iband)
-      input.readData(lineInput[iband],GDT_Float64,y,iband);
+      input.readData(lineInput[iband],y,iband);
     vector<double> pixelInput(input.nrOfBand());
     for(int x=0;x<input.nrOfCol();++x){
       pixelInput=lineInput.selectCol(x);
@@ -144,7 +144,7 @@ void filter::Filter::dwtCut(ImgReaderGdal& input, ImgWriterGdal& output, const s
     }
     for(int iband=0;iband<input.nrOfBand();++iband){
       try{
-        output.writeData(lineOutput[iband],GDT_Float64,y,iband);
+        output.writeData(lineOutput[iband],y,iband);
       }
       catch(string errorstring){
         cerr << errorstring << "in band " << iband << ", line " << y << endl;
@@ -165,7 +165,7 @@ void filter::Filter::dwtCutFrom(ImgReaderGdal& input, ImgWriterGdal& output, con
   Vector2d<double> lineOutput(input.nrOfBand(),input.nrOfCol());
   for(int y=0;y<input.nrOfRow();++y){
     for(int iband=0;iband<input.nrOfBand();++iband)
-      input.readData(lineInput[iband],GDT_Float64,y,iband);
+      input.readData(lineInput[iband],y,iband);
     vector<double> pixelInput(input.nrOfBand());
     for(int x=0;x<input.nrOfCol();++x){
       pixelInput=lineInput.selectCol(x);
@@ -180,7 +180,7 @@ void filter::Filter::dwtCutFrom(ImgReaderGdal& input, ImgWriterGdal& output, con
     }
     for(int iband=0;iband<input.nrOfBand();++iband){
       try{
-        output.writeData(lineOutput[iband],GDT_Float64,y,iband);
+        output.writeData(lineOutput[iband],y,iband);
       }
       catch(string errorstring){
         cerr << errorstring << "in band " << iband << ", line " << y << endl;
@@ -269,7 +269,7 @@ void filter::Filter::morphology(ImgReaderGdal& input, ImgWriterGdal& output, con
   pfnProgress(progress,pszMessage,pProgressArg);
   for(int y=0;y<input.nrOfRow();++y){
     for(int iband=0;iband<input.nrOfBand();++iband)
-      input.readData(lineInput[iband],GDT_Float64,y,iband);
+      input.readData(lineInput[iband],y,iband);
     vector<double> pixelInput(input.nrOfBand());
     vector<double> pixelOutput(input.nrOfBand());
     for(int x=0;x<input.nrOfCol();++x){
@@ -281,7 +281,7 @@ void filter::Filter::morphology(ImgReaderGdal& input, ImgWriterGdal& output, con
     }
     for(int iband=0;iband<input.nrOfBand();++iband){
       try{
-        output.writeData(lineOutput[iband],GDT_Float64,y,iband);
+        output.writeData(lineOutput[iband],y,iband);
       }
       catch(string errorstring){
         cerr << errorstring << "in band " << iband << ", line " << y << endl;
@@ -303,7 +303,7 @@ void filter::Filter::smoothNoData(ImgReaderGdal& input, const std::string& inter
   pfnProgress(progress,pszMessage,pProgressArg);
   for(int y=0;y<input.nrOfRow();++y){
     for(int iband=0;iband<input.nrOfBand();++iband)
-      input.readData(lineInput[iband],GDT_Float64,y,iband);
+      input.readData(lineInput[iband],y,iband);
     vector<double> pixelInput(input.nrOfBand());
     vector<double> pixelOutput(input.nrOfBand());
     for(int x=0;x<input.nrOfCol();++x){
@@ -314,7 +314,7 @@ void filter::Filter::smoothNoData(ImgReaderGdal& input, const std::string& inter
     }
     for(int iband=0;iband<input.nrOfBand();++iband){
       try{
-        output.writeData(lineOutput[iband],GDT_Float64,y,iband);
+        output.writeData(lineOutput[iband],y,iband);
       }
       catch(string errorstring){
         cerr << errorstring << "in band " << iband << ", line " << y << endl;
@@ -345,7 +345,7 @@ void filter::Filter::filter(ImgReaderGdal& input, ImgWriterGdal& output)
   pfnProgress(progress,pszMessage,pProgressArg);
   for(int y=0;y<input.nrOfRow();++y){
     for(int iband=0;iband<input.nrOfBand();++iband)
-      input.readData(lineInput[iband],GDT_Float64,y,iband);
+      input.readData(lineInput[iband],y,iband);
     vector<double> pixelInput(input.nrOfBand());
     vector<double> pixelOutput(input.nrOfBand());
     for(int x=0;x<input.nrOfCol();++x){
@@ -356,7 +356,7 @@ void filter::Filter::filter(ImgReaderGdal& input, ImgWriterGdal& output)
     }
     for(int iband=0;iband<input.nrOfBand();++iband){
       try{
-        output.writeData(lineOutput[iband],GDT_Float64,y,iband);
+        output.writeData(lineOutput[iband],y,iband);
       }
       catch(string errorstring){
         cerr << errorstring << "in band " << iband << ", line " << y << endl;
@@ -381,7 +381,7 @@ void filter::Filter::stat(ImgReaderGdal& input, ImgWriterGdal& output, const std
   pfnProgress(progress,pszMessage,pProgressArg);
   for(int y=0;y<input.nrOfRow();++y){
     for(int iband=0;iband<input.nrOfBand();++iband)
-      input.readData(lineInput[iband],GDT_Float64,y,iband);
+      input.readData(lineInput[iband],y,iband);
     vector<double> pixelInput(input.nrOfBand());
     for(int x=0;x<input.nrOfCol();++x){
       pixelInput=lineInput.selectCol(x);
@@ -418,7 +418,7 @@ void filter::Filter::stat(ImgReaderGdal& input, ImgWriterGdal& output, const std
       }
     }
     try{
-      output.writeData(lineOutput,GDT_Float64,y);
+      output.writeData(lineOutput,y);
     }
     catch(string errorstring){
       cerr << errorstring << "in line " << y << endl;
@@ -443,11 +443,18 @@ void filter::Filter::stats(ImgReaderGdal& input, ImgWriterGdal& output, const ve
   pfnProgress(progress,pszMessage,pProgressArg);
   for(int y=0;y<input.nrOfRow();++y){
     for(int iband=0;iband<input.nrOfBand();++iband)
-      input.readData(lineInput[iband],GDT_Float64,y,iband);
+      input.readData(lineInput[iband],y,iband);
     vector<double> pixelInput(input.nrOfBand());
     for(int x=0;x<input.nrOfCol();++x){
+      try{
         pixelInput=lineInput.selectCol(x);
+      }
+      catch(...){
+        std::cout << "error is caught" << std::endl;
+        exit(1);
+      }
       int ithreshold=0;//threshold to use for percentiles
+      try{
         for(int imethod=0;imethod<methods.size();++imethod){
           switch(getFilterType(methods[imethod])){
           case(filter::nvalid):
@@ -488,14 +495,12 @@ void filter::Filter::stats(ImgReaderGdal& input, ImgWriterGdal& output, const ve
           }
         }
       }
-    for(int imethod=0;imethod<methods.size();++imethod){
-      try{
-	output.writeData(lineOutput[imethod],GDT_Float64,y,imethod);
-      }
-      catch(string errorstring){
-	cerr << errorstring << "in line " << y << endl;
+      catch(...){
+        cerr << "An Error in line " << y << endl;
       }
     }
+    for(int imethod=0;imethod<methods.size();++imethod)
+        output.writeData(lineOutput[imethod],y,imethod);
     progress=(1.0+y)/output.nrOfRow();
     pfnProgress(progress,pszMessage,pProgressArg);
   }
@@ -512,7 +517,7 @@ void filter::Filter::filter(ImgReaderGdal& input, ImgWriterGdal& output, const s
   pfnProgress(progress,pszMessage,pProgressArg);
   for(int y=0;y<input.nrOfRow();++y){
     for(int iband=0;iband<input.nrOfBand();++iband)
-      input.readData(lineInput[iband],GDT_Float64,y,iband);
+      input.readData(lineInput[iband],y,iband);
     vector<double> pixelInput(input.nrOfBand());
     vector<double> pixelOutput;
     for(int x=0;x<input.nrOfCol();++x){
@@ -526,7 +531,7 @@ void filter::Filter::filter(ImgReaderGdal& input, ImgWriterGdal& output, const s
     }
     for(int iband=0;iband<input.nrOfBand();++iband){
       try{
-        output.writeData(lineOutput[iband],GDT_Float64,y,iband);
+        output.writeData(lineOutput[iband],y,iband);
       }
       catch(string errorstring){
         cerr << errorstring << "in band " << iband << ", line " << y << endl;

src/apps/pkcomposite.cc

@@ -21,6 +21,7 @@ along with pktools.  If not, see <http://www.gnu.org/licenses/>.
 #include <vector>
 #include <iostream>
 #include <string>
+#include <math.h>
 #include "imageclasses/ImgReaderGdal.h"
 #include "imageclasses/ImgWriterGdal.h"
 #include "imageclasses/ImgReaderOgr.h"
@@ -578,9 +579,10 @@ int main(int argc, char *argv[])
   //   int ncol=static_cast<int>(dcol);
   //   int nrow=static_cast<int>(drow);
 
-  int ncol=ceil((maxLRX-minULX)/dx);
-  int nrow=ceil((maxULY-minLRY)/dy);
-
+  int ncol=abs(static_cast<int>(ceil((maxLRX-minULX)/dx)));
+  int nrow=abs(static_cast<int>(ceil((maxULY-minLRY)/dy)));
+  // int ncol=ceil((maxLRX-minULX)/dx);
+  // int nrow=ceil((maxULY-minLRY)/dy);
   if(verbose_opt[0])
     cout << "composite image dim (nrow x ncol): " << nrow << " x " << ncol << endl;
   ImgWriterGdal imgWriter;
@@ -701,7 +703,7 @@ int main(int argc, char *argv[])
   vector<short> fileBuffer(ncol);//holds the number of used files
   Vector2d<short> maxBuffer;//buffer used for maximum voting
   // Vector2d<double> readBuffer(nband);
-  vector<Vector2d<unsigned short> > readBuffer(input_opt.size());
+  vector<Vector2d<double> > readBuffer(input_opt.size());
   for(int ifile=0;ifile<input_opt.size();++ifile)
     readBuffer[ifile].resize(imgReader[ifile].nrOfBand());
   statfactory::StatFactory stat;
@@ -776,7 +778,6 @@ int main(int argc, char *argv[])
       ulj=floor(ulj);
       lri=floor(lri);
       lrj=floor(lrj);
-        
       double startCol=uli;
       double endCol=lri;
       if(uli<0)
@@ -787,7 +788,7 @@ int main(int argc, char *argv[])
         endCol=0;
       else if(lri>=imgReader[ifile].nrOfCol())
         endCol=imgReader[ifile].nrOfCol()-1;
-      int readncol=endCol-startCol+1;
+      // int readncol=endCol-startCol+1;
 
       //lookup corresponding row for irow in this file
       imgReader[ifile].geo2image(x,y,readCol,readRow);
@@ -1109,6 +1110,11 @@ int main(int argc, char *argv[])
             }
           }
           else{
+            // //test
+            // if(readCol-startCol==0)
+            //   std::cout << "val_new(" << ib << "): " << val_new << std::endl;
+            // else if(readCol-startCol==ncol-1)
+            //   std::cout << "val_new(" << ib << "): " << val_new << std::endl;
             writeValid[ib]=true;//readValid was true
             int iband=0;
             switch(cruleMap[crule_opt[0]]){
@@ -1315,4 +1321,3 @@ int main(int argc, char *argv[])
     maskReader.close();
   imgWriter.close();
 }
-  

src/apps/pkcrop.cc

@@ -680,8 +680,6 @@ int main(int argc, char *argv[])
     else if(lrj>=imgReader.nrOfRow())
       endRow=imgReader.nrOfRow()-1;
 
-
-
     int readncol=endCol-startCol+1;
     // vector<double> readBuffer(readncol+1);
     vector<double> readBuffer;