[Libreoffice-commits] core.git: include/vcl vcl/source
Xisco Fauli
anistenis at gmail.com
Wed May 4 12:22:07 UTC 2016
include/vcl/mapmod.hxx | 27 +++---
vcl/source/gdi/mapmod.cxx | 184 ++++++++++------------------------------------
2 files changed, 55 insertions(+), 156 deletions(-)
New commits:
commit 23dfb9e14571d96f9bd23d178f397ee35c36f686
Author: Xisco Fauli <anistenis at gmail.com>
Date: Wed Apr 27 02:03:35 2016 +0200
tdf#62525 vcl: use cow_wrapper for mapmod
Change-Id: I25ddaeb051f171388bb490a23bf03dbaf0add281
Reviewed-on: https://gerrit.libreoffice.org/24438
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
diff --git a/include/vcl/mapmod.hxx b/include/vcl/mapmod.hxx
index 77aa83d..9c7676d 100644
--- a/include/vcl/mapmod.hxx
+++ b/include/vcl/mapmod.hxx
@@ -22,6 +22,7 @@
#include <vcl/dllapi.h>
#include <tools/mapunit.hxx>
+#include <o3tl/cow_wrapper.hxx>
class Point;
class Fraction;
@@ -36,19 +37,12 @@ class VCL_DLLPUBLIC MapMode
public:
struct ImplMapMode;
-private:
- ImplMapMode* mpImplMapMode;
-
- SAL_DLLPRIVATE void ImplMakeUnique();
- SAL_DLLPRIVATE bool IsSimple() const;
-
-public:
- MapMode();
- MapMode( const MapMode& rMapMode );
- MapMode( MapUnit eUnit );
- MapMode( MapUnit eUnit, const Point& rLogicOrg,
- const Fraction& rScaleX, const Fraction& rScaleY );
- ~MapMode();
+ MapMode();
+ MapMode( const MapMode& rMapMode );
+ MapMode( MapUnit eUnit );
+ MapMode( MapUnit eUnit, const Point& rLogicOrg,
+ const Fraction& rScaleX, const Fraction& rScaleY );
+ ~MapMode();
void SetMapUnit( MapUnit eUnit );
MapUnit GetMapUnit() const;
@@ -72,6 +66,13 @@ 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;
+
+private:
+ ImplType mpImplMapMode;
+
+ SAL_DLLPRIVATE bool IsSimple() const;
};
#endif // INCLUDED_VCL_MAPMOD_HXX
diff --git a/vcl/source/gdi/mapmod.cxx b/vcl/source/gdi/mapmod.cxx
index 0c4bc51..0a4a107 100644
--- a/vcl/source/gdi/mapmod.cxx
+++ b/vcl/source/gdi/mapmod.cxx
@@ -24,10 +24,10 @@
#include <tools/stream.hxx>
#include <tools/vcompat.hxx>
#include <tools/debug.hxx>
+#include <rtl/instance.hxx>
struct MapMode::ImplMapMode
{
- sal_uLong mnRefCount;
MapUnit meUnit;
Point maOrigin;
// NOTE: these Fraction must NOT have more than 32 bits precision
@@ -38,13 +38,10 @@ struct MapMode::ImplMapMode
Fraction maScaleY;
bool mbSimple;
- friend SvStream& ReadImplMapMode(SvStream& rIStm, ImplMapMode& rMapMode);
- friend SvStream& WriteImplMapMode(SvStream& rOStm, const ImplMapMode& rMapMode);
-
- static ImplMapMode* ImplGetStaticMapMode( MapUnit eUnit );
-
ImplMapMode();
ImplMapMode(const ImplMapMode& rImpMapMode);
+
+ bool operator==( const ImplMapMode& rImpMapMode ) const;
};
MapMode::ImplMapMode::ImplMapMode() :
@@ -52,157 +49,81 @@ MapMode::ImplMapMode::ImplMapMode() :
maScaleX( 1, 1 ),
maScaleY( 1, 1 )
{
- mnRefCount = 1;
meUnit = MAP_PIXEL;
- mbSimple = false;
+ mbSimple = true;
}
MapMode::ImplMapMode::ImplMapMode( const ImplMapMode& rImplMapMode ) :
+ meUnit( rImplMapMode.meUnit ),
maOrigin( rImplMapMode.maOrigin ),
maScaleX( rImplMapMode.maScaleX ),
maScaleY( rImplMapMode.maScaleY )
{
- mnRefCount = 1;
- meUnit = rImplMapMode.meUnit;
- mbSimple = false;
-}
-
-SvStream& ReadImplMapMode(SvStream& rIStm, MapMode::ImplMapMode& rImplMapMode)
-{
- VersionCompat aCompat( rIStm, StreamMode::READ );
- sal_uInt16 nTmp16;
-
- rIStm.ReadUInt16( nTmp16 ); rImplMapMode.meUnit = (MapUnit) nTmp16;
- ReadPair( rIStm, rImplMapMode.maOrigin );
- ReadFraction( rIStm, rImplMapMode.maScaleX );
- ReadFraction( rIStm, rImplMapMode.maScaleY );
- rIStm.ReadCharAsBool( rImplMapMode.mbSimple );
-
- return rIStm;
}
-SvStream& WriteImplMapMode(SvStream& rOStm, const MapMode::ImplMapMode& rImplMapMode)
+bool MapMode::ImplMapMode::operator==( const ImplMapMode& rImpMapMode ) const
{
- VersionCompat aCompat( rOStm, StreamMode::WRITE, 1 );
-
- rOStm.WriteUInt16( rImplMapMode.meUnit );
- WritePair( rOStm, rImplMapMode.maOrigin );
- WriteFraction( rOStm, rImplMapMode.maScaleX );
- WriteFraction( rOStm, rImplMapMode.maScaleY );
- rOStm.WriteBool( rImplMapMode.mbSimple );
-
- return rOStm;
-}
-
-MapMode::ImplMapMode *
-MapMode::ImplMapMode::ImplGetStaticMapMode(MapUnit eUnit)
-{
- static long aStaticImplMapModeAry[(MAP_LASTENUMDUMMY)*sizeof(ImplMapMode)/sizeof(long)];
-
- // #i19496 check for out-of-bounds
- if( eUnit >= MAP_LASTENUMDUMMY )
- return reinterpret_cast<ImplMapMode*>(aStaticImplMapModeAry);
-
- ImplMapMode* pImplMapMode = reinterpret_cast<ImplMapMode*>(aStaticImplMapModeAry)+eUnit;
- if ( !pImplMapMode->mbSimple )
- {
- Fraction aDefFraction( 1, 1 );
- pImplMapMode->maScaleX = aDefFraction;
- pImplMapMode->maScaleY = aDefFraction;
- pImplMapMode->meUnit = eUnit;
- pImplMapMode->mbSimple = true;
- }
-
- return pImplMapMode;
+ if (meUnit == rImpMapMode.meUnit
+ && maOrigin == rImpMapMode.maOrigin
+ && maScaleX == rImpMapMode.maScaleX
+ && maScaleY == rImpMapMode.maScaleY)
+ return true;
+ return false;
}
-inline void MapMode::ImplMakeUnique()
+namespace
{
- // If there are other references, copy
- if ( mpImplMapMode->mnRefCount != 1 )
- {
- if ( mpImplMapMode->mnRefCount )
- mpImplMapMode->mnRefCount--;
- mpImplMapMode = new ImplMapMode( *mpImplMapMode );
- }
+ struct theGlobalDefault :
+ public rtl::Static< MapMode::ImplType, theGlobalDefault > {};
}
-MapMode::MapMode()
+MapMode::MapMode() : mpImplMapMode(theGlobalDefault::get())
{
-
- mpImplMapMode = ImplMapMode::ImplGetStaticMapMode( MAP_PIXEL );
}
-MapMode::MapMode( const MapMode& rMapMode )
+MapMode::MapMode( const MapMode& rMapMode ) : mpImplMapMode( rMapMode.mpImplMapMode )
{
- DBG_ASSERT( rMapMode.mpImplMapMode->mnRefCount < 0xFFFFFFFE, "MapMode: RefCount overflow" );
-
- // Take over Shared Instance Data and increment refcount
- mpImplMapMode = rMapMode.mpImplMapMode;
- // RefCount == 0 for static objects
- if ( mpImplMapMode->mnRefCount )
- mpImplMapMode->mnRefCount++;
}
-MapMode::MapMode( MapUnit eUnit )
+MapMode::MapMode( MapUnit eUnit ) : mpImplMapMode()
{
-
- mpImplMapMode = ImplMapMode::ImplGetStaticMapMode( eUnit );
+ mpImplMapMode->meUnit = eUnit;
}
MapMode::MapMode( MapUnit eUnit, const Point& rLogicOrg,
const Fraction& rScaleX, const Fraction& rScaleY )
{
-
- mpImplMapMode = new ImplMapMode;
mpImplMapMode->meUnit = eUnit;
mpImplMapMode->maOrigin = rLogicOrg;
mpImplMapMode->maScaleX = rScaleX;
mpImplMapMode->maScaleY = rScaleY;
mpImplMapMode->maScaleX.ReduceInaccurate(32);
mpImplMapMode->maScaleY.ReduceInaccurate(32);
+ mpImplMapMode->mbSimple = false;
}
MapMode::~MapMode()
{
-
- // If it's not static ImpData and it's the last reference, delete it,
- // else decrement refcounter
- if ( mpImplMapMode->mnRefCount )
- {
- if ( mpImplMapMode->mnRefCount == 1 )
- delete mpImplMapMode;
- else
- mpImplMapMode->mnRefCount--;
- }
}
void MapMode::SetMapUnit( MapUnit eUnit )
{
-
- ImplMakeUnique();
mpImplMapMode->meUnit = eUnit;
}
void MapMode::SetOrigin( const Point& rLogicOrg )
{
-
- ImplMakeUnique();
mpImplMapMode->maOrigin = rLogicOrg;
}
void MapMode::SetScaleX( const Fraction& rScaleX )
{
-
- ImplMakeUnique();
mpImplMapMode->maScaleX = rScaleX;
mpImplMapMode->maScaleX.ReduceInaccurate(32);
}
void MapMode::SetScaleY( const Fraction& rScaleY )
{
-
- ImplMakeUnique();
mpImplMapMode->maScaleY = rScaleY;
mpImplMapMode->maScaleY.ReduceInaccurate(32);
}
@@ -255,68 +176,45 @@ double MapMode::GetUnitMultiplier() const
MapMode& MapMode::operator=( const MapMode& rMapMode )
{
- DBG_ASSERT( rMapMode.mpImplMapMode->mnRefCount < 0xFFFFFFFE, "MapMode: RefCount overflow" );
-
- // First increment refcount so that we can reference ourselves
- // RefCount == 0 for static objects
- if ( rMapMode.mpImplMapMode->mnRefCount )
- rMapMode.mpImplMapMode->mnRefCount++;
-
- // If it's not static ImpData and it's the last reference, delete it,
- // else decrement refcounter
- if ( mpImplMapMode->mnRefCount )
- {
- if ( mpImplMapMode->mnRefCount == 1 )
- delete mpImplMapMode;
- else
- mpImplMapMode->mnRefCount--;
- }
-
mpImplMapMode = rMapMode.mpImplMapMode;
-
return *this;
}
bool MapMode::operator==( const MapMode& rMapMode ) const
{
-
- if ( mpImplMapMode == rMapMode.mpImplMapMode )
- return true;
-
- if ( (mpImplMapMode->meUnit == rMapMode.mpImplMapMode->meUnit) &&
- (mpImplMapMode->maOrigin == rMapMode.mpImplMapMode->maOrigin) &&
- (mpImplMapMode->maScaleX == rMapMode.mpImplMapMode->maScaleX) &&
- (mpImplMapMode->maScaleY == rMapMode.mpImplMapMode->maScaleY) )
- return true;
- else
- return false;
+ return mpImplMapMode == rMapMode.mpImplMapMode;
}
bool MapMode::IsDefault() const
{
-
- ImplMapMode* pDefMapMode = ImplMapMode::ImplGetStaticMapMode( MAP_PIXEL );
- if ( mpImplMapMode == pDefMapMode )
- return true;
-
- if ( (mpImplMapMode->meUnit == pDefMapMode->meUnit) &&
- (mpImplMapMode->maOrigin == pDefMapMode->maOrigin) &&
- (mpImplMapMode->maScaleX == pDefMapMode->maScaleX) &&
- (mpImplMapMode->maScaleY == pDefMapMode->maScaleY) )
- return true;
- else
- return false;
+ return mpImplMapMode.same_object(theGlobalDefault::get());
}
SvStream& ReadMapMode( SvStream& rIStm, MapMode& rMapMode )
{
- rMapMode.ImplMakeUnique();
- return ReadImplMapMode( rIStm, *rMapMode.mpImplMapMode );
+ VersionCompat aCompat( rIStm, StreamMode::READ );
+ sal_uInt16 nTmp16;
+
+ rIStm.ReadUInt16( nTmp16 ); rMapMode.mpImplMapMode->meUnit = (MapUnit) nTmp16;
+ ReadPair( rIStm, rMapMode.mpImplMapMode->maOrigin );
+ ReadFraction( rIStm, rMapMode.mpImplMapMode->maScaleX );
+ ReadFraction( rIStm, rMapMode.mpImplMapMode->maScaleY );
+ rIStm.ReadCharAsBool( rMapMode.mpImplMapMode->mbSimple );
+
+ return rIStm;
}
SvStream& WriteMapMode( SvStream& rOStm, const MapMode& rMapMode )
{
- return WriteImplMapMode( rOStm, *rMapMode.mpImplMapMode );
+ VersionCompat aCompat( rOStm, StreamMode::WRITE, 1 );
+
+ rOStm.WriteUInt16( rMapMode.mpImplMapMode->meUnit );
+ WritePair( rOStm, rMapMode.mpImplMapMode->maOrigin );
+ WriteFraction( rOStm, rMapMode.mpImplMapMode->maScaleX );
+ WriteFraction( rOStm, rMapMode.mpImplMapMode->maScaleY );
+ rOStm.WriteBool( rMapMode.mpImplMapMode->mbSimple );
+
+ return rOStm;
}
More information about the Libreoffice-commits
mailing list