From 83535a28c57ffb59f795dd35332d6b3426071e32 Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Fri, 9 Jun 2017 19:55:17 +0200 Subject: emfplus: create a wmf/emf/emf+ primitive based importer First steps to organize an importer that can read/interpret wmf/emf/emf+ and deliver a primitive representation for the content by parsing it. Use the same mechanisms as already applied for Svg, so to reuse abilities to keep original binary data to allow save again and embedding in files and have an implemented replacement bitmap based representation. For this, unify the used helper classes to handle more than just Svg. For 1st try, add test code and static bool switches Change-Id: I6e0a82943541d811a8f8d65a84115569fcd8cee7 --- include/svx/svdograf.hxx | 4 +- include/vcl/graph.hxx | 6 +-- include/vcl/svgdata.hxx | 86 -------------------------------- include/vcl/vectorgraphicdata.hxx | 100 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 105 insertions(+), 91 deletions(-) delete mode 100644 include/vcl/svgdata.hxx create mode 100644 include/vcl/vectorgraphicdata.hxx (limited to 'include') diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index e86673b74899..ecf9eeef927a 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -188,8 +188,8 @@ public: virtual void SetPage(SdrPage* pNewPage) override; virtual void SetModel(SdrModel* pNewModel) override; - bool isEmbeddedSvg() const; - GDIMetaFile getMetafileFromEmbeddedSvg() const; + bool isEmbeddedVectorGraphicData() const; + GDIMetaFile getMetafileFromEmbeddedVectorGraphicData() const; virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const override; diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx index 8dcf5925f87f..39fd594e878e 100644 --- a/include/vcl/graph.hxx +++ b/include/vcl/graph.hxx @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include @@ -118,7 +118,7 @@ public: Graphic( Graphic&& rGraphic ); Graphic( const Bitmap& rBmp ); Graphic( const BitmapEx& rBmpEx ); - Graphic( const SvgDataPtr& rSvgDataPtr ); + Graphic( const VectorGraphicDataPtr& rVectorGraphicDataPtr ); Graphic( const Animation& rAnimation ); Graphic( const GDIMetaFile& rMtf ); Graphic( const css::uno::Reference< css::graphic::XGraphic >& rxGraphic ); @@ -219,7 +219,7 @@ public: public: - const SvgDataPtr& getSvgData() const; + const VectorGraphicDataPtr& getVectorGraphicData() const; void setPdfData(const css::uno::Sequence& rPdfData); const css::uno::Sequence& getPdfData() const; diff --git a/include/vcl/svgdata.hxx b/include/vcl/svgdata.hxx deleted file mode 100644 index 7ab2d8ce89c8..000000000000 --- a/include/vcl/svgdata.hxx +++ /dev/null @@ -1,86 +0,0 @@ -/* -*- 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_VCL_SVGDATA_HXX -#define INCLUDED_VCL_SVGDATA_HXX - -#include -#include -#include -#include -#include - - -typedef css::uno::Sequence SvgDataArray; - - -// helper to convert any Primitive2DSequence to a good quality BitmapEx, -// using default parameters and graphic::XPrimitive2DRenderer - -BitmapEx VCL_DLLPUBLIC convertPrimitive2DSequenceToBitmapEx( - const std::deque< css::uno::Reference< css::graphic::XPrimitive2D > >& rSequence, - const basegfx::B2DRange& rTargetRange, - const sal_uInt32 nMaximumQuadraticPixels = 500000); - - -class VCL_DLLPUBLIC SvgData -{ -private: - // the file and length - SvgDataArray maSvgDataArray; - - // The absolute Path if available - OUString maPath; - - // on demand created content - basegfx::B2DRange maRange; - std::deque< css::uno::Reference< css::graphic::XPrimitive2D > > - maSequence; - BitmapEx maReplacement; - size_t mNestedBitmapSize; - - // on demand creators - void ensureReplacement(); - void ensureSequenceAndRange(); - - SvgData(const SvgData&) = delete; - SvgData& operator=(const SvgData&) = delete; - -public: - SvgData(const SvgDataArray& rSvgDataArray, const OUString& rPath); - SvgData(const OUString& rPath); - - /// data read - const SvgDataArray& getSvgDataArray() const { return maSvgDataArray; } - sal_uInt32 getSvgDataArrayLength() const { return maSvgDataArray.getLength(); } - enum class State { UNPARSED, PARSED }; - std::pair getSizeBytes(); - const OUString& getPath() const { return maPath; } - - /// data read and evtl. on demand creation - const basegfx::B2DRange& getRange() const; - const std::deque< css::uno::Reference< css::graphic::XPrimitive2D > >& getPrimitive2DSequence() const; - const BitmapEx& getReplacement() const; -}; - -typedef std::shared_ptr< SvgData > SvgDataPtr; - -#endif // INCLUDED_VCL_SVGDATA_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/vectorgraphicdata.hxx b/include/vcl/vectorgraphicdata.hxx new file mode 100644 index 000000000000..f46be43489db --- /dev/null +++ b/include/vcl/vectorgraphicdata.hxx @@ -0,0 +1,100 @@ +/* -*- 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/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_VCL_VECTORGRAPHICDATA_HXX +#define INCLUDED_VCL_VECTORGRAPHICDATA_HXX + +#include +#include +#include +#include +#include + + +typedef css::uno::Sequence VectorGraphicDataArray; + + +// helper to convert any Primitive2DSequence to a good quality BitmapEx, +// using default parameters and graphic::XPrimitive2DRenderer + +BitmapEx VCL_DLLPUBLIC convertPrimitive2DSequenceToBitmapEx( + const std::deque< css::uno::Reference< css::graphic::XPrimitive2D > >& rSequence, + const basegfx::B2DRange& rTargetRange, + const sal_uInt32 nMaximumQuadraticPixels = 500000); + + +enum class VectorGraphicDataType +{ + Svg = 0, + Emf = 1, + Wmf = 2 +}; + +class VCL_DLLPUBLIC VectorGraphicData +{ +private: + // the file and length + VectorGraphicDataArray maVectorGraphicDataArray; + + // The absolute Path if available + OUString maPath; + + // on demand created content + basegfx::B2DRange maRange; + std::deque< css::uno::Reference< css::graphic::XPrimitive2D > > + maSequence; + BitmapEx maReplacement; + size_t mNestedBitmapSize; + VectorGraphicDataType meVectorGraphicDataType; + + // on demand creators + void ensureReplacement(); + void ensureSequenceAndRange(); + + VectorGraphicData(const VectorGraphicData&) = delete; + VectorGraphicData& operator=(const VectorGraphicData&) = delete; + +public: + VectorGraphicData( + const VectorGraphicDataArray& rVectorGraphicDataArray, + const OUString& rPath, + VectorGraphicDataType eVectorDataType); // = VectorGraphicDataType::Svg); + VectorGraphicData( + const OUString& rPath, + VectorGraphicDataType eVectorDataType); + + /// data read + const VectorGraphicDataArray& getVectorGraphicDataArray() const { return maVectorGraphicDataArray; } + sal_uInt32 getVectorGraphicDataArrayLength() const { return maVectorGraphicDataArray.getLength(); } + enum class State { UNPARSED, PARSED }; + std::pair getSizeBytes(); + const OUString& getPath() const { return maPath; } + const VectorGraphicDataType& getVectorGraphicDataType() const { return meVectorGraphicDataType; } + + /// data read and evtl. on demand creation + const basegfx::B2DRange& getRange() const; + const std::deque< css::uno::Reference< css::graphic::XPrimitive2D > >& getPrimitive2DSequence() const; + const BitmapEx& getReplacement() const; +}; + +typedef std::shared_ptr< VectorGraphicData > VectorGraphicDataPtr; + +#endif // INCLUDED_VCL_VECTORGRAPHICDATA_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit