diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2014-05-26 18:40:47 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2014-05-26 18:40:47 +0200 |
commit | 1b58fb30a3205e68f03f021e8c4314cf59629683 (patch) | |
tree | a35f9765d36c5eccd71de22b3461ca51583e4de6 /src/style/style.cpp | |
parent | 65bffccfd91820cbf0518c841a33995999c68a57 (diff) | |
download | qtlocation-mapboxgl-1b58fb30a3205e68f03f021e8c4314cf59629683.tar.gz |
use unordered map, don't make copies (auto usage!) and swap maps
Diffstat (limited to 'src/style/style.cpp')
-rw-r--r-- | src/style/style.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/style/style.cpp b/src/style/style.cpp index 7f9b6ba782..38b8f17234 100644 --- a/src/style/style.cpp +++ b/src/style/style.cpp @@ -74,15 +74,15 @@ void Style::cascade(float z) { time start = util::now(); - previous.fills = computed.fills; - previous.lines = computed.lines; - previous.icons = computed.icons; - previous.texts = computed.texts; - previous.rasters = computed.rasters; - previous.composites = computed.composites; + previous.fills.swap(computed.fills); + previous.lines.swap(computed.lines); + previous.icons.swap(computed.icons); + previous.texts.swap(computed.texts); + previous.rasters.swap(computed.rasters); + previous.composites.swap(computed.composites); previous.background = computed.background; - previous.effective_classes = computed.effective_classes; + previous.effective_classes.swap(computed.effective_classes); reset(); |