sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4219 from mathisloge/proj_transform_fix

Browse source 
fixes proj_transform_cache incomplete type
This commit is contained in:
Artem Pavlenko 2021-04-01 17:16:48 +01:00 committed by GitHub
commit bb18a5ba0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mapnik/map.hpp
View file

@ -103,7 +103,7 @@ private:
boost::optional<std::string> font_directory_;
freetype_engine::font_file_mapping_type font_file_mapping_;
freetype_engine::font_memory_cache_type font_memory_cache_;
std::unique_ptr<proj_transform_cache> proj_cache_ = {};
std::unique_ptr<proj_transform_cache> proj_cache_;
public:
using const_style_iterator = std::map<std::string,feature_type_style>::const_iterator;
using style_iterator = std::map<std::string,feature_type_style>::iterator;

9
src/map.cpp
View file

@ -76,7 +76,8 @@ Map::Map()
extra_params_(),
font_directory_(),
font_file_mapping_(),
font_memory_cache_() {}
font_memory_cache_(),
proj_cache_(std::make_unique<proj_transform_cache>()) {}
Map::Map(int width,int height, std::string const& srs)
: width_(width),
@ -90,7 +91,8 @@ Map::Map(int width,int height, std::string const& srs)
extra_params_(),
font_directory_(),
font_file_mapping_(),
font_memory_cache_() {}
font_memory_cache_(),
proj_cache_(std::make_unique<proj_transform_cache>()) {}
Map::Map(Map const& rhs)
: width_(rhs.width_),
@ -112,7 +114,8 @@ Map::Map(Map const& rhs)
font_directory_(rhs.font_directory_),
font_file_mapping_(rhs.font_file_mapping_),
// on copy discard memory caches
font_memory_cache_()
font_memory_cache_(),
proj_cache_(std::make_unique<proj_transform_cache>())
{
init_proj_transforms();
}