diff options
| author | panoskorovesis <panoskorovesis@outlook.com> | 2021-07-09 19:15:38 +0300 |
|---|---|---|
| committer | panoskorovesis <panoskorovesis@outlook.com> | 2021-07-13 12:21:07 +0300 |
| commit | 920fa3600b4084dfed9d7e9b13847de1c4eee86a (patch) | |
| tree | f8f6b25263c6a31bb142bdb9b0bca70b43ce39be | |
| parent | b3bbec35836090ce253174d79a52f8636e9ba8e6 (diff) | |
Add Handler for Mask Read
The handler separates MetaMaskAction::Read from metaact.hxx
Read implementation is now in SvmReader.hxx
Change-Id: I00fb652271055d071e36f7a1bbe7a48b00f47085
| -rw-r--r-- | include/vcl/filter/SvmReader.hxx | 1 | ||||
| -rw-r--r-- | include/vcl/metaact.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/filter/svm/SvmReader.cxx | 19 |
3 files changed, 21 insertions, 1 deletions
diff --git a/include/vcl/filter/SvmReader.hxx b/include/vcl/filter/SvmReader.hxx index 9ce071448dca..0adcf65a9015 100644 --- a/include/vcl/filter/SvmReader.hxx +++ b/include/vcl/filter/SvmReader.hxx @@ -62,6 +62,7 @@ public: rtl::Reference<MetaAction> BmpExHandler(); rtl::Reference<MetaAction> BmpExScaleHandler(); rtl::Reference<MetaAction> BmpExScalePartHandler(); + rtl::Reference<MetaAction> MaskHandler(); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx index c59257433daa..14f910994031 100644 --- a/include/vcl/metaact.hxx +++ b/include/vcl/metaact.hxx @@ -949,6 +949,8 @@ public: const Bitmap& GetBitmap() const { return maBmp; } const Color& GetColor() const { return maColor; } const Point& GetPoint() const { return maPt; } + void SetBitmap(Bitmap& rBmp) { maBmp = rBmp; } + void SetPoint(Point& rPt) { maPt = rPt; } }; class SAL_DLLPUBLIC_RTTI MetaMaskScaleAction final : public MetaAction diff --git a/vcl/source/filter/svm/SvmReader.cxx b/vcl/source/filter/svm/SvmReader.cxx index 679a6185c503..b98d4a4056cf 100644 --- a/vcl/source/filter/svm/SvmReader.cxx +++ b/vcl/source/filter/svm/SvmReader.cxx @@ -229,7 +229,7 @@ rtl::Reference<MetaAction> SvmReader::MetaActionHandler(ImplMetaReadData* pData) return BmpExScalePartHandler(); break; case MetaActionType::MASK: - pAction = new MetaMaskAction; + return MaskHandler(); break; case MetaActionType::MASKSCALE: pAction = new MetaMaskScaleAction; @@ -961,4 +961,21 @@ rtl::Reference<MetaAction> SvmReader::BmpExScalePartHandler() return pAction; } + +rtl::Reference<MetaAction> SvmReader::MaskHandler() +{ + auto pAction = new MetaMaskAction(); + + VersionCompatRead aCompat(mrStream); + Bitmap aBmp; + ReadDIB(aBmp, mrStream, true); + TypeSerializer aSerializer(mrStream); + Point aPoint; + aSerializer.readPoint(aPoint); + + pAction->SetBitmap(aBmp); + pAction->SetPoint(aPoint); + + return pAction; +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |