[Libreoffice-commits] core.git: 2 commits - include/vcl vcl/Library_vcl.mk vcl/README.vars vcl/source
Tomaž Vajngerl
tomaz.vajngerl at collabora.com
Sun Nov 8 14:05:42 PST 2015
include/vcl/BitmapTools.hxx | 30 ++++++++++++
vcl/Library_vcl.mk | 1
vcl/README.vars | 3 -
vcl/source/bitmap/BitmapTools.cxx | 95 ++++++++++++++++++++++++++++++++++++++
vcl/source/gdi/impimagetree.cxx | 5 ++
5 files changed, 133 insertions(+), 1 deletion(-)
New commits:
commit bab105b923175d3e7eab7ee0af950a6a267c1afa
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Sun Nov 8 23:02:37 2015 +0100
update README.vars
Change-Id: Ie2d0cc90ecc3e585a8fbfc9517e48170cf07c0d2
diff --git a/vcl/README.vars b/vcl/README.vars
index 9285f87..4f62333 100644
--- a/vcl/README.vars
+++ b/vcl/README.vars
@@ -5,6 +5,7 @@ General
SAL_USE_VCLPLUGIN - use a VCL plugin
SAL_NO_NWF - disable native widgets
SAL_FORCEDPI - force a specific DPI (gtk & gtk3 plugins only)
+SAL_FORCE_HC - force high-contrast mode
VCL_DOUBLEBUFFERING_AVOID_PAINT - don't paint the buffer, useful to see where we do direct painting
VCL_DOUBLEBUFFERING_FORCE_ENABLE - enable double buffered painting
@@ -22,4 +23,4 @@ OpenGL
SAL_FORCEGL - force enable OpenGL
SAL_WITHOUT_WIDGET_CACHE - disable LRU caching of native widget texutres
SAL_DISABLE_GLYPH_CACHING - don't render glyphs through OpenGL textures
-SAL_DISABLE_GL_WATCHDOG - don't start the thread that watches for broken GL drivers
\ No newline at end of file
+SAL_DISABLE_GL_WATCHDOG - don't start the thread that watches for broken GL drivers
commit dca73ef8cf8ddd6078d70f4bc759708f3f5d4618
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Sun Nov 8 23:00:14 2015 +0100
support to load SVG images when loading from Image resource
Change-Id: Ieda1c334d8d995c774381c52fa1d9aa11751c5ef
diff --git a/include/vcl/BitmapTools.hxx b/include/vcl/BitmapTools.hxx
new file mode 100644
index 0000000..b156424
--- /dev/null
+++ b/include/vcl/BitmapTools.hxx
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_VCL_BITMAP_TOOLS_HXX
+#define INCLUDED_VCL_BITMAP_TOOLS_HXX
+
+#include <vcl/bitmapex.hxx>
+#include <tools/stream.hxx>
+
+namespace vcl
+{
+
+class VCL_DLLPUBLIC BitmapTools
+{
+public:
+ static void loadFromSvg(SvStream& rStream, const OUString& sPath, BitmapEx& rBitmapEx,
+ double fScaleFactor = 1.0, const Size& aSize = Size());
+};
+
+}
+
+#endif // INCLUDED_VCL_BITMAP_TOOLS_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 575a64f..a59c49b 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -326,6 +326,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/bitmap/BitmapSymmetryCheck \
vcl/source/bitmap/BitmapFilterStackBlur \
vcl/source/bitmap/BitmapProcessor \
+ vcl/source/bitmap/BitmapTools \
vcl/source/bitmap/checksum \
vcl/source/helper/canvasbitmap \
vcl/source/helper/canvastools \
diff --git a/vcl/source/bitmap/BitmapTools.cxx b/vcl/source/bitmap/BitmapTools.cxx
new file mode 100644
index 0000000..c65376a
--- /dev/null
+++ b/vcl/source/bitmap/BitmapTools.cxx
@@ -0,0 +1,95 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#include <vcl/BitmapTools.hxx>
+
+#include <comphelper/processfactory.hxx>
+#include <comphelper/seqstream.hxx>
+#include <vcl/canvastools.hxx>
+
+#include <com/sun/star/graphic/SvgTools.hpp>
+#include <com/sun/star/graphic/Primitive2DTools.hpp>
+
+#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+
+#include <com/sun/star/rendering/XIntegerReadOnlyBitmap.hpp>
+
+using namespace css;
+
+using drawinglayer::primitive2d::Primitive2DSequence;
+using drawinglayer::primitive2d::Primitive2DReference;
+
+namespace vcl
+{
+
+void BitmapTools::loadFromSvg(SvStream& rStream, const OUString& sPath, BitmapEx& rBitmapEx, double fScalingFactor, const Size& aSize)
+{
+ uno::Reference<uno::XComponentContext> xContext(comphelper::getProcessComponentContext());
+ const uno::Reference<graphic::XSvgParser> xSvgParser = graphic::SvgTools::create(xContext);
+
+ sal_Size nSize = rStream.remainingSize();
+ std::vector<sal_Int8> pBuffer(nSize + 1);
+ rStream.Read(pBuffer.data(), nSize);
+ pBuffer[nSize] = 0;
+
+ uno::Sequence<sal_Int8> aData(pBuffer.data(), nSize + 1);
+ uno::Reference<io::XInputStream> aInputStream(new comphelper::SequenceInputStream(aData));
+
+ Primitive2DSequence aPrimitiveSequence = xSvgParser->getDecomposition(aInputStream, sPath);
+
+ if (aPrimitiveSequence.hasElements())
+ {
+ uno::Sequence<beans::PropertyValue> aViewParameters;
+
+ const sal_Int32 nCount(aPrimitiveSequence.getLength());
+ geometry::RealRectangle2D aRealRect;
+ basegfx::B2DRange aRange;
+ for (sal_Int32 a = 0L; a < nCount; ++a)
+ {
+ const Primitive2DReference xReference(aPrimitiveSequence[a]);
+
+ if (xReference.is())
+ {
+ aRealRect = xReference->getRange(aViewParameters);
+ aRange.expand(basegfx::B2DRange(aRealRect.X1, aRealRect.Y1, aRealRect.X2, aRealRect.Y2));
+ }
+ }
+
+ bool bIsSizeEmpty = (aSize.Width() == 0 && aSize.Height() == 0);
+
+ aRealRect.X1 = 0;
+ aRealRect.Y1 = 0;
+ aRealRect.X2 = bIsSizeEmpty ? (aSize.Width() * 2540 / 90) : aRange.getMaxX() - aRange.getMinX();
+ aRealRect.Y2 = bIsSizeEmpty ? (aSize.Height() * 2540 / 90) : aRange.getMaxY() - aRange.getMinY();
+
+ double nDPI = 90 * fScalingFactor;
+
+ const css::uno::Reference<css::graphic::XPrimitive2DRenderer> xPrimitive2DRenderer = css::graphic::Primitive2DTools::create(xContext);
+ const css::uno::Reference<css::rendering::XBitmap> xBitmap(
+ xPrimitive2DRenderer->rasterize(aPrimitiveSequence, aViewParameters, nDPI, nDPI, aRealRect, 256*256));
+
+ printf("%f %f %f %f\n", aRealRect.X1, aRealRect.Y1, aRealRect.X2, aRealRect.Y2);
+
+ if (xBitmap.is())
+ {
+ const css::uno::Reference<css::rendering::XIntegerReadOnlyBitmap> xIntBmp(xBitmap, uno::UNO_QUERY_THROW);
+
+ if (xIntBmp.is())
+ {
+ rBitmapEx = vcl::unotools::bitmapExFromXBitmap(xIntBmp);
+ printf("Size: %d %d\n", rBitmapEx.GetSizePixel().Width(), rBitmapEx.GetSizePixel().Height());
+ }
+ }
+ }
+}
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index b7620c8..0a8d1a5 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -47,6 +47,7 @@
#include <vcldemo-debug.hxx>
#include <vcl/BitmapProcessor.hxx>
+#include <vcl/BitmapTools.hxx>
using namespace css;
@@ -86,6 +87,10 @@ static void loadImageFromStream(std::shared_ptr<SvStream> xStream, OUString cons
aPNGReader.SetIgnoreGammaChunk( true );
rBitmap = aPNGReader.Read();
}
+ else if (rPath.endsWith(".svg"))
+ {
+ vcl::BitmapTools::loadFromSvg(*xStream.get(), rPath, rBitmap);
+ }
else
{
ReadDIBBitmapEx(rBitmap, *xStream);
More information about the Libreoffice-commits
mailing list