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

Merge branch 'master' into geometry_cleanup

Browse source
This commit is contained in:
Artem Pavlenko 2011-12-12 10:17:25 +00:00
commit 9d31e0a37c
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/map.cpp
View file

@ -87,6 +87,7 @@ Map::Map(const Map& rhs)
background_image_(rhs.background_image_), background_image_(rhs.background_image_),
styles_(rhs.styles_), styles_(rhs.styles_),
metawriters_(rhs.metawriters_), metawriters_(rhs.metawriters_),
fontsets_(rhs.fontsets_),
layers_(rhs.layers_), layers_(rhs.layers_),
aspectFixMode_(rhs.aspectFixMode_), aspectFixMode_(rhs.aspectFixMode_),
current_extent_(rhs.current_extent_), current_extent_(rhs.current_extent_),
@ -106,6 +107,7 @@ Map& Map::operator=(const Map& rhs)
background_image_=rhs.background_image_; background_image_=rhs.background_image_;
styles_=rhs.styles_; styles_=rhs.styles_;
metawriters_ = rhs.metawriters_; metawriters_ = rhs.metawriters_;
fontsets_ = rhs.fontsets_;
layers_=rhs.layers_; layers_=rhs.layers_;
aspectFixMode_=rhs.aspectFixMode_; aspectFixMode_=rhs.aspectFixMode_;
maximum_extent_=rhs.maximum_extent_; maximum_extent_=rhs.maximum_extent_;