3rdparty/alglib/src/ap.cpp

@@ -140,10 +140,10 @@ __declspec(align(AE_LOCK_ALIGNMENT)) volatile ae_int64_t _ae_dbg_lock_yields = 0
  * you can remove them, if you want - they are not used anywhere.
  *
  */
-static char     _ae_bool_must_be_8_bits_wide[1-2*((int)(sizeof(ae_bool))-1)*((int)(sizeof(ae_bool))-1)];
-static char _ae_int32_t_must_be_32_bits_wide[1-2*((int)(sizeof(ae_int32_t))-4)*((int)(sizeof(ae_int32_t))-4)];
-static char _ae_int64_t_must_be_64_bits_wide[1-2*((int)(sizeof(ae_int64_t))-8)*((int)(sizeof(ae_int64_t))-8)];
-static char _ae_int_t_must_be_pointer_sized [1-2*((int)(sizeof(ae_int_t))-(int)sizeof(void*))*((int)(sizeof(ae_int_t))-(int)(sizeof(void*)))];  
+//static char     _ae_bool_must_be_8_bits_wide[1-2*((int)(sizeof(ae_bool))-1)*((int)(sizeof(ae_bool))-1)];
+//static char _ae_int32_t_must_be_32_bits_wide[1-2*((int)(sizeof(ae_int32_t))-4)*((int)(sizeof(ae_int32_t))-4)];
+//static char _ae_int64_t_must_be_64_bits_wide[1-2*((int)(sizeof(ae_int64_t))-8)*((int)(sizeof(ae_int64_t))-8)];
+//static char _ae_int_t_must_be_pointer_sized [1-2*((int)(sizeof(ae_int_t))-(int)sizeof(void*))*((int)(sizeof(ae_int_t))-(int)(sizeof(void*)))];
 
 /*
  * This variable is used to prevent some tricky optimizations which may degrade multithreaded performance.

3rdparty/alglib/src/linalg.cpp

@@ -10891,8 +10891,8 @@ bool rmatrixschur(real_2d_array &a, const ae_int_t n, real_2d_array &s)
 /////////////////////////////////////////////////////////////////////////
 namespace alglib_impl
 {
-static ae_int_t ablas_rgemmparallelsize = 64;
-static ae_int_t ablas_cgemmparallelsize = 64;
+//static ae_int_t ablas_rgemmparallelsize = 64;
+//static ae_int_t ablas_cgemmparallelsize = 64;
 static void ablas_ablasinternalsplitlength(ae_int_t n,
      ae_int_t nb,
      ae_int_t* n1,
@@ -11363,7 +11363,7 @@ static void rcond_internalcomplexrcondloadall(/* Integer */ ae_vector* isave,
      ae_state *_state);
 
 
-static ae_int_t matinv_parallelsize = 64;
+//static ae_int_t matinv_parallelsize = 64;
 static void matinv_rmatrixtrinverserec(/* Real    */ ae_matrix* a,
      ae_int_t offs,
      ae_int_t n,

3rdparty/alglib/src/optimization.cpp

@@ -36524,7 +36524,7 @@ static void minns_solveqp(/* Real    */ ae_matrix* sampleg,
     double v;
     double vv;
     ae_int_t n;
-    ae_int_t nr;
+//    ae_int_t nr;
     ae_int_t idx0;
     ae_int_t idx1;
     ae_int_t ncandbnd;
@@ -36536,7 +36536,7 @@ static void minns_solveqp(/* Real    */ ae_matrix* sampleg,
     ae_int_t actidx;
     double dtol;
     ae_bool kickneeded;
-    ae_bool terminationneeded;
+//    ae_bool terminationneeded;
     double kicklength;
     double lambdav;
     double maxdiag;
@@ -36546,7 +36546,7 @@ static void minns_solveqp(/* Real    */ ae_matrix* sampleg,
 
 
     n = nsample;
-    nr = nvars;
+//    nr = nvars;
     
     /*
      * Allocate arrays, prepare data
@@ -36591,7 +36591,7 @@ static void minns_solveqp(/* Real    */ ae_matrix* sampleg,
     dtol = 1.0E5*ae_machineepsilon;
     kicklength = ae_machineepsilon;
     lambdav = 1.0E5*ae_machineepsilon;
-    terminationneeded = ae_false;
+//    terminationneeded = ae_false;
     termcnt = 0;
     for(;;)
     {

CMakeLists.txt

+###############################################################################################
+# CMake compatibility requirements
+###############################################################################################
 cmake_minimum_required(VERSION 3.0.0)
 
-project(QMapShack)
-
-option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
-if(WIN32)
-option(USE_QT5DBus "Enable device detection via DBus" OFF)
-else(WIN32)
-option(USE_QT5DBus "Enable device detection via DBus" ON)
-endif(WIN32)
-
 # Needed to properly handle extract translations strings when using the Ninja
 # generator.
 if (COMMAND CMAKE_POLICY)
@@ -17,102 +11,199 @@ if (COMMAND CMAKE_POLICY)
     endif()
 endif()
 
-if(WIN32)
-set(QT_DEV_PATH   "C:\\Qt5\\5.5\\msvc2013_64" CACHE PATH "Path to directory containing Qt5 include and lib, e.g. C:\\Qt5\\5.5\\msvc2013_64")
-set(GDAL_DEV_PATH "C:\\GDAL" CACHE PATH "Path to directory containing GDAL include and lib, e.g. M:\\lib\\gdal")
-set(PROJ_DEV_PATH "C:\\PROJ" CACHE PATH "Path to directory containing PROJ.4 include and lib, e.g. M:\\lib\\PROJ")
-set(ROUTINO_DEV_PATH "C:\\routino" CACHE PATH "Path to directory containing routino include and lib, e.g. M:\\lib\\routino")
-set(QUAZIP_DEV_PATH "C:\\quazip" CACHE PATH "Path to directory containing quazip include and lib, e.g. M:\\lib\\quazip5")
-set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${QT_DEV_PATH})
-endif(WIN32)
+if (COMMAND CMAKE_POLICY)
+    if (POLICY CMP0048)
+        cmake_policy(SET CMP0048 NEW)
+    endif()
+endif()
+
+###############################################################################################
+# Define project name and version tags
+###############################################################################################
+# this is not only the QMS version it will be the package version, too.
+project(QMapShack VERSION 1.11.0)
 
+# FOR A RELEASE:
+# remove "development" for a release
+set(VERSION_SUFFIX )
+# !!! Do not forget to update versions in the sub-repos, too!!!
 
-set(APPLICATION_NAME qmapshack)
 
-set(APPLICATION_VERSION_MAJOR "1")
-set(APPLICATION_VERSION_MINOR "10")
-set(APPLICATION_VERSION_PATCH "0")
+###############################################################################################
+# Define paths and include other modules
+###############################################################################################
+# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
+
+# all binaries are collected in the ./bin directory
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
+
+include(TranslateTs)
+include(TranslateDesktop)
+include(DefineCMakeDefaults)
+include(DefineCompilerFlags)
+include(DefineInstallationPaths)
+include(CPackConfig.cmake)
+include(ConfigureChecks.cmake)
+
+###############################################################################################
+# All boolean options
+###############################################################################################
+
+# Translation related
+option(UPDATE_TRANSLATIONS  "Update source translation translations/*.ts files"     OFF)
+
+# Feature related
+option(BUILD_QMAPSHACK      "Build QMapShack Binary"                                ON)
+option(BUILD_QMAPTOOL       "Build QMapTool Binary including command line tools"    ON)
+
+if(WIN32)
+option(USE_QT5DBus          "Enable device detection via DBus"                      OFF)
+else(WIN32)
+option(USE_QT5DBus          "Enable device detection via DBus"                      ON)
+endif(WIN32)
 
-add_definitions(-DVER_MAJOR=${APPLICATION_VERSION_MAJOR} -DVER_MINOR=${APPLICATION_VERSION_MINOR} -DVER_STEP=${APPLICATION_VERSION_PATCH} -DAPPLICATION_NAME=${PROJECT_NAME})
+# Compiler related
+option(BUILD_FOR_LOCAL_SYSTEM "Build for local system ONLY (resulting binary might not work on other systems!)" OFF)
 
 
+###############################################################################################
+# All OS and compiler specific tweaks
+###############################################################################################
 if (APPLE)
-  set(PROGNAME "QMapShack")
-  set(CONFIGDIR "Library/Application Support/${PROGNAME}/")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_INIT} -Wall -std=c++11 -stdlib=libc++")
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++")
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -framework Foundation -framework DiskArbitration")
+    SET(LINK_FLAGS "${LINK_FLAGS} -framework Foundation -framework DiskArbitration")
     SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.7")
-else(APPLE)
-  set(PROGNAME qmapshack)
-  set(CONFIGDIR ".config/QLandkarte/")
 endif(APPLE)
+
+if(WIN32)
+    set(QT_DEV_PATH   "C:\\Qt5\\5.5\\msvc2013_64" CACHE PATH "Path to directory containing Qt5 include and lib, e.g. C:\\Qt5\\5.5\\msvc2013_64")
+    set(GDAL_DEV_PATH "C:\\GDAL" CACHE PATH "Path to directory containing GDAL include and lib, e.g. M:\\lib\\gdal")
+    set(PROJ_DEV_PATH "C:\\PROJ" CACHE PATH "Path to directory containing PROJ.4 include and lib, e.g. M:\\lib\\PROJ")
+    set(ROUTINO_DEV_PATH "C:\\routino" CACHE PATH "Path to directory containing routino include and lib, e.g. M:\\lib\\routino")
+    set(QUAZIP_DEV_PATH "C:\\quazip" CACHE PATH "Path to directory containing quazip include and lib, e.g. M:\\lib\\quazip5")
+    set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${QT_DEV_PATH})
+endif(WIN32)
+
 if(MSVC)
     # Add link-time code generation to improve performance
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL")
     set(CMAKE_EXE_LINKER_FLAGS_RELEASE    "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG")
     set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} /LTCG")
     set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG")
+    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 endif(MSVC)
 
-# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
-set(CMAKE_MODULE_PATH
-  ${CMAKE_SOURCE_DIR}/cmake/Modules
-)
-
-# Bring translation support in
-include(TranslateTs)
-include(TranslateDesktop)
+if(UNIX)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -lstdc++ -lm")
+    add_definitions(-Wall -Wpedantic -Wno-switch -Wno-strict-aliasing)
+endif(UNIX)
+
+
+###############################################################################################
+# GCC specific compiler tweaks
+###############################################################################################
+if(BUILD_FOR_LOCAL_SYSTEM)
+    cxx_local_system_optimization()
+endif(BUILD_FOR_LOCAL_SYSTEM)
+
+# try to figure out which compiler flags are supported (and add them)
+cxx_add_flag_if_supported(-Wsuggest-override)
+cxx_add_flag_if_supported(-Woverloaded-virtual)
+
+###############################################################################################
+# Find all required packages and setup internal variables
+###############################################################################################
+find_package(Qt5Widgets         REQUIRED)
+find_package(Qt5Core            REQUIRED)
+find_package(Qt5Xml             REQUIRED)
+find_package(Qt5Script          REQUIRED)
+find_package(Qt5Sql             REQUIRED)
+find_package(Qt5WebKitWidgets   REQUIRED)
+find_package(Qt5LinguistTools   REQUIRED)
+find_package(Qt5PrintSupport    REQUIRED)
+find_package(Qt5UiTools         REQUIRED)
+find_package(GDAL               REQUIRED)
+find_package(PROJ               REQUIRED)
+find_package(JPEG               REQUIRED)
+find_package(ROUTINO            REQUIRED)
+find_package(QuaZip             REQUIRED)
+find_package(ALGLIB                     ) # optional as we can use our local version
+
+
+if(${Qt5Widgets_VERSION} MATCHES "5\\.[0-2]{1}\\..*")
+    message( SEND_ERROR "You need at least Qt5.3 or newer.")
+endif()
 
-# add definitions
-include(DefineCMakeDefaults)
-include(DefineCompilerFlags)
-include(DefineInstallationPaths)
-include(CPackConfig.cmake)
+if(USE_QT5DBus)
+    find_package(Qt5DBus REQUIRED)
+    if(Qt5DBus_FOUND)
+        add_definitions(-DHAVE_DBUS)
+    endif(Qt5DBus_FOUND)
+endif(USE_QT5DBus)
 
-include(ConfigureChecks.cmake)
-configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+# Everything included. Let's finetune the mess a bit more
 
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
+if(APPLE)
+     find_library(DiskArbitration_LIBRARY DiskArbitration)
+     find_library(Foundation_LIBRARY Foundation)
+endif(APPLE)
 
-find_package(ALGLIB)
 
-if(NOT ALGLIB_FOUND)
+if(NOT ALGLIB_FOUND AND BUILD_QMAPSHACK)
     set(ALGLIB_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/alglib/src)
     set(ALGLIB_LIBRARIES alg)
     add_subdirectory(3rdparty/alglib)
-endif(NOT ALGLIB_FOUND)
+endif(NOT ALGLIB_FOUND AND BUILD_QMAPSHACK)
 
-add_subdirectory(src)
+###############################################################################################
+# Create global config.h
+###############################################################################################
+if (APPLE)
+  set(PROGNAME "QMapShack")
+  set(CONFIGDIR "Library/Application Support/${PROGNAME}/")
+else(APPLE)
+  set(PROGNAME ${PROJECT_NAME})
+  set(CONFIGDIR ".config/QLandkarte/")
+endif(APPLE)
+
+configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
+###############################################################################################
+# Now we are ready to compile all sub-projects
+###############################################################################################
+if(BUILD_QMAPSHACK)
+add_subdirectory(src/qmapshack)
+endif(BUILD_QMAPSHACK)
+
+if(BUILD_QMAPTOOL)
+add_subdirectory(src/qmaptool)
+add_subdirectory(src/qmt_rgb2pct)
+add_subdirectory(src/qmt_map2jnx)
+endif(BUILD_QMAPTOOL)
+
+###############################################################################################
+# Copy a few more files need by the install/unistall target
+###############################################################################################
 if (UNIX AND NOT WIN32 AND NOT APPLE)
-  install(
-    FILES
-      src/icons/48x48/QMapShack.png
-    DESTINATION
-      ${DATA_INSTALL_PREFIX}/pixmaps
-  )
-
-  install(
-    DIRECTORY
-      src/icons/hicolor
-    DESTINATION
-      ${ICON_INSTALL_DIR}
-  )
-
-  install(
-    FILES
-      qmapshack.1
-    DESTINATION
-      ${MAN_INSTALL_DIR}/man1
-  )
+if(BUILD_QMAPSHACK)
+    install( FILES        src/icons/48x48/QMapShack.png     DESTINATION     ${DATA_INSTALL_PREFIX}/pixmaps )    
+    install( DIRECTORY    src/icons/qmapshack/hicolor       DESTINATION     ${ICON_INSTALL_DIR} )
+    install( FILES        qmapshack.1                       DESTINATION     ${MAN_INSTALL_DIR}/man1  )
+endif(BUILD_QMAPSHACK)
+
+if(BUILD_QMAPTOOL)
+    install( FILES        src/icons/48x48/QMapTool.png      DESTINATION     ${DATA_INSTALL_PREFIX}/pixmaps )
+    install( DIRECTORY    src/icons/qmaptool/hicolor        DESTINATION     ${ICON_INSTALL_DIR} )
+    install( FILES        qmaptool.1                        DESTINATION     ${MAN_INSTALL_DIR}/man1  )
+    install( FILES        qmt_rgb2pct.1                     DESTINATION     ${MAN_INSTALL_DIR}/man1  )
+endif(BUILD_QMAPTOOL)
 endif (UNIX AND NOT WIN32 AND NOT APPLE)
 
-CONFIGURE_FILE(
-  "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-  IMMEDIATE @ONLY)
-
-ADD_CUSTOM_TARGET(uninstall
-  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+# this is used by the uninstall target
+CONFIGURE_FILE( "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
+ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
 
 

CMakeLists.txt.user

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.4.1, 2017-12-21T08:47:17. -->
+<!-- Written by QtCreator 4.5.0, 2018-03-05T11:10:51. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
-  <value type="QByteArray">{866bca39-16eb-4541-961c-07f20b41e42e}</value>
+  <value type="QByteArray">{8c794b5e-2a75-4115-9132-2a8e41033185}</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -59,24 +59,25 @@
  <data>
   <variable>ProjectExplorer.Project.Target.0</variable>
   <valuemap type="QVariantMap">
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 5.6.2 (qt5)</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Qt 5.6.2 (qt5)</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{8715122a-3e83-46ae-83d4-72f9a7d29e4c}</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{51546969-344d-413b-bc16-18294a0c7ceb}</value>
    <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">4</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
     <valuelist type="QVariantList" key="CMake.Configuration">
      <value type="QString">BUILD_FOR_LOCAL_SYSTEM:BOOL=ON</value>
-     <value type="QString">CMAKE_BUILD_TYPE:STRING=Debug</value>
-     <value type="QString">CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/g++-7</value>
-     <value type="QString">CMAKE_C_COMPILER:FILEPATH=/usr/bin/gcc-7</value>
+     <value type="QString">BUILD_QMAPSHACK:BOOL=ON</value>
+     <value type="QString">BUILD_QMAPTOOL:BOOL=ON</value>
+     <value type="QString">CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx}</value>
+     <value type="QString">CMAKE_C_COMPILER:STRING=%{Compiler:Executable:C}</value>
      <value type="QString">CMAKE_INSTALL_PREFIX:PATH=/usr</value>
      <value type="QString">CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX}</value>
-     <value type="QString">QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable}</value>
+     <value type="QString">QT_QMAKE_EXECUTABLE:STRING=/usr/bin/qmake</value>
      <value type="QString">UPDATE_TRANSLATIONS:BOOL=OFF</value>
     </valuelist>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/oeichler/Code/cpp/build_QMapShack</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/oeichler/Code/cpp/build-QMapShack</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments">-j8</value>
@@ -174,7 +175,7 @@
     <value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">qmapshack</value>
     <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments"></value>
     <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
-    <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory.default">/home/oeichlerx/Code/cpp/build_QMapShack/bin</value>
+    <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory.default">/home/oeichler/Code/cpp/build-QMapShack/bin</value>
     <value type="int" key="PE.EnvironmentAspect.Base">2</value>
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmapshack</value>
@@ -230,10 +231,10 @@
     <value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">qmaptool</value>
     <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments"></value>
     <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
-    <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory.default">/home/oeichlerx/Code/cpp/build_QMapShack/bin</value>
-    <value type="int" key="PE.EnvironmentAspect.Base">-1</value>
+    <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory.default">/home/oeichler/Code/cpp/build-QMapShack/bin</value>
+    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmaptool (deaktiviert)</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmaptool</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.qmaptool</value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
@@ -243,7 +244,176 @@
     <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
    </valuemap>
-   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">2</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.2">
+    <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
+    <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
+    <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
+    <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
+    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
+    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
+    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
+    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+     <value type="int">0</value>
+     <value type="int">1</value>
+     <value type="int">2</value>
+     <value type="int">3</value>
+     <value type="int">4</value>
+     <value type="int">5</value>
+     <value type="int">6</value>
+     <value type="int">7</value>
+     <value type="int">8</value>
+     <value type="int">9</value>
+     <value type="int">10</value>
+     <value type="int">11</value>
+     <value type="int">12</value>
+     <value type="int">13</value>
+     <value type="int">14</value>
+    </valuelist>
+    <value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">qmt_rgb2pct</value>
+    <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments"></value>
+    <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
+    <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory.default">/home/oeichler/Code/cpp/build-QMapShack/bin</value>
+    <value type="int" key="PE.EnvironmentAspect.Base">-1</value>
+    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmt_rgb2pct</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.qmt_rgb2pct</value>
+    <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
+    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.3">
+    <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
+    <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
+    <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
+    <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
+    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
+    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
+    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
+    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+     <value type="int">0</value>
+     <value type="int">1</value>
+     <value type="int">2</value>
+     <value type="int">3</value>
+     <value type="int">4</value>
+     <value type="int">5</value>
+     <value type="int">6</value>
+     <value type="int">7</value>
+     <value type="int">8</value>
+     <value type="int">9</value>
+     <value type="int">10</value>
+     <value type="int">11</value>
+     <value type="int">12</value>
+     <value type="int">13</value>
+     <value type="int">14</value>
+    </valuelist>
+    <value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">qmt_map2jnx</value>
+    <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments">/home/MapRoom/map/Taufers.tif test.jnx
+</value>
+    <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory">/home/oeichler/Code/cpp/build-QMapShack</value>
+    <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory.default">/home/oeichler/Code/cpp/build-QMapShack/bin</value>
+    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
+    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmt_map2jnx</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.qmt_map2jnx</value>
+    <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
+    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.4">
+    <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
+    <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
+    <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
+    <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
+    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
+    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
+    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
+    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+     <value type="int">0</value>
+     <value type="int">1</value>
+     <value type="int">2</value>
+     <value type="int">3</value>
+     <value type="int">4</value>
+     <value type="int">5</value>
+     <value type="int">6</value>
+     <value type="int">7</value>
+     <value type="int">8</value>
+     <value type="int">9</value>
+     <value type="int">10</value>
+     <value type="int">11</value>
+     <value type="int">12</value>
+     <value type="int">13</value>
+     <value type="int">14</value>
+    </valuelist>
+    <value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">map2jnx</value>
+    <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments"></value>
+    <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
+    <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory.default">/home/oeichler/Code/cpp/build-QMapShack/bin</value>
+    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
+    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">map2jnx</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.map2jnx</value>
+    <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
+    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">5</value>
   </valuemap>
  </data>
  <data>

CPackConfig.cmake

@@ -4,21 +4,21 @@ include(InstallRequiredSystemLibraries)
 # http://www.cmake.org/Wiki/CMake:CPackConfiguration
 
 ### general settings
-string(TOLOWER ${APPLICATION_NAME} CPACK_PACKAGE_NAME)
+string(TOLOWER ${PROJECT_NAME} CPACK_PACKAGE_NAME)
 set(CPACK_PACKAGE_VENDOR "QLandkarte")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "GPS Map, Route, Waypoint and Tracking Tool")
 
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
 
 ### versions
-set(CPACK_PACKAGE_VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}.${APPLICATION_VERSION_PATCH}")
+set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
 
 set(CPACK_GENERATOR "TGZ")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
 
 ### source package settings
 set(CPACK_SOURCE_GENERATOR "TGZ")
-set(CPACK_SOURCE_IGNORE_FILES "~$;[.]swp$;/[.]svn/;/[.]git/;[.]hg/;[.]hgsub;[.]hgsubstate;.gitignore;/build/;tags;cscope.*;[.]rej$;[.]orig$;svn-commit[.]")
+set(CPACK_SOURCE_IGNORE_FILES "~$;[.]swp$;/[.]svn/;/[.]git/;[.]hg/;[.]hgsub;[.]hgsubstate;.gitignore;/build/;tags;cscope.*;[.]rej$;[.]orig$;svn-commit[.];/doc/")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
 
 include(CPack)

ConfigureChecks.cmake

@@ -6,7 +6,7 @@ include(CheckTypeSize)
 include(CheckCXXSourceCompiles)
 include(TestBigEndian)
 
-set(PACKAGE ${APPLICATION_NAME})
+set(PACKAGE ${PROJECT_NAME})
 set(VERSION ${APPLICATION_VERSION})
 set(DATADIR ${DATA_INSTALL_DIR})
 set(LIBDIR ${LIB_INSTALL_DIR})

README.md

@@ -25,7 +25,7 @@ Next to QT5 you will need the development packages of:
 * [Qt5](https://www.qt.io/) (at least 5.4)
 * [GDAL](http://www.gdal.org/)
 * [Proj4](https://github.com/OSGeo/proj.4/wiki)
-* [Routino](http://www.routino.org/) (at least 3.0)
+* [Routino](http://www.routino.org/) (at least 3.1)
 * [QuaZip](http://quazip.sourceforge.net/index.html)
 * CMake/Make
 * a C++ compiler (supporting C++11)

changelog.txt

+V 1.11.0
+Add: QMapTool and friends as sub-project
+Add: Reverse route
+Add: BRoute binding to local address instead of all interfaces
+Add: Use track timestamp as arival time for waypoints attached to track 
+Add: Optional overview generation to vrt builder
+Add: Add left button long press action to open menu on canvas
+Add: Framework to process and display realtime data
+Add: Drop zones to collect items in summary folders of the database
+Add: Extend BRouter no-go areas to tracks, routes and areas
+Add: Calculate timestamps for tracks depending on the slope for bikes
+Fix: Clean up action enabling/disabling for GIS item menus
+Fix: Restructure mouse handling to solve some peculiar behavior
+[Issue #294] Missing error message in case of wrong map coordinate system
+[Issue #305] Nodata value 0 not accepted in VRT
+[Issue #289] Add-color-change-for-multiple-tracks
+
 V 1.10.0
 * Fine tune code for screen gestures.
 [Issue #253] Tracksorting in Datawindow somehow random- should be alphabetical

cmake/Modules/DefineCompilerFlags.cmake

@@ -11,3 +11,32 @@ if(UNIX AND NOT WIN32)
     endif(WITH_FPIC)
   endif(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
 endif(UNIX AND NOT WIN32)
+
+# function to test for compile flags
+function(cxx_add_flag_if_supported flag)
+    check_cxx_compiler_flag(${flag} Flag:${flag})
+    if(Flag:${flag})
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}" PARENT_SCOPE)
+    endif(Flag:${flag})
+endfunction(cxx_add_flag_if_supported)
+
+
+function(cxx_local_system_optimization)
+    set(flag "-march=native")
+    check_cxx_compiler_flag(${flag} Flag:${flag})
+    if(Flag:${flag})
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+        message(STATUS [=[
+ BUILDING FOR LOCAL SYSTEM ONLY
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Specifying -DBUILD_FOR_LOCAL_SYSTEM=ON will pass -march=native to the compiler.
+ The generated binary will exhibit higher performance,
+ but will not be portable (e.g., might not work on other CPUs)]=])
+    else(Flag:${flag})
+        message(STATUS [=[
+ Your compiler does not support -march=native.
+ Ignoring -DBUILD_FOR_LOCAL_SYSTEM=ON!]=])
+    endif(Flag:${flag})
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
+
+endfunction(cxx_local_system_optimization)

cmake/Modules/DefineInstallationPaths.cmake

 if (UNIX)
-  IF (NOT APPLICATION_NAME)
-    MESSAGE(STATUS "${PROJECT_NAME} is used as APPLICATION_NAME")
-    SET(APPLICATION_NAME ${PROJECT_NAME})
-  ENDIF (NOT APPLICATION_NAME)
 
-  STRING(TOLOWER ${APPLICATION_NAME} _APPLICATION_NAME)
+  STRING(TOLOWER ${PROJECT_NAME} _PROJECT_NAME)
 
   # Suffix for Linux
   SET(LIB_SUFFIX
@@ -28,12 +24,12 @@ if (UNIX)
   # The following are directories where stuff will be installed to
   SET(BIN_INSTALL_DIR
     "${EXEC_INSTALL_PREFIX}/bin"
-    CACHE PATH "The ${_APPLICATION_NAME} binary install dir (default prefix/bin)"
+    CACHE PATH "The ${_PROJECT_NAME} binary install dir (default prefix/bin)"
     FORCE
   )
   SET(SBIN_INSTALL_DIR
     "${EXEC_INSTALL_PREFIX}/sbin"
-    CACHE PATH "The ${_APPLICATION_NAME} sbin install dir (default prefix/sbin)"
+    CACHE PATH "The ${_PROJECT_NAME} sbin install dir (default prefix/sbin)"
     FORCE
   )
   SET(LIB_INSTALL_DIR
@@ -47,8 +43,8 @@ if (UNIX)
     FORCE
   )
   SET(PLUGIN_INSTALL_DIR
-    "${LIB_INSTALL_DIR}/${_APPLICATION_NAME}"
-    CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is prefix/lib/${_APPLICATION_NAME})"
+    "${LIB_INSTALL_DIR}/${_PROJECT_NAME}"
+    CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is prefix/lib/${_PROJECT_NAME})"
     FORCE
   )
   SET(INCLUDE_INSTALL_DIR
@@ -59,7 +55,7 @@ if (UNIX)
 
   SET(DATA_INSTALL_DIR
     "${DATA_INSTALL_PREFIX}"
-    CACHE PATH "The parent directory where applications can install their data (default prefix/share/${_APPLICATION_NAME})"
+    CACHE PATH "The parent directory where applications can install their data (default prefix/share/${_PROJECT_NAME})"
     FORCE
   )
   SET(HTML_INSTALL_DIR
@@ -97,17 +93,17 @@ if (UNIX)
 
   SET(SYSCONF_INSTALL_DIR
     "${EXEC_INSTALL_PREFIX}/etc"
-    CACHE PATH "The ${_APPLICATION_NAME} sysconfig install dir (default prefix/etc)"
+    CACHE PATH "The ${_PROJECT_NAME} sysconfig install dir (default prefix/etc)"
     FORCE
   )
   SET(MAN_INSTALL_DIR
     "${SHARE_INSTALL_PREFIX}/man"
-    CACHE PATH "The ${_APPLICATION_NAME} man install dir (default prefix/man)"
+    CACHE PATH "The ${_PROJECT_NAME} man install dir (default prefix/man)"
     FORCE
   )
   SET(INFO_INSTALL_DIR
     "${SHARE_INSTALL_PREFIX}/info"
-    CACHE PATH "The ${_APPLICATION_NAME} info install dir (default prefix/info)"
+    CACHE PATH "The ${_PROJECT_NAME} info install dir (default prefix/info)"
     FORCE
   )
 endif (UNIX)

config.h.cmake

-#cmakedefine PACKAGE ${APPLICATION_NAME}
+#cmakedefine PACKAGE ${PROJECT_NAME}
 #cmakedefine VERSION ${APPLICATION_VERSION}
 #cmakedefine LOCALEDIR ${LOCALE_INSTALL_DIR}
 #cmakedefine DATADIR ${SHARE_INSTALL_PREFIX}

debian/changelog

-qmapshack (1.10.0-2) UNRELEASED; urgency=medium
+qmapshack (1.11.0-1~exp1) experimental; urgency=medium
 
+  * New upstream release.
   * Update copyright-format URL to use HTTPS.
   * Bump Standards-Version to 4.1.3, no changes.
+  * Update copyright years for Oliver Eichler & Norbert Truchsess.
+  * Update compass image paths.
+  * Add patch to fix build failure with -Werror=format-security.
+  * Add patch for qmt_map2jnx manpage.
+  * Add lintian override for hardening-no-fortify-functions.
 
- -- Bas Couwenberg <sebastic@debian.org>  Sun, 21 Jan 2018 10:44:42 +0100
+ -- Bas Couwenberg <sebastic@debian.org>  Mon, 05 Mar 2018 15:32:55 +0100
 
 qmapshack (1.10.0-1) unstable; urgency=medium
 

debian/copyright

@@ -4,10 +4,10 @@ Upstream-Contact: Oliver Eichler <oliver.eichler@gmx.de>
 Source: https://bitbucket.org/maproom/qmapshack/downloads
 
 Files: *
-Copyright: 2006-2009, 2012, 2014-2017, Oliver Eichler <oliver.eichler@gmx.de>
+Copyright: 2006-2009, 2012, 2014-2018, Oliver Eichler <oliver.eichler@gmx.de>
+                            2017-2018, Norbert Truchsess <norbert.truchsess@t-online.de>
                             2015-2017, Christian Eichler <code@christian-eichler.de>
                             2016-2017, Michel Durand <zero@cms123.fr>
-                                 2017, Norbert Truchsess <norbert.truchsess@t-online.de>
                             2015-2016, Ivo Kronenberg
                                  2016, Peter Schumann <peter.schumann@jeepxj.de>
                                  2016, Rainer Woitok <rainer.woitok@gmail.com>
@@ -15,16 +15,26 @@ Copyright: 2006-2009, 2012, 2014-2017, Oliver Eichler <oliver.eichler@gmx.de>
                                  2009, Joerg Wunsch <j@uriah.heep.sax.de>
 License: GPL-3+
 
-Files: src/GeoMath.cpp
- src/GeoMath.h
- src/units/CUnitImperial.cpp
- src/units/CUnitImperial.h
- src/units/CUnitMetric.cpp
- src/units/CUnitMetric.h
- src/units/CUnitNautic.cpp
- src/units/CUnitNautic.h
- src/units/IUnit.cpp
- src/units/IUnit.h
+Files: src/qmapshack/GeoMath.cpp
+ src/qmapshack/GeoMath.h
+ src/qmapshack/units/CUnitImperial.cpp
+ src/qmapshack/units/CUnitImperial.h
+ src/qmapshack/units/CUnitMetric.cpp
+ src/qmapshack/units/CUnitMetric.h
+ src/qmapshack/units/CUnitNautic.cpp
+ src/qmapshack/units/CUnitNautic.h
+ src/qmapshack/units/IUnit.cpp
+ src/qmapshack/units/IUnit.h
+ src/qmaptool/GeoMath.cpp
+ src/qmaptool/GeoMath.h
+ src/qmaptool/units/CUnitImperial.cpp
+ src/qmaptool/units/CUnitImperial.h
+ src/qmaptool/units/CUnitMetric.cpp
+ src/qmaptool/units/CUnitMetric.h
+ src/qmaptool/units/CUnitNautic.cpp
+ src/qmaptool/units/CUnitNautic.h
+ src/qmaptool/units/IUnit.cpp
+ src/qmaptool/units/IUnit.h
 Copyright: 2008-2009, Oliver Eichler <oliver.eichler@gmx.de>
 License: GPL-2+
 

debian/lintian-overrides

 # False positive, abbreviation: Sea Lev. Pres.
 qmapshack: spelling-error-in-binary usr/bin/qmapshack Pres Press
 
+# Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports:
+#  Fortify Source functions: no, only unprotected functions found!
+qmapshack: hardening-no-fortify-functions *
+

debian/patches/format-security.patch

+Description: Fix build failure with -Werror=format-security.
+ error: format not a string literal and no format arguments [-Werror=format-security]
+Author: Bas Couwenberg <sebastic@debian.org>
+Forwarded: https://bitbucket.org/maproom/qmt_rgb2pct/pull-requests/1/fix-build-failure-with-werror-format/diff
+Applied-Upstream: https://bitbucket.org/maproom/qmt_rgb2pct/commits/fc76ad2587ee8f7614075e8da6c5111ca322cab3
+
+--- a/src/qmt_rgb2pct/CApp.cpp
++++ b/src/qmt_rgb2pct/CApp.cpp
+@@ -27,14 +27,14 @@ const GDALColorEntry CApp::noColor = {25
+ void printStdoutQString(const QString& str)
+ {
+     QByteArray array = str.toUtf8();
+-    printf(array.data());
++    printf("%s", array.data());
+     printf("\n");
+ }
+ 
+ void printStderrQString(const QString& str)
+ {
+     QByteArray array = str.toUtf8();
+-    fprintf(stderr, array.data());
++    fprintf(stderr, "%s", array.data());
+     fprintf(stderr, "\n");
+ }
+ 

debian/patches/qmt_map2jnx-manpage.patch

+Description: Add manpage for qmt_map2jnx.
+Author: Bas Couwenberg <sebastic@debian.org>
+Forwarded: https://bitbucket.org/maproom/qmapshack/pull-requests/215/add-manpage-for-qmt_map2jnx/diff
+Applied-Upstream: https://bitbucket.org/maproom/qmapshack/commits/de298ce3e66a41b70f9d772ffa7e69792ae04774
+
+--- /dev/null
++++ b/qmt_map2jnx.1
+@@ -0,0 +1,99 @@
++.TH "QMT_MAP2JNX" "1" "Jan 2018" "" ""
++.SH "NAME"
++qmt_map2jnx - convert map to JNX
++.br
++
++.SH "SYNOPSIS"
++qmt_map2jnx \-q <1..100> \-s <411|422|444> \-p <0..> \-c "copyright notice"
++\-m "BirdsEye" \-n "Unknown" \-x file1_scale,file2_scale,...,fileN_scale
++<file1> <file2> ... <fileN> <outputfile>
++.br
++
++.SH "DESCRIPTION"
++\fBqmt_map2jnx\fR is a helper utility for qmapshack(1) to convert a map
++to JNX format.
++.PP
++The projection of the input files must have the same latitude along
++a pixel row. Mecator and Longitude/Latitude projections match this
++this property. Transversal Merkator or Lambert projections do not.
++.PP
++To rectify a geotiff map, you can use the gdalwarp command, e.g.
++.IP
++gdalwarp \-t_srs "EPSG:4326" <inputfile> <outputfile>
++.PP
++Scale levels must be pass in same order as level files pointed.
++Empty and zero values equal to autodetect. We can point only needed
++levels, like:
++.IP
++\-x 45356,,,75; \-x ,,,,75
++.PP
++Calculated levels table can be found:
++.IP \[bu]
++English: http://whiter.brinkster.net/en/JNX.shtml
++.IP \[bu]
++Russian: http://whiter.brinkster.net/JNX.shtml
++.PP
++Most common values for different map scales:
++.IP
++ JNX scale              Map scale
++ -------------          ---------
++ 78125-31250            1:1 000 000
++ 20834-7813             1:500 000
++ 7813-3125              1:200 000
++ 3125-2084              1:100 000
++ 2084-782               1:50 000
++ 782-32                 1:25 000
++ 32-21                  1:10 000
++ 21-14                  1:5000, 1:2000
++
++.SH "OPTIONS"
++\fB-q\fR
++.br
++	The JPEG quality from 1 to 100. Default is 75
++.br
++
++\fB-s\fR
++.br
++	The chroma subsampling. Default is 411
++.br
++	
++.br
++\fB-p\fR
++.br
++	The product ID. Default is 0
++.br
++	
++.br
++\fB-c\fR
++.br
++	The copyright notice. Default is "Unknown"
++.br
++	
++.br
++\fB-m\fR
++.br
++	The subscription product name. Default is "BirdsEye"
++.br
++
++\fB-n\fR
++.br
++	The map name. Default is "Unknown"
++.br
++
++\fB-z\fR
++.br
++	The z order (drawing order). Default is 25
++.br
++
++\fB-x\fR
++.br
++	Override levels scale. Default: autodetect
++.br
++
++.SH "SEE ALSO"
++https://bitbucket.org/maproom/qmapshack/wiki/DocMain
++.br
++
++.SH "AUTHOR"
++qmt_map2jnx was written and is currently maintained by Oliver Eichler \fB<oliver.eichler@gmx.de>\fR.
++.br
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bcb6988..9102369 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -198,6 +198,7 @@ if(BUILD_QMAPTOOL)
+     install( FILES        src/icons/48x48/QMapTool.png      DESTINATION     ${DATA_INSTALL_PREFIX}/pixmaps )
+     install( DIRECTORY    src/icons/qmaptool/hicolor        DESTINATION     ${ICON_INSTALL_DIR} )
+     install( FILES        qmaptool.1                        DESTINATION     ${MAN_INSTALL_DIR}/man1  )
++    install( FILES        qmt_map2jnx.1                     DESTINATION     ${MAN_INSTALL_DIR}/man1  )
+     install( FILES        qmt_rgb2pct.1                     DESTINATION     ${MAN_INSTALL_DIR}/man1  )
+ endif(BUILD_QMAPTOOL)
+ endif (UNIX AND NOT WIN32 AND NOT APPLE)

debian/patches/series

+format-security.patch
+qmt_map2jnx-manpage.patch

debian/rules

@@ -27,7 +27,7 @@ ifeq (,$(findstring $(DEB_HOST_ARCH),"arm64 mips64el powerpc hurd-i386"))
 	cd $(CURDIR)/src/icons/ && bash makeicons
 	cd $(CURDIR)/src/icons/cache/ && bash makeicons
 	cd $(CURDIR)/src/icons/waypoints/ && bash makeicons
-	inkscape -D -w 180 -h 180 $(CURDIR)/src/pics/compass.svg --export-png=$(CURDIR)/src/pics/compass.png
+	inkscape -D -w 180 -h 180 $(CURDIR)/src/qmapshack/pics/compass.svg --export-png=$(CURDIR)/src/qmapshack/pics/compass.png
 endif
 
 	dh_auto_build

msvc_64/QMapShack_Installer.nsi

@@ -107,6 +107,9 @@ Section "QMapShack" QMapShack
   ;BEGIN QMapShack Files    
   SetOutPath $INSTDIR
     File Files\qmapshack.exe
+    File Files\qmaptool.exe
+    File Files\qmt_map2jnx.exe
+    File Files\qmt_rgb2pct.exe
     File Files\*.ico
     ;File Files\*.png
   SetOutPath "$INSTDIR\translations"
@@ -231,6 +234,7 @@ Section "StartMenue" StartMenue
     CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
     CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
     CreateShortCut "$SMPROGRAMS\$StartMenuFolder\QMapShack.lnk" "$INSTDIR\qmapshack.exe" "" "$INSTDIR\QMapShack.ico"
+    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\QMapTool.lnk" "$INSTDIR\qmaptool.exe" "" "$INSTDIR\QMapTool.ico"
     CreateShortCut "$SMPROGRAMS\$StartMenuFolder\qmapshack.org.lnk" "https://bitbucket.org/maproom/qmapshack/wiki/Home" "" "$INSTDIR\kfm_home.ico"
     CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Help.lnk" "https://bitbucket.org/maproom/qmapshack/wiki/DocMain" "" "$INSTDIR\Help.ico"
     CreateShortCut "$SMPROGRAMS\$StartMenuFolder\gdal.org.lnk" "http://www.gdal.org/" "" "$INSTDIR\gdalicon.ico"
@@ -270,6 +274,7 @@ Section "Uninstall"
 
   Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk"
   Delete "$SMPROGRAMS\$StartMenuFolder\QMapShack.lnk"
+  Delete "$SMPROGRAMS\$StartMenuFolder\QMapTool.lnk"
   Delete "$SMPROGRAMS\$StartMenuFolder\qmapshack.org.lnk"
   Delete "$SMPROGRAMS\$StartMenuFolder\Help.lnk"
   Delete "$SMPROGRAMS\$StartMenuFolder\gdal.org.lnk"