> On July 28, 2015, 7:01 a.m., Dennis Nienhüser wrote: > > Can you upload a patch such that 124154 and this one can be applied after > > another? Or a combined one that applies against master directly? Currently > > it's a mixture of both which fails to compile in either combination.
You can run 'git diff origin/master' to produce a combined patch quickly. - Dennis ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/124498/#review83069 ----------------------------------------------------------- On July 28, 2015, 1:54 p.m., Dávid Kolozsvári wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/124498/ > ----------------------------------------------------------- > > (Updated July 28, 2015, 1:54 p.m.) > > > Review request for Marble. > > > Repository: marble > > > Description > ------- > > With this patch, the street labels are renedered properly in OSM Vector > Tiles. For each type of OSM way, a custom font style and color can be > defined. They even follow the curvatures of the streets without any major > performance impact. > As for the font styles, I welcome any suggestions in the commemnts. > > > Diffs > ----- > > src/lib/marble/ClipPainter.h 42b73c0 > src/lib/marble/ClipPainter.cpp 473436e > src/lib/marble/GeoPainter.h 7a757b9 > src/lib/marble/GeoPainter.cpp d04138c > src/lib/marble/geodata/data/GeoDataFeature.h ea23cd8 > src/lib/marble/geodata/data/GeoDataFeature.cpp 6f330fb > src/lib/marble/geodata/data/GeoDataFeature_p.h 496c356 > src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.cpp 4320c07 > src/lib/marble/layers/GeometryLayer.cpp 9eb3f50 > > Diff: https://git.reviewboard.kde.org/r/124498/diff/ > > > Testing > ------- > > I was worried about the performance impact, because my initial idea was too > slow, but after several changes, this version works pretty good. > > > Thanks, > > Dávid Kolozsvári > >
_______________________________________________ Marble-devel mailing list [email protected] https://mail.kde.org/mailman/listinfo/marble-devel
