Since you've reverted this in master, you don't need to worry about any
of the other branches. They will get merged into master.
Richard
On 04/25/2016 03:00 PM, Stephan Witt wrote:
> commit 21e4e939be5e7f02ca1fc1c25b1fd15caf60ae6d
> Author: Stephan Witt <sw...@lyx.org>
> Date: Mon Apr 25 20:57:06 2016 +0200
>
> Revert part of c053a9394d1075ecad02ccce2f34c95f08c1f00f
> This change introduced a regression and is not needed anymore.
>
> (cherry picked from commit 1cbabdf8d51b26dd80677ddfeb64d13df91fefc0)
>
> diff --git a/src/graphics/GraphicsLoader.cpp b/src/graphics/GraphicsLoader.cpp
> index 498394e..23ebb62 100644
> --- a/src/graphics/GraphicsLoader.cpp
> +++ b/src/graphics/GraphicsLoader.cpp
> @@ -460,10 +460,6 @@ void Loader::Impl::createPixmap()
> if (idx != string::npos && idx > 3) {
> if (filename.substr(idx - 3, 3) == "@2x") {
> params_.pixel_ratio = 2.0;
> - } else if (cached_item_->filename().extension() ==
> "svgz") {
> - params_.pixel_ratio = 4.0;
> - } else if (cached_item_->filename().extension() ==
> "svg") {
> - params_.pixel_ratio = 4.0;
> }
> }
> }
