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

List:       kde-commits
Subject:    [marble] src/lib/marble/geodata/handlers/kml: Handle invalid shape attribute values gracefully.
From:       Dennis_Nienhüser <earthwings () gentoo ! org>
Date:       2014-01-18 15:00:35
Message-ID: E1W4XNz-0003zl-2O () scm ! kde ! org
[Download RAW message or body]

Git commit 5ab29b8a37c2a83b8c814121bfd7b600b3a52d93 by Dennis Nienhüser.
Committed on 18/01/2014 at 14:59.
Pushed by nienhueser into branch 'master'.

Handle invalid shape attribute values gracefully.

M  +3    -0    src/lib/marble/geodata/handlers/kml/KmlShapeTagHandler.cpp

http://commits.kde.org/marble/5ab29b8a37c2a83b8c814121bfd7b600b3a52d93

diff --git a/src/lib/marble/geodata/handlers/kml/KmlShapeTagHandler.cpp \
b/src/lib/marble/geodata/handlers/kml/KmlShapeTagHandler.cpp index c5627e3..1578180 \
                100644
--- a/src/lib/marble/geodata/handlers/kml/KmlShapeTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlShapeTagHandler.cpp
@@ -39,6 +39,9 @@ GeoNode* KmlshapeTagHandler::parse( GeoParser& parser ) const
             shape = GeoDataPhotoOverlay::Cylinder;
         } else if ( shapeText == "sphere" ) {
             shape = GeoDataPhotoOverlay::Sphere;
+        } else {
+            mDebug() << "Unknown shape attribute" << shapeText << ", falling back to \
default value 'rectangle'"; +            shape = GeoDataPhotoOverlay::Rectangle;
         }
 
         parentItem.nodeAs<GeoDataPhotoOverlay>()->setShape( shape );


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