summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2021-04-10 19:09:41 +0200
committerXisco Fauli <xiscofauli@libreoffice.org>2021-04-12 14:04:37 +0200
commit923db64220c69e819a58e0c256ac83bd3df1946a (patch)
tree6cb1ee3f55e8ed11445d745c16c88b3892b181ae
parentcec82db4e6fbc0fd7ea1fa032461baaf327b0b16 (diff)
Related tdf#117750: fix "Solarization" and "Aging"
For solarization, regression from: https://cgit.freedesktop.org/libreoffice/core/commit/?id=c38485279cd36da96ac81107d567ea4e779b2b96 author Chris Sherlock <chris.sherlock79@gmail.com> 2018-04-20 20:27:41 +1000 committer Tomaž Vajngerl <quikee@gmail.com> 2018-04-22 05:33:11 +0200 commit c38485279cd36da96ac81107d567ea4e779b2b96 (patch) tree ad9843a17f87271f9e0cf89643e2e6c3ee8a8de1 parent bcbf767bcfc024e2be839e0c0886f942dd068e4f (diff) vcl: ImplSolarize() to BitmapSolarizeFilter For aging, regression from: https://cgit.freedesktop.org/libreoffice/core/commit/?id=1ab12471f3a69c4d502e6271e84ddf8a981f507f author Chris Sherlock <chris.sherlock79@gmail.com> 2018-04-20 20:32:23 +1000 committer Tomaž Vajngerl <quikee@gmail.com> 2018-04-22 05:33:39 +0200 commit 1ab12471f3a69c4d502e6271e84ddf8a981f507f (patch) tree 6652276229ad1c3ffca48f7a31e1b77d2ea04b07 parent c38485279cd36da96ac81107d567ea4e779b2b96 (diff) vcl: ImplSepia -> BitmapSepiaFilter Change-Id: I4f350aa8b494caf55c9c810ac7fa9ed8db349725 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113926 (cherry picked from commit f3151e62bcc7cb66313df70a2ec8eed8ca8f2c88) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113858 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit d41693f2eb48fce3d808f1719bbd60f2d2041203) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113868 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
-rw-r--r--vcl/source/bitmap/BitmapSepiaFilter.cxx2
-rw-r--r--vcl/source/bitmap/BitmapSolarizeFilter.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/bitmap/BitmapSepiaFilter.cxx b/vcl/source/bitmap/BitmapSepiaFilter.cxx
index 5123bf13075c..5d5408e246bd 100644
--- a/vcl/source/bitmap/BitmapSepiaFilter.cxx
+++ b/vcl/source/bitmap/BitmapSepiaFilter.cxx
@@ -103,7 +103,7 @@ BitmapEx BitmapSepiaFilter::execute(BitmapEx const& rBitmapEx) const
}
if (bRet)
- return rBitmapEx;
+ return BitmapEx(aBitmap);
return BitmapEx();
}
diff --git a/vcl/source/bitmap/BitmapSolarizeFilter.cxx b/vcl/source/bitmap/BitmapSolarizeFilter.cxx
index bd7518b4cabf..5850fb8ad931 100644
--- a/vcl/source/bitmap/BitmapSolarizeFilter.cxx
+++ b/vcl/source/bitmap/BitmapSolarizeFilter.cxx
@@ -63,7 +63,7 @@ BitmapEx BitmapSolarizeFilter::execute(BitmapEx const& rBitmapEx) const
}
if (bRet)
- return rBitmapEx;
+ return BitmapEx(aBitmap);
return BitmapEx();
}