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

ignore font cache in map assignment and comparison

Browse source
This commit is contained in:
Dane Springmeyer 2014-09-28 23:31:48 -07:00
parent 7b97e3ace8
commit 5f0b5ddafd
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/map.cpp
View file

@ -164,7 +164,8 @@ void swap (Map & lhs, Map & rhs)
std::swap(lhs.extra_params_, rhs.extra_params_); std::swap(lhs.extra_params_, rhs.extra_params_);
std::swap(lhs.font_directory_,rhs.font_directory_); std::swap(lhs.font_directory_,rhs.font_directory_);
std::swap(lhs.font_file_mapping_,rhs.font_file_mapping_); std::swap(lhs.font_file_mapping_,rhs.font_file_mapping_);
std::swap(lhs.font_memory_cache_,rhs.font_memory_cache_); // on assignment discard memory cache
//std::swap(lhs.font_memory_cache_,rhs.font_memory_cache_);
} }
bool Map::operator==(Map const& rhs) const bool Map::operator==(Map const& rhs) const
@ -186,8 +187,8 @@ bool Map::operator==(Map const& rhs) const
(base_path_ == rhs.base_path_) && (base_path_ == rhs.base_path_) &&
(extra_params_ == rhs.extra_params_) && (extra_params_ == rhs.extra_params_) &&
(font_directory_ == rhs.font_directory_) && (font_directory_ == rhs.font_directory_) &&
(font_file_mapping_ == rhs.font_file_mapping_) && (font_file_mapping_ == rhs.font_file_mapping_);
(font_memory_cache_ == rhs.font_memory_cache_); // Note: we don't care about font_memory_cache in comparison
} }
std::map<std::string,feature_type_style> const& Map::styles() const std::map<std::string,feature_type_style> const& Map::styles() const