diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/alpha.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/animate.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/bitmap.hxx | 3 | ||||
| -rw-r--r-- | include/vcl/bitmapex.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/checksum.hxx | 6 | ||||
| -rw-r--r-- | include/vcl/gdimtf.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/graph.hxx | 4 |
7 files changed, 14 insertions, 9 deletions
diff --git a/include/vcl/alpha.hxx b/include/vcl/alpha.hxx index ec89be425e12..89b6996f18e5 100644 --- a/include/vcl/alpha.hxx +++ b/include/vcl/alpha.hxx @@ -52,7 +52,7 @@ public: Size GetSizePixel() const { return Bitmap::GetSizePixel(); } sal_uLong GetSizeBytes() const { return Bitmap::GetSizeBytes(); } - sal_uLong GetChecksum() const { return Bitmap::GetChecksum(); } + BitmapChecksum GetChecksum() const { return Bitmap::GetChecksum(); } Bitmap GetBitmap() const; diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx index 1f2a6b8b3920..db62836225b9 100644 --- a/include/vcl/animate.hxx +++ b/include/vcl/animate.hxx @@ -97,7 +97,7 @@ struct VCL_DLLPUBLIC AnimationBitmap rAnimBmp.aBmpEx.IsEqual( aBmpEx ) ); } - sal_uLong GetChecksum() const; + BitmapChecksum GetChecksum() const; }; struct AInfo @@ -173,7 +173,7 @@ public: void Replace( const AnimationBitmap& rNewAnimationBmp, sal_uInt16 nAnimation ); sal_uLong GetSizeBytes() const; - sal_uLong GetChecksum() const; + BitmapChecksum GetChecksum() const; public: diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index a9f2146280c7..e9800a02b864 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -24,6 +24,7 @@ #include <tools/color.hxx> #include <tools/link.hxx> #include <tools/solar.h> +#include <vcl/checksum.hxx> #include <vcl/dllapi.h> #include <vcl/mapmod.hxx> #include <vcl/region.hxx> @@ -386,7 +387,7 @@ public: */ bool GetSystemData( BitmapSystemData& rData ) const; - sal_uLong GetChecksum() const; + BitmapChecksum GetChecksum() const; Bitmap CreateDisplayBitmap( OutputDevice* pDisplay ); Bitmap GetColorTransformedBitmap() const; diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx index 096e2a050905..d609d8944532 100644 --- a/include/vcl/bitmapex.hxx +++ b/include/vcl/bitmapex.hxx @@ -96,7 +96,7 @@ public: sal_uInt16 GetBitCount() const { return aBitmap.GetBitCount(); } sal_uLong GetSizeBytes() const; - sal_uLong GetChecksum() const; + BitmapChecksum GetChecksum() const; public: diff --git a/include/vcl/checksum.hxx b/include/vcl/checksum.hxx index ae7c9d6f7ba4..53c2f1620b47 100644 --- a/include/vcl/checksum.hxx +++ b/include/vcl/checksum.hxx @@ -22,9 +22,9 @@ #define INCLUDED_VCL_INC_CHECKSUM_HXX #include <sal/config.h> - #include <sal/saldllapi.h> #include <sal/types.h> +#include <tools/solar.h> /*======================================================================== * @@ -120,6 +120,10 @@ static const sal_uInt64 vcl_crc64Table[256] = { 0x29b7d047efec8728ULL }; +typedef sal_uLong BitmapChecksum; + +#define BITMAP_CHECKSUM_BITS (sizeof(BitmapChecksum) * 8) + #ifdef __cplusplus extern "C" { #endif diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index 8baa116eea95..28075dcf1607 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -198,7 +198,7 @@ public: void SetHookHdl( const Link<>& rLink ) { aHookHdlLink = rLink; } const Link<>& GetHookHdl() const { return aHookHdlLink; } - sal_uLong GetChecksum() const; + BitmapChecksum GetChecksum() const; sal_uLong GetSizeBytes() const; // Methods for reading and writing the new formats; diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx index 778c6719c4c7..929daf8ee1fb 100644 --- a/include/vcl/graph.hxx +++ b/include/vcl/graph.hxx @@ -161,9 +161,9 @@ public: void SetAnimationNotifyHdl( const Link<>& rLink ); Link<> GetAnimationNotifyHdl() const; - sal_uLong GetAnimationLoopCount() const; + sal_uLong GetAnimationLoopCount() const; - sal_uLong GetChecksum() const; + BitmapChecksum GetChecksum() const; public: |