summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2016-06-26 11:18:50 +0800
committerTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2016-11-16 11:10:27 +0100
commit7112460e35dad6953d8cd152242a116732280a5f (patch)
tree6f542e9feb3438b1b958fb1acdb77819795053ad
parent05b751d5af4a65b5ec7ef23e9a0d6802d5445826 (diff)
Use the libpng based PngReader for reading "Image" resources
This adds support for reading "Image" resources (maily icons for menus, toolbars,..). Change-Id: I50200b70bb2d73dd23524138ab7c853d4884d18c
-rw-r--r--vcl/source/image/ImplImageTree.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx
index bd36080633e2..a62da57fff32 100644
--- a/vcl/source/image/ImplImageTree.cxx
+++ b/vcl/source/image/ImplImageTree.cxx
@@ -45,6 +45,8 @@
#include <vcl/svapp.hxx>
#include <vcldemo-debug.hxx>
+#include <vcl/filter/PngReader.hxx>
+
#include <vcl/BitmapProcessor.hxx>
#include <vcl/BitmapTools.hxx>
#include <vcl/pngwrite.hxx>
@@ -146,9 +148,8 @@ void loadImageFromStream(std::shared_ptr<SvStream> const & xStream, OUString con
if (rPath.endsWith(".png"))
{
- vcl::PNGReader aPNGReader(*xStream);
- aPNGReader.SetIgnoreGammaChunk( true );
- rBitmap = aPNGReader.Read();
+ vcl::PngReader aPNGReader(*xStream);
+ aPNGReader.Read(rBitmap);
}
else if (rPath.endsWith(".svg"))
{