Skip to content
This repository has been archived by the owner on Aug 22, 2023. It is now read-only.

Commit

Permalink
compilable on gcc-10+OpenCv-4+Boost-1.71 (i.e. Ubuntu 20.04)
Browse files Browse the repository at this point in the history
  • Loading branch information
@vaclavblazek
vaclavblazek committed Jul 17, 2020
1 parent 73ccb5a commit 134a5a3
Show file tree
Hide file tree
Showing 19 changed files with 27 additions and 22 deletions.
2 changes: 1 addition & 1 deletion externals/buildsys/cmake
Submodule cmake updated 26 files
+5 −3 Modules.Win32/FindJsonCPP.cmake
+3 −0 Modules.Win32/FindProj.cmake
+0 −27 Modules/FindGTS.cmake
+27 −0 Modules/FindMGTS.cmake
+5 −2 Modules/FindProj.cmake
+1 −1 README.md
+65 −26 buildsys.cmake
+4 −4 cmake.mk
+7 −0 macros/buildsys.emscripten.cmake
+7 −0 macros/buildsys.ios.cmake
+2 −2 macros/buildsys.windowsstore.cmake
+49 −11 macros/cuda.cmake
+86 −11 macros/module.cmake
+1 −1 macros/openmp.cmake
+9 −0 macros/output-paths.cmake
+22 −0 macros/python.cmake
+4 −0 show-sources
+1 −4 tools/compile-pyc/compile-pyc.cmake
+13 −6 tools/file2cpp/file2cpp
+1 −1 tools/file2cpp/file2cpp.cmake
+87 −17 tools/pathstrip/pathstrip
+11 −8 tools/pathstrip/pathstrip.cmake
+0 −63 tools/pathstrip/pathstrip.py
+1 −4 tools/py-runnable/py-runnable.cmake
+3 −6 tools/py2cpp/py2cpp.cmake
+1 −4 tools/sqlite32cpp/sqlite32cpp.cmake
2 changes: 1 addition & 1 deletion externals/buildsys/common
Submodule common updated 3 files
+25 −16 deb-prepare.sh
+22 −5 deb.mk
+5 −1 include/debian.mk
2 changes: 1 addition & 1 deletion externals/gdal-drivers
Submodule gdal-drivers updated 17 files
+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
2 changes: 1 addition & 1 deletion externals/libdbglog
Submodule libdbglog updated 9 files
+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
2 changes: 1 addition & 1 deletion externals/libgeo
Submodule libgeo updated 20 files
+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
2 changes: 1 addition & 1 deletion externals/libgeometry
Submodule libgeometry updated 39 files
+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
2 changes: 1 addition & 1 deletion externals/libhttp
Submodule libhttp updated 5 files
+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
2 changes: 1 addition & 1 deletion externals/libimgproc
Submodule libimgproc updated 44 files
+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
2 changes: 1 addition & 1 deletion externals/libmath
Submodule libmath updated 11 files
+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
2 changes: 1 addition & 1 deletion externals/libminiball
Submodule libminiball updated 2 files
+1 −1 miniball/miniball.cpp
+1 −1 miniball/miniball.hpp
2 changes: 1 addition & 1 deletion externals/libpysupport
Submodule libpysupport updated 25 files
+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
2 changes: 1 addition & 1 deletion externals/libsemantic
Submodule libsemantic updated 9 files
+56 −0 semantic/io.cpp
+1 −0 semantic/io.hpp
+4 −0 semantic/mesh.hpp
+17 −3 semantic/mesh/roof/circular.cpp
+17 −4 semantic/mesh/roof/rectangular.cpp
+26 −9 semantic/python/semanticmodule.cpp
+28 −6 semantic/tools/semantic2obj.cpp
+1 −0 semantic/world.cpp
+22 −0 semantic/world.hpp
2 changes: 1 addition & 1 deletion externals/libservice
Submodule libservice updated 8 files
+1 −1 service/CMakeLists.txt
+81 −0 service/cmdline.cpp
+3 −0 service/cmdline.hpp
+4 −4 service/config.hpp
+1 −1 service/customer/program.none.cpp
+2 −2 service/customer/program.oss.cpp
+1 −1 service/customer/program.seznam.cz.cpp
+3 −3 service/program.cpp
2 changes: 1 addition & 1 deletion externals/libutility
Submodule libutility updated 43 files
+38 −6 utility/CMakeLists.txt
+19 −1 utility/archive-loading.hpp
+78 −0 utility/atexit.cpp
+60 −0 utility/atexit.hpp
+12 −1 utility/binaryio.hpp
+1 −1 utility/detail/limits.posix.cpp
+37 −0 utility/detail/limits.unsupported.cpp
+72 −0 utility/detail/memoryfile.linux.cpp
+40 −0 utility/detail/memoryfile.unsupported.cpp
+2 −1 utility/detail/path.windows.cpp
+10 −0 utility/detail/streams.hpp
+122 −0 utility/detail/unistd_compat.windows.cpp
+1 −1 utility/environment.hpp
+22 −0 utility/filesystem.cpp
+4 −0 utility/filesystem.hpp
+85 −0 utility/logging.hpp
+1 −1 utility/lrucache2.hpp
+43 −0 utility/memoryfile.hpp
+11 −0 utility/openmp.hpp
+68 −0 utility/po-alias.cpp
+42 −0 utility/po-alias.hpp
+1 −0 utility/po.hpp
+127 −42 utility/procstat.cpp
+27 −2 utility/procstat.hpp
+56 −0 utility/programbreak.hpp
+3 −0 utility/python/CMakeLists.txt
+32 −0 utility/python/importsupport.py
+38 −1 utility/python/utilitymodule.cpp
+9 −6 utility/resourcefetcher.hpp
+1 −1 utility/steady-clock.hpp
+7 −0 utility/stl-helpers.hpp
+1 −1 utility/substream.cpp
+15 −2 utility/tar.cpp
+4 −4 utility/tcpendpoint-io.cpp
+11 −0 utility/test-procstat/CMakeLists.txt
+94 −0 utility/test-procstat/main.cpp
+11 −0 utility/test-utility/CMakeLists.txt
+33 −0 utility/test-utility/main.cpp
+59 −0 utility/test/streams.cpp
+6 −6 utility/thread.cpp
+5 −5 utility/udpendpoint-io.cpp
+70 −0 utility/unistd_compat.hpp
+3 −2 utility/zip.cpp
2 changes: 1 addition & 1 deletion externals/vts-libs
Submodule vts-libs updated 41 files
+137 −131 vts-libs/CMakeLists.txt
+4 −0 vts-libs/registry/extensions.cpp
+1 −1 vts-libs/registry/io.cpp
+1 −1 vts-libs/storage/tilar.cpp
+1 −2 vts-libs/tools-support/progress.cpp
+10 −1 vts-libs/tools-support/tmptileset.cpp
+1 −2 vts-libs/vts/2d.hpp
+14 −1 vts-libs/vts/basetypes.cpp
+3 −0 vts-libs/vts/basetypes.hpp
+95 −0 vts-libs/vts/basetypes3.hpp
+5 −0 vts-libs/vts/config.cpp
+28 −0 vts-libs/vts/csconvertor.cpp
+11 −0 vts-libs/vts/csconvertor.hpp
+2 −1 vts-libs/vts/gil/colors.hpp
+21 −0 vts-libs/vts/io.hpp
+150 −65 vts-libs/vts/mesh.cpp
+183 −2 vts-libs/vts/mesh.hpp
+20 −12 vts-libs/vts/meshio.cpp
+11 −1 vts-libs/vts/meshio.hpp
+38 −2 vts-libs/vts/meshop.hpp
+12 −9 vts-libs/vts/meshop/merge.cpp
+39 −9 vts-libs/vts/meshop/refineandclip.cpp
+1 −1 vts-libs/vts/metatile.hpp
+2 −1 vts-libs/vts/opencv/atlas.cpp
+2 −1 vts-libs/vts/opencv/navtile.cpp
+2 −1 vts-libs/vts/qtree-rasterize.hpp
+5 −2 vts-libs/vts/storage/change.cpp
+9 −0 vts-libs/vts/storage/gluerules.cpp
+2 −1 vts-libs/vts/tileindex.hpp
+10 −0 vts-libs/vts/tileop.hpp
+123 −0 vts-libs/vts/tileop3.hpp
+1 −1 vts-libs/vts/tileset/merge.cpp
+31 −8 vts-libs/vts/tileset/merge/coverage.cpp
+3 −2 vts-libs/vts/tileset/merge/coverage.hpp
+2 −2 vts-libs/vts/tileset/tilesetindex.cpp
+1 −0 vts-libs/vts/tsmap.hpp
+5 −5 vts-libs/vts/urltemplate.cpp
+4 −2 vts-libs/vts0/merge.cpp
+1 −0 vts-libs/vts0/tileindex.hpp
+3 −1 vts-libs/vts0/tileset.cpp
+2 −1 vts-libs/vts0/tileset/heightmap.cpp
4 changes: 2 additions & 2 deletions mapproxy/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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)
Expand Down
10 changes: 7 additions & 3 deletions mapproxy/src/generatevrtwo/generatevrtwo.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion mapproxy/src/mapproxy/generator/tms-raster-patchwork.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mapproxy/src/mapproxy/support/mmapped/qtree-rasterize.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit 134a5a3

Please sign in to comment.