diff options
| author | panoskorovesis <panoskorovesis@outlook.com> | 2021-07-09 14:01:01 +0300 |
|---|---|---|
| committer | panoskorovesis <panoskorovesis@outlook.com> | 2021-07-09 14:01:01 +0300 |
| commit | 4b46111acd27cf49dc161d33090f91089a79771a (patch) | |
| tree | a57368970503f437efeb0af75dfe82be27965905 | |
| parent | 113db2cf876e677429aa6d53830dc7904394907c (diff) | |
Add Handler for BmpEx Read
The handler separates MetaBmpExAction::Read from metaact.hxx
Read implementation is now in SvmReader.hxx
Change-Id: Ia5175e824716e08df2ac42e354b337b9e15050e4
| -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 fedaf58b9692..fc82e47268bc 100644 --- a/include/vcl/filter/SvmReader.hxx +++ b/include/vcl/filter/SvmReader.hxx @@ -59,6 +59,7 @@ public: rtl::Reference<MetaAction> BmpHandler(); rtl::Reference<MetaAction> BmpScaleHandler(); rtl::Reference<MetaAction> BmpScalePartHandler(); + rtl::Reference<MetaAction> BmpExHandler(); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx index 4c531977100f..b3cd5e0b5e87 100644 --- a/include/vcl/metaact.hxx +++ b/include/vcl/metaact.hxx @@ -831,6 +831,8 @@ public: const BitmapEx& GetBitmapEx() const { return maBmpEx; } const Point& GetPoint() const { return maPt; } + void SetBitmapEx(BitmapEx rBmpEx) { maBmpEx = rBmpEx; } + void SetPoint(Point& rPt) { maPt = rPt; } bool IsTransparent() const override { return GetBitmapEx().IsAlpha(); } }; diff --git a/vcl/source/filter/svm/SvmReader.cxx b/vcl/source/filter/svm/SvmReader.cxx index ed75eb27893e..e53dbefeb45e 100644 --- a/vcl/source/filter/svm/SvmReader.cxx +++ b/vcl/source/filter/svm/SvmReader.cxx @@ -220,7 +220,7 @@ rtl::Reference<MetaAction> SvmReader::MetaActionHandler(ImplMetaReadData* pData) return BmpScalePartHandler(); break; case MetaActionType::BMPEX: - pAction = new MetaBmpExAction; + return BmpExHandler(); break; case MetaActionType::BMPEXSCALE: pAction = new MetaBmpExScaleAction; @@ -898,4 +898,21 @@ rtl::Reference<MetaAction> SvmReader::BmpScalePartHandler() return pAction; } + +rtl::Reference<MetaAction> SvmReader::BmpExHandler() +{ + auto pAction = new MetaBmpExAction(); + + VersionCompatRead aCompat(mrStream); + BitmapEx aBmpEx; + ReadDIBBitmapEx(aBmpEx, mrStream); + TypeSerializer aSerializer(mrStream); + Point aPoint; + aSerializer.readPoint(aPoint); + + pAction->SetPoint(aPoint); + pAction->SetBitmapEx(aBmpEx); + + return pAction; +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |