[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [marble] src/lib/marble: Cache the viewLatLonAltBox outside the loop
From:       Dennis_Nienhüser <nienhueser () kde ! org>
Date:       2015-10-31 18:58:47
Message-ID: E1ZsbMV-0006my-B8 () scm ! kde ! org
[Download RAW message or body]

Git commit 51745620a8bbba339867061d8da02993b76a8d70 by Dennis Nienhüser.
Committed on 31/10/2015 at 18:30.
Pushed by nienhueser into branch 'master'.

Cache the viewLatLonAltBox outside the loop

M  +2    -1    src/lib/marble/PlacemarkLayout.cpp

http://commits.kde.org/marble/51745620a8bbba339867061d8da02993b76a8d70

diff --git a/src/lib/marble/PlacemarkLayout.cpp b/src/lib/marble/PlacemarkLayout.cpp
index 4930166..2f3c4e5 100644
--- a/src/lib/marble/PlacemarkLayout.cpp
+++ b/src/lib/marble/PlacemarkLayout.cpp
@@ -465,6 +465,7 @@ QVector<VisiblePlacemark *> PlacemarkLayout::generateLayout( const ViewportParam
     }
     qSort(placemarkList.begin(), placemarkList.end(), GeoDataPlacemark::placemarkLayoutOrderCompare);
 
+    auto const viewLatLonAltBox = viewport->viewLatLonAltBox();
     foreach ( const GeoDataPlacemark *placemark, placemarkList ) {
         const GeoDataCoordinates coordinates = placemarkIconCoordinates( placemark );
         if ( !coordinates.isValid() ) {
@@ -479,7 +480,7 @@ QVector<VisiblePlacemark *> PlacemarkLayout::generateLayout( const ViewportParam
         qreal x = 0;
         qreal y = 0;
 
-        if ( !viewport->viewLatLonAltBox().contains( coordinates ) ||
+        if ( !viewLatLonAltBox.contains( coordinates ) ||
              ! viewport->screenCoordinates( coordinates, x, y )) {
                 delete m_visiblePlacemarks.take( placemark );
                 continue;

[prev in list] [next in list] [prev in thread] [next in thread]