Merge branch 'master' of github.com:melowntech/vts-mapproxy

melowntech · Jul 17, 2020 · a2a03d0 · a2a03d0
2 parents af389f1 + 134a5a3
commit a2a03d0
Show file tree

Hide file tree

Showing 19 changed files with 27 additions and 22 deletions.
diff --git a/externals/buildsys/cmake b/externals/buildsys/cmake
diff --git a/externals/buildsys/common b/externals/buildsys/common
diff --git a/externals/gdal-drivers b/externals/gdal-drivers
diff --git a/externals/libdbglog b/externals/libdbglog
diff --git a/externals/libgeo b/externals/libgeo
diff --git a/externals/libgeometry b/externals/libgeometry
diff --git a/externals/libhttp b/externals/libhttp
diff --git a/externals/libimgproc b/externals/libimgproc
diff --git a/externals/libmath b/externals/libmath
diff --git a/externals/libminiball b/externals/libminiball
diff --git a/externals/libpysupport b/externals/libpysupport
diff --git a/externals/libsemantic b/externals/libsemantic
diff --git a/externals/libservice b/externals/libservice
diff --git a/externals/libutility b/externals/libutility
diff --git a/externals/vts-libs b/externals/vts-libs
diff --git a/mapproxy/CMakeLists.txt b/mapproxy/CMakeLists.txt
@@ -1,5 +1,5 @@
 # bootstrap build system
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required(VERSION 3.3)
 enable_language(Fortran)
 project(vts-mapproxy)
 # by default, this is OSS build (can be overrided by customer machinery)
@@ -58,7 +58,7 @@ include_directories(${EIGEN3_INCLUDE_DIR})
 find_package(ICU COMPONENTS uc i18n REQUIRED)
 include_directories(${ICU_INCLUDE_DIRS})
 
-enable_python(2.7)
+enable_python(3)
 include_directories(${PYTHONLIBS_INCLUDE_DIRS})
 
 find_package(TinyXML2 REQUIRED)

diff --git a/mapproxy/src/generatevrtwo/generatevrtwo.cpp b/mapproxy/src/generatevrtwo/generatevrtwo.cpp
@@ -396,7 +396,11 @@ void VrtDs::addSimpleSource(int band, const fs::path &filename
 
     // try to create simple source from parsed string
     std::unique_ptr< ::VRTSimpleSource> src(new ::VRTSimpleSource());
-#if GDAL_VERSION_NUM >= 2040000
+#if GDAL_VERSION_NUM >= 3000000
+    std::map<CPLString, GDALDataset*> dsMap;
+    if (src->XMLInit(xmlNodeFromString(os.str()).get(), nullptr, nullptr
+                     , dsMap) != CE_None)
+#elif GDAL_VERSION_NUM >= 2040000
     if (src->XMLInit(xmlNodeFromString(os.str()).get(), nullptr, nullptr)
         != CE_None)
 #else
@@ -665,9 +669,9 @@ bool compare(const geo::GeoDataset::Block &block, const math::Size2 &size
         return compareValue<std::int16_t>(block.data, size, value);
 
     case ::GDT_UInt32:
-        return compareValue<std::uint32_t>(block.data, size, value);
-
     case ::GDT_Int32:
+        // use signed comparison for unsigned int since OpenCV 4 has no
+        // specialization for unsigned int
         return compareValue<std::int32_t>(block.data, size, value);
 
     case ::GDT_Float32:

diff --git a/mapproxy/src/mapproxy/generator/tms-raster-patchwork.cpp b/mapproxy/src/mapproxy/generator/tms-raster-patchwork.cpp
@@ -37,6 +37,7 @@
 
 #include "imgproc/rastermask/cvmat.hpp"
 #include "imgproc/png.hpp"
+#include "imgproc/cvcompat.hpp"
 
 #include "jsoncpp/json.hpp"
 #include "jsoncpp/as.hpp"
@@ -136,7 +137,7 @@ cv::Mat TmsRasterPatchwork::generateTileImage(const vts::TileId &tileId) const
         }());
 
         const auto label(boost::lexical_cast<std::string>(tileId));
-        const auto face(CV_FONT_HERSHEY_COMPLEX_SMALL);
+        const auto face(IMGPROC_FONT_HERSHEY(COMPLEX_SMALL));
         const int thickness(1);
         int baseline;
         const auto size(cv::getTextSize(label, face, 1.0

diff --git a/mapproxy/src/mapproxy/support/mmapped/qtree-rasterize.hpp b/mapproxy/src/mapproxy/support/mmapped/qtree-rasterize.hpp
@@ -27,7 +27,7 @@
 #ifndef mapproxy_support_qtree_rasterize_hpp_included_
 #define mapproxy_support_qtree_rasterize_hpp_included_
 
-#include <boost/gil/gil_all.hpp>
+#include "imgproc/gil.hpp"
 
 #include "dbglog/dbglog.hpp"
+3 −0		Modules.Win32/FindProj.cmake
+5 −2		Modules/FindProj.cmake
+1 −1		README.md
+24 −4		buildsys.cmake
+4 −4		cmake.mk
+7 −0		macros/buildsys.emscripten.cmake
+7 −0		macros/buildsys.ios.cmake
+2 −2		macros/buildsys.windowsstore.cmake
+20 −1		macros/cuda.cmake
+86 −11		macros/module.cmake
+1 −1		macros/openmp.cmake
+11 −0		macros/python.cmake
+25 −16		deb-prepare.sh
+22 −5		deb.mk
+5 −1		include/debian.mk
+26 −14		gdal-drivers/CMakeLists.txt
+972 −0		gdal-drivers/blender.cpp
+139 −0		gdal-drivers/blender.hpp
+50 −0		gdal-drivers/detail/extents.hpp
+61 −0		gdal-drivers/detail/geotransform.hpp
+2 −0		gdal-drivers/detail/mbtiles.cpp
+2 −1		gdal-drivers/detail/mbtiles.hpp
+1 −1		gdal-drivers/detail/mbtiles.nosqlite.cpp
+1 −1		gdal-drivers/mask.cpp
+17 −37		gdal-drivers/mvt.cpp
+19 −0		gdal-drivers/python/CMakeLists.txt
+343 −0		gdal-drivers/python/gdaldriversmodule.cpp
+38 −0		gdal-drivers/python/gdaldriversmodule.hpp
+9 −1		gdal-drivers/register.cpp
+0 −2		gdal-drivers/register.hpp
+8 −33		gdal-drivers/solid.cpp
+5 −5		gdal-drivers/solid.hpp
+1 −1		dbglog/CMakeLists.txt
+2 −1		dbglog/config.hpp
+14 −3		dbglog/dbglog.cpp
+9 −5		dbglog/dbglog.hpp
+8 −2		dbglog/detail/log_helpers.hpp
+2 −1		dbglog/detail/logger.hpp
+3 −2		dbglog/mask.cpp
+2 −1		dbglog/sink.hpp
+2 −2		dbglog/test/dbglog.cpp
+31 −15		geo/CMakeLists.txt
+31 −0		geo/coordinates.hpp
+9 −1		geo/csconvertor.cpp
+9 −1		geo/csconvertor.hpp
+24 −15		geo/csconvertorWithoutGdal.cpp
+45 −0		geo/cv.hpp
+14 −3		geo/detail/ovrdataset.new.cpp
+32 −0		geo/detail/projapi.hpp
+93 −0		geo/detail/project.6.cpp
+2 −2		geo/detail/project.pre6.cpp
+58 −27		geo/geodataset.cpp
+26 −3		geo/geodataset.hpp
+38 −0		geo/geotransform.cpp
+17 −0		geo/geotransform.hpp
+1 −0		geo/project.hpp
+1 −0		geo/python/CMakeLists.txt
+29 −1		geo/python/geomodule.cpp
+67 −7		geo/srsfactors.cpp
+9 −0		geo/tools/CMakeLists.txt
+130 −0		geo/tools/geoinfo.cpp
+30 −17		geometry/CMakeLists.txt
+446 −0		geometry/bvh.hpp
+0 −23		geometry/compat/boost/polygon/LICENSE_1_0.txt
+0 −3		geometry/compat/boost/polygon/README
+0 −642		geometry/compat/boost/polygon/detail/voronoi_ctypes.hpp
+0 −1,532		geometry/compat/boost/polygon/detail/voronoi_predicates.hpp
+0 −506		geometry/compat/boost/polygon/detail/voronoi_robust_fpt.hpp
+0 −450		geometry/compat/boost/polygon/detail/voronoi_structures.hpp
+0 −935		geometry/compat/boost/polygon/interval_concept.hpp
+0 −118		geometry/compat/boost/polygon/interval_data.hpp
+0 −47		geometry/compat/boost/polygon/interval_traits.hpp
+0 −562		geometry/compat/boost/polygon/isotropy.hpp
+0 −469		geometry/compat/boost/polygon/point_concept.hpp
+0 −130		geometry/compat/boost/polygon/point_data.hpp
+0 −48		geometry/compat/boost/polygon/point_traits.hpp
+0 −1,078		geometry/compat/boost/polygon/rectangle_concept.hpp
+0 −63		geometry/compat/boost/polygon/rectangle_data.hpp
+0 −37		geometry/compat/boost/polygon/rectangle_traits.hpp
+0 −696		geometry/compat/boost/polygon/segment_concept.hpp
+0 −121		geometry/compat/boost/polygon/segment_data.hpp
+0 −50		geometry/compat/boost/polygon/segment_traits.hpp
+0 −157		geometry/compat/boost/polygon/voronoi.hpp
+0 −517		geometry/compat/boost/polygon/voronoi_builder.hpp
+0 −620		geometry/compat/boost/polygon/voronoi_diagram.hpp
+0 −46		geometry/compat/boost/polygon/voronoi_geometry_type.hpp
+208 −0		geometry/estimate-point-normals.cpp
+192 −0		geometry/estimate-point-normals.hpp
+13 −8		geometry/kdtree.hpp
+3 −3		geometry/mesh-voxelizer.cpp
+3 −3		geometry/mesh-voxelizer.hpp
+6 −1		geometry/mesh.hpp
+64 −0		geometry/meshop-bio.cpp
+51 −28		geometry/meshop-gts.cpp
+80 −10		geometry/meshop-openmesh.cpp
+8 −8		geometry/meshop.cpp
+48 −11		geometry/meshop.hpp
+2 −2		geometry/polygon.hpp
+2 −2		geometry/python/geometrymodule.cpp
+1 −1		geometry/volume.hpp
+136 −82		http/detail/client.cpp
+46 −24		http/detail/curl.hpp
+1 −1		http/detail/dnscache.hpp
+9 −8		http/test/clienttest/CMakeLists.txt
+101 −35		http/test/clienttest/main.cpp
+15 −8		imgproc/CMakeLists.txt
+12 −13		imgproc/binterpolate.hpp
+4 −3		imgproc/clahe.cpp
+1 −1		imgproc/color.hpp
+1 −2		imgproc/const-raster.hpp
+68 −0		imgproc/cvcompat.hpp
+1 −1		imgproc/detail/clahe.hpp
+1 −1		imgproc/exif.hpp
+1 −2		imgproc/filtering.hpp
+1 −1		imgproc/gif.cpp
+38 −0		imgproc/gil.hpp
+1 −1		imgproc/histogram.hpp
+7 −7		imgproc/imagesize.cpp
+1 −0		imgproc/imgproc_all.hpp
+112 −0		imgproc/imgwarp.cpp
+59 −0		imgproc/imgwarp.hpp
+0 −100		imgproc/inpaint.cpp
+59 −5		imgproc/inpaint.hpp
+37 −0		imgproc/jpeg_io.hpp
+1 −1		imgproc/png.hpp
+6 −1		imgproc/png_io.hpp
+20 −3		imgproc/python/CMakeLists.txt
+58 −0		imgproc/python/detail/numpy.cpp
+36 −0		imgproc/python/detail/numpy.hpp
+4 −0		imgproc/python/imgprocmodule.cpp
+136 −0		imgproc/python/numpy.cpp
+29 −0		imgproc/python/numpy.dummy.cpp
+45 −0		imgproc/python/numpy.hpp
+29 −16		imgproc/python/zbuffer.cpp
+2 −2		imgproc/rastermask/cvmat.cpp
+6 −5		imgproc/rastermask/inline/quadtree.hpp
+13 −8		imgproc/rastermask/quadtree.cpp
+5 −3		imgproc/rastermask/quadtree.hpp
+13 −12		imgproc/readimage.cpp
+4 −2		imgproc/scanconversion.cpp
+0 −123		imgproc/scattered-interpolation.cpp
+164 −7		imgproc/scattered-interpolation.hpp
+3 −1		imgproc/spectral_analysis.cpp
+1 −1		imgproc/tiff.cpp
+37 −0		imgproc/tiff_io.hpp
+13 −0		imgproc/tools/CMakeLists.txt
+51 −0		imgproc/tools/convert.cpp
+3 −3		imgproc/transformation.hpp
+2 −2		imgproc/uvpack.cpp
+1 −0		.gitignore
+2 −1		math/CMakeLists.txt
+33 −0		math/boost_gil_all.hpp
+15 −1		math/extent.hpp
+1 −0		math/filters.hpp
+23 −3		math/geometry.hpp
+154 −20		math/geometry_core.hpp
+39 −2		math/math.hpp
+13 −9		math/python/mathmodule.cpp
+1 −1		math/signal.hpp
+6 −0		math/transform.hpp
+10 −4		pysupport/CMakeLists.txt
+7 −12		pysupport/argv.cpp
+212 −0		pysupport/array.hpp
+67 −0		pysupport/debugger-po.hpp
+77 −0		pysupport/debugger.cpp
+104 −0		pysupport/debugger.hpp
+1 −1		pysupport/dump.hpp
+11 −5		pysupport/formatexception.cpp
+1 −1		pysupport/formatexception.hpp
+17 −8		pysupport/import.cpp
+3 −1		pysupport/import.hpp
+7 −2		pysupport/import.py
+85 −0		pysupport/initialize.cpp
+39 −0		pysupport/initialize.hpp
+2 −2		pysupport/iostreams.cpp
+13 −5		pysupport/load.cpp
+23 −3		pysupport/load.py
+21 −3		pysupport/package.cpp
+104 −0		pysupport/profiler-po.hpp
+173 −0		pysupport/profiler.cpp
+136 −0		pysupport/profiler.hpp
+1 −1		pysupport/repr.cpp
+31 −18		pysupport/systemexit.cpp
+69 −0		pysupport/variant.hpp
+60 −0		pysupport/vector.hpp