diff options
| author | panoskorovesis <panoskorovesis@outlook.com> | 2021-07-13 13:23:07 +0300 |
|---|---|---|
| committer | panoskorovesis <panoskorovesis@outlook.com> | 2021-07-13 15:22:52 +0300 |
| commit | d23a21b4e98466a5ad792149280d3a9745545744 (patch) | |
| tree | 85dd0cf46d03affc31853a2d9bb3d9d721a20e25 | |
| parent | 920fa3600b4084dfed9d7e9b13847de1c4eee86a (diff) | |
Add Handler for MaskScale Read
The handler separates MetaMaskScale::Read from metaact.hxx
Read implementation is now in SvmReader.hxx
Change-Id: I20aec9f6c767f82ba8bac0198e4e733511f33fab
| -rw-r--r-- | include/vcl/filter/SvmReader.hxx | 1 | ||||
| -rw-r--r-- | include/vcl/metaact.hxx | 3 | ||||
| -rw-r--r-- | vcl/source/filter/svm/SvmReader.cxx | 22 |
3 files changed, 25 insertions, 1 deletions
diff --git a/include/vcl/filter/SvmReader.hxx b/include/vcl/filter/SvmReader.hxx index 0adcf65a9015..9544bb2f8e4d 100644 --- a/include/vcl/filter/SvmReader.hxx +++ b/include/vcl/filter/SvmReader.hxx @@ -63,6 +63,7 @@ public: rtl::Reference<MetaAction> BmpExScaleHandler(); rtl::Reference<MetaAction> BmpExScalePartHandler(); rtl::Reference<MetaAction> MaskHandler(); + rtl::Reference<MetaAction> MaskScaleHandler(); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx index 14f910994031..e48cdf2d8c0d 100644 --- a/include/vcl/metaact.hxx +++ b/include/vcl/metaact.hxx @@ -987,6 +987,9 @@ public: const Color& GetColor() const { return maColor; } const Point& GetPoint() const { return maPt; } const Size& GetSize() const { return maSz; } + void SetBitmap(Bitmap& rBmp) { maBmp = rBmp; } + void SetPoint(Point& rPt) { maPt = rPt; } + void SetSize(Size& rSz) { maSz = rSz; } }; class SAL_DLLPUBLIC_RTTI MetaMaskScalePartAction final : public MetaAction diff --git a/vcl/source/filter/svm/SvmReader.cxx b/vcl/source/filter/svm/SvmReader.cxx index b98d4a4056cf..624712be19ba 100644 --- a/vcl/source/filter/svm/SvmReader.cxx +++ b/vcl/source/filter/svm/SvmReader.cxx @@ -232,7 +232,7 @@ rtl::Reference<MetaAction> SvmReader::MetaActionHandler(ImplMetaReadData* pData) return MaskHandler(); break; case MetaActionType::MASKSCALE: - pAction = new MetaMaskScaleAction; + return MaskScaleHandler(); break; case MetaActionType::MASKSCALEPART: pAction = new MetaMaskScalePartAction; @@ -978,4 +978,24 @@ rtl::Reference<MetaAction> SvmReader::MaskHandler() return pAction; } + +rtl::Reference<MetaAction> SvmReader::MaskScaleHandler() +{ + auto pAction = new MetaMaskScaleAction(); + + VersionCompatRead aCompat(mrStream); + Bitmap aBmp; + ReadDIB(aBmp, mrStream, true); + TypeSerializer aSerializer(mrStream); + Point aPoint; + aSerializer.readPoint(aPoint); + Size aSize; + aSerializer.readSize(aSize); + + pAction->SetBitmap(aBmp); + pAction->SetPoint(aPoint); + pAction->SetSize(aSize); + + return pAction; +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |