diff options
| author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2018-06-06 10:51:58 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-06-11 17:39:23 +0200 |
| commit | 86bc5ae13a530c02734e4cb0210bb259c86dc6c6 (patch) | |
| tree | 0ad86c513906df0e801feb437fcd2cbba827bbf3 /include | |
| parent | 23eb3e106ad17608c79a35cdde251e037f1a2373 (diff) | |
tdf#117984 Make MapMode thread-safe
...using o3tl::ThreadSafeRefCountingPolicy due to being
used indirectly (~Bitmap) in parallelized 3D renderer
Change-Id: Ia5eab219c6844570a04c83f71cca5e7b7da4326d
Reviewed-on: https://gerrit.libreoffice.org/55365
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
(cherry picked from commit d84517a171a17dfa12f25ad4305a06b20f3b7c76)
Reviewed-on: https://gerrit.libreoffice.org/55411
Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/mapmod.hxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/vcl/mapmod.hxx b/include/vcl/mapmod.hxx index e3e1ede649ab..f09097c5d2bf 100644 --- a/include/vcl/mapmod.hxx +++ b/include/vcl/mapmod.hxx @@ -67,7 +67,9 @@ public: friend VCL_DLLPUBLIC SvStream& ReadMapMode( SvStream& rIStm, MapMode& rMapMode ); friend VCL_DLLPUBLIC SvStream& WriteMapMode( SvStream& rOStm, const MapMode& rMapMode ); - typedef o3tl::cow_wrapper< ImplMapMode > ImplType; + // tdf#117984 needs to be thread-safe due to being used e.g. in Bitmaps + // vcl::ScopedBitmapAccess in parallelized 3D renderer + typedef o3tl::cow_wrapper< ImplMapMode, o3tl::ThreadSafeRefCountingPolicy > ImplType; private: ImplType mpImplMapMode; |