This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository mapnik.
commit 5414209cb0eca555f9d8565f4842227e14a3c5ac Author: Bas Couwenberg <[email protected]> Date: Wed Dec 13 18:39:30 2017 +0100 New upstream version 3.0.18~rc1+ds --- CHANGELOG.md | 9 +++ include/mapnik/version.hpp | 2 +- src/svg/svg_parser.cpp | 149 ++++++++++++++++++++++----------------------- 3 files changed, 84 insertions(+), 76 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0be79b..ab23537 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,15 @@ Developers: Please commit along with changes. For a complete change history, see the git log. +## 3.0.18 + +Released: xxxxxx XX, 201X + +(Packaged from xxxxxxxxx) + + - SVG parser - fixed logic for calculating dimensions when `width` and `height` expressed in + percentage units (#3812) + ## 3.0.17 Released: November 29, 2017 diff --git a/include/mapnik/version.hpp b/include/mapnik/version.hpp index 244c05d..97fc912 100644 --- a/include/mapnik/version.hpp +++ b/include/mapnik/version.hpp @@ -27,7 +27,7 @@ #define MAPNIK_MAJOR_VERSION 3 #define MAPNIK_MINOR_VERSION 0 -#define MAPNIK_PATCH_VERSION 17 +#define MAPNIK_PATCH_VERSION 18 #define MAPNIK_VERSION (MAPNIK_MAJOR_VERSION*100000) + (MAPNIK_MINOR_VERSION*100) + (MAPNIK_PATCH_VERSION) diff --git a/src/svg/svg_parser.cpp b/src/svg/svg_parser.cpp index 4dd3fbc..3b29d96 100644 --- a/src/svg/svg_parser.cpp +++ b/src/svg/svg_parser.cpp @@ -745,7 +745,6 @@ void parse_dimensions(svg_parser & parser, rapidxml::xml_node<char> const* node) double height = 0; double aspect_ratio = 1; viewbox vbox = {0, 0, 0, 0}; - bool has_viewbox = false; bool has_percent_height = true; bool has_percent_width = true; @@ -761,88 +760,88 @@ void parse_dimensions(svg_parser & parser, rapidxml::xml_node<char> const* node) } auto const* viewbox_attr = node->first_attribute("viewBox"); - if (viewbox_attr) + if (viewbox_attr && parse_viewbox(parser.err_handler(), viewbox_attr->value(), vbox)) { - has_viewbox = parse_viewbox(parser.err_handler(), viewbox_attr->value(), vbox); - if (width > 0 && height > 0 && vbox.width > 0 && vbox.height > 0) + if (!has_percent_width && !has_percent_height) { - agg::trans_affine t{}; - std::pair<unsigned,bool> preserve_aspect_ratio {xMidYMid, true}; - auto const* aspect_ratio_attr = node->first_attribute("preserveAspectRatio"); - if (aspect_ratio_attr) + if (width > 0 && height > 0 && vbox.width > 0 && vbox.height > 0) { - preserve_aspect_ratio = parse_preserve_aspect_ratio(parser.err_handler(), aspect_ratio_attr->value()); - } + agg::trans_affine t{}; + std::pair<unsigned,bool> preserve_aspect_ratio {xMidYMid, true}; + auto const* aspect_ratio_attr = node->first_attribute("preserveAspectRatio"); + if (aspect_ratio_attr) + { + preserve_aspect_ratio = parse_preserve_aspect_ratio(parser.err_handler(), aspect_ratio_attr->value()); + } - double sx = width / vbox.width; - double sy = height / vbox.height; - double scale = preserve_aspect_ratio.second ? std::min(sx, sy) : std::max(sx, sy); - switch (preserve_aspect_ratio.first) - { - case none: - t = agg::trans_affine_scaling(sx, sy) * t; - break; - case xMinYMin: - t = agg::trans_affine_scaling(scale, scale) * t; - break; - case xMinYMid: - t = agg::trans_affine_scaling(scale, scale) * t; - t = agg::trans_affine_translation(0, -0.5 * (vbox.height - height / scale)) * t; - break; - case xMinYMax: - t = agg::trans_affine_scaling(scale, scale) * t; - t = agg::trans_affine_translation(0, -1.0 * (vbox.height - height / scale)) * t; - break; - case xMidYMin: - t = agg::trans_affine_scaling(scale, scale) * t; - t = agg::trans_affine_translation(-0.5 * (vbox.width - width / scale), 0.0) * t; - break; - case xMidYMid: // (the default) - t = agg::trans_affine_scaling(scale, scale) * t; - t = agg::trans_affine_translation(-0.5 * (vbox.width - width / scale), - -0.5 * (vbox.height - height / scale)) * t; - break; - case xMidYMax: - t = agg::trans_affine_scaling(scale, scale) * t; - t = agg::trans_affine_translation(-0.5 * (vbox.width - width / scale), - -1.0 * (vbox.height - height / scale)) * t; - break; - case xMaxYMin: - t = agg::trans_affine_scaling(scale, scale) * t; - t = agg::trans_affine_translation(-1.0 * (vbox.width - width / scale), 0.0) * t; - break; - case xMaxYMid: - t = agg::trans_affine_scaling(scale, scale) * t; - t = agg::trans_affine_translation(-1.0 * (vbox.width - width / scale), + double sx = width / vbox.width; + double sy = height / vbox.height; + double scale = preserve_aspect_ratio.second ? std::min(sx, sy) : std::max(sx, sy); + switch (preserve_aspect_ratio.first) + { + case none: + t = agg::trans_affine_scaling(sx, sy) * t; + break; + case xMinYMin: + t = agg::trans_affine_scaling(scale, scale) * t; + break; + case xMinYMid: + t = agg::trans_affine_scaling(scale, scale) * t; + t = agg::trans_affine_translation(0, -0.5 * (vbox.height - height / scale)) * t; + break; + case xMinYMax: + t = agg::trans_affine_scaling(scale, scale) * t; + t = agg::trans_affine_translation(0, -1.0 * (vbox.height - height / scale)) * t; + break; + case xMidYMin: + t = agg::trans_affine_scaling(scale, scale) * t; + t = agg::trans_affine_translation(-0.5 * (vbox.width - width / scale), 0.0) * t; + break; + case xMidYMid: // (the default) + t = agg::trans_affine_scaling(scale, scale) * t; + t = agg::trans_affine_translation(-0.5 * (vbox.width - width / scale), + -0.5 * (vbox.height - height / scale)) * t; + break; + case xMidYMax: + t = agg::trans_affine_scaling(scale, scale) * t; + t = agg::trans_affine_translation(-0.5 * (vbox.width - width / scale), + -1.0 * (vbox.height - height / scale)) * t; + break; + case xMaxYMin: + t = agg::trans_affine_scaling(scale, scale) * t; + t = agg::trans_affine_translation(-1.0 * (vbox.width - width / scale), 0.0) * t; + break; + case xMaxYMid: + t = agg::trans_affine_scaling(scale, scale) * t; + t = agg::trans_affine_translation(-1.0 * (vbox.width - width / scale), -0.5 * (vbox.height - height / scale)) * t; + break; + case xMaxYMax: + t = agg::trans_affine_scaling(scale, scale) * t; + t = agg::trans_affine_translation(-1.0 * (vbox.width - width / scale), + -1.0 * (vbox.height - height / scale)) * t; break; - case xMaxYMax: - t = agg::trans_affine_scaling(scale, scale) * t; - t = agg::trans_affine_translation(-1.0 * (vbox.width - width / scale), - -1.0 * (vbox.height - height / scale)) * t; - break; - }; + }; - t = agg::trans_affine_translation(-vbox.x0, -vbox.y0) * t; - parser.viewbox_tr_ = t; + t = agg::trans_affine_translation(-vbox.x0, -vbox.y0) * t; + parser.viewbox_tr_ = t; + } + } + if (has_percent_width && !has_percent_height) + { + aspect_ratio = vbox.width / vbox.height; + width = aspect_ratio * height; + } + else if (!has_percent_width && has_percent_height) + { + aspect_ratio = vbox.width/vbox.height; + height = height / aspect_ratio; + } + else if (has_percent_width && has_percent_height) + { + width = vbox.width; + height = vbox.height; } - - - } - if (has_percent_width && !has_percent_height && has_viewbox) - { - aspect_ratio = vbox.width / vbox.height; - width = aspect_ratio * height; - } - else if (!has_percent_width && has_percent_height && has_viewbox) - { - aspect_ratio = vbox.width/vbox.height; - height = height / aspect_ratio; - } - else if (has_percent_width && has_percent_height && has_viewbox) - { - width = vbox.width; - height = vbox.height; } parser.path_.set_dimensions(width, height); } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
