[Marble-bugs] [marble] [Bug 324572] .osm files can't be loaded in parallel

Bernhard Beschow bbeschow at cs.tu-berlin.de
Sun Aug 3 11:35:26 UTC 2014


https://bugs.kde.org/show_bug.cgi?id=324572

Bernhard Beschow <bbeschow at cs.tu-berlin.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         Resolution|---                         |FIXED
      Latest Commit|                            |http://commits.kde.org/marb
                   |                            |le/8ed8617f1243e58e5205f19e
                   |                            |828bb5d25e8680ae
             Status|UNCONFIRMED                 |RESOLVED

--- Comment #1 from Bernhard Beschow <bbeschow at cs.tu-berlin.de> ---
Git commit 8ed8617f1243e58e5205f19e828bb5d25e8680ae by Bernhard Beschow.
Committed on 02/08/2014 at 18:34.
Pushed by beschow into branch 'KDE/4.14'.

merge all-static classes into OsmParser, turning global into instance variables

* multiple parser instances won't step onto each other's toes (global
variables) any more, avoiding crashes

(cherry picked from commit 409ae1fc2c0e57506e4c73949d07c6ff32fe74b5)

M  +0    -4    src/plugins/runner/osm/CMakeLists.txt
M  +81   -9    src/plugins/runner/osm/OsmParser.cpp
M  +31   -0    src/plugins/runner/osm/OsmParser.h
M  +0    -1    src/plugins/runner/osm/handlers/OsmBoundTagHandler.cpp
M  +3    -2    src/plugins/runner/osm/handlers/OsmBoundsTagHandler.cpp
D  +0    -90   src/plugins/runner/osm/handlers/OsmGlobals.cpp
D  +0    -48   src/plugins/runner/osm/handlers/OsmGlobals.h
M  +11   -8    src/plugins/runner/osm/handlers/OsmMemberTagHandler.cpp
M  +8    -6    src/plugins/runner/osm/handlers/OsmNdTagHandler.cpp
D  +0    -44   src/plugins/runner/osm/handlers/OsmNodeFactory.cpp
D  +0    -48   src/plugins/runner/osm/handlers/OsmNodeFactory.h
M  +7    -5    src/plugins/runner/osm/handlers/OsmNodeTagHandler.cpp
M  +4    -3    src/plugins/runner/osm/handlers/OsmOsmTagHandler.cpp
D  +0    -44   src/plugins/runner/osm/handlers/OsmRelationFactory.cpp
D  +0    -51   src/plugins/runner/osm/handlers/OsmRelationFactory.h
M  +8    -6    src/plugins/runner/osm/handlers/OsmRelationTagHandler.cpp
M  +24   -29   src/plugins/runner/osm/handlers/OsmTagTagHandler.cpp
M  +0    -1    src/plugins/runner/osm/handlers/OsmTagTagHandler.h
D  +0    -46   src/plugins/runner/osm/handlers/OsmWayFactory.cpp
D  +0    -50   src/plugins/runner/osm/handlers/OsmWayFactory.h
M  +8    -5    src/plugins/runner/osm/handlers/OsmWayTagHandler.cpp

http://commits.kde.org/marble/8ed8617f1243e58e5205f19e828bb5d25e8680ae

-- 
You are receiving this mail because:
You are the assignee for the bug.


More information about the Marble-bugs mailing list