diff options
author | Marco Cecchetti <marco.cecchetti@collabora.com> | 2015-08-27 15:25:11 +0200 |
---|---|---|
committer | Marco Cecchetti <marco.cecchetti@collabora.com> | 2015-09-01 17:15:56 +0200 |
commit | 9a13e3d2d62f375842b482d9cbf7be57f375e1a9 (patch) | |
tree | a13cb02d4a7e9e5d355ec68ca46de4da7d75eb6b | |
parent | 0c1fa8d1396288033125d1493ea8fbd8f8a2bcf9 (diff) |
Switching to 64-bit checksum: substituted sal_uLong with BitmapChecksum
A typedef sal_uLong BitmapChecksum;
has been added to include/vcl/checksum.hxx
Wherever needed sal_uLong and sal_Int32 has been substituted with
BitmapChecksum.
A BITMAP_CHECKSUM_BITS constant equal to the amount of bits used by the
BitmapChecksum type has been defined and used in
`GraphicID::GetIDString` (vstools/source/graphic/grfcache.cxx).
Change-Id: I74bd285089e58a8b18c06233d75b87023c7bf31b
-rw-r--r-- | filter/source/flash/swfexporter.cxx | 14 | ||||
-rw-r--r-- | filter/source/flash/swfexporter.hxx | 7 | ||||
-rw-r--r-- | filter/source/flash/swfwriter.hxx | 3 | ||||
-rw-r--r-- | filter/source/flash/swfwriter1.cxx | 2 | ||||
-rw-r--r-- | filter/source/svg/svgexport.cxx | 10 | ||||
-rw-r--r-- | filter/source/svg/svgwriter.cxx | 6 | ||||
-rw-r--r-- | filter/source/svg/svgwriter.hxx | 2 | ||||
-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 | ||||
-rw-r--r-- | svtools/source/graphic/grfcache.cxx | 4 | ||||
-rw-r--r-- | vcl/inc/impbmp.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/impgraph.hxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/animate.cxx | 8 | ||||
-rw-r--r-- | vcl/source/gdi/bitmap.cxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/bitmapex.cxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/gdimtf.cxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/graph.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/impbmp.cxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/impgraph.cxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/pdfwriter_impl.hxx | 4 |
25 files changed, 58 insertions, 51 deletions
diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx index 8b6be55e7341..8021b087c5a1 100644 --- a/filter/source/flash/swfexporter.cxx +++ b/filter/source/flash/swfexporter.cxx @@ -431,8 +431,8 @@ sal_uInt16 FlashExporter::exportDrawPageBackground(sal_uInt16 nPage, Reference< getMetaFile( xCompMaster, aMtfMaster, true ); getMetaFile( xComponent, aMtfPrivate, true ); - sal_uInt32 masterchecksum = aMtfMaster.GetChecksum(); - sal_uInt32 privatechecksum = aMtfPrivate.GetChecksum(); + BitmapChecksum masterchecksum = aMtfMaster.GetChecksum(); + BitmapChecksum privatechecksum = aMtfPrivate.GetChecksum(); // AS: If the slide has its own background if (privatechecksum) @@ -484,7 +484,7 @@ sal_uInt16 FlashExporter::exportMasterPageObjects(sal_uInt16 nPage, Reference< X { Reference< XShapes > xShapes( xMasterPage, UNO_QUERY ); - sal_uInt32 shapesum = ActionSummer(xShapes); + BitmapChecksum shapesum = ActionSummer(xShapes); ChecksumCache::iterator it = gObjectCache.find(shapesum); @@ -631,7 +631,7 @@ void FlashExporter::exportShape( const Reference< XShape >& xShape, bool bMaster getMetaFile( xComponent, aMtf, false, true ); sal_uInt16 nID; - sal_uInt32 checksum = aMtf.GetChecksum(); + BitmapChecksum checksum = aMtf.GetChecksum(); ChecksumCache::iterator it = gMetafileCache.find(checksum); @@ -748,7 +748,7 @@ bool FlashExporter::getMetaFile( Reference< XComponent >&xComponent, GDIMetaFile return rMtf.GetActionSize() != 0; } -sal_uInt32 FlashExporter::ActionSummer(Reference< XShape >& xShape) +BitmapChecksum FlashExporter::ActionSummer(Reference< XShape >& xShape) { Reference< XShapes > xShapes( xShape, UNO_QUERY ); @@ -767,10 +767,10 @@ sal_uInt32 FlashExporter::ActionSummer(Reference< XShape >& xShape) } } -sal_uInt32 FlashExporter::ActionSummer(Reference< XShapes >& xShapes) +BitmapChecksum FlashExporter::ActionSummer(Reference< XShapes >& xShapes) { sal_uInt32 nShapeCount = xShapes->getCount(); - sal_uInt32 shapecount = 0; + BitmapChecksum shapecount = 0; Reference< XShape > xShape2; diff --git a/filter/source/flash/swfexporter.hxx b/filter/source/flash/swfexporter.hxx index b1c50240c401..7b086693cd72 100644 --- a/filter/source/flash/swfexporter.hxx +++ b/filter/source/flash/swfexporter.hxx @@ -29,11 +29,12 @@ #include <com/sun/star/presentation/ClickAction.hpp> #include <com/sun/star/presentation/FadeEffect.hpp> #include <osl/file.hxx> +#include <vcl/checksum.hxx> #include <vector> #include <map> -typedef ::std::map<sal_uInt32, sal_uInt16> ChecksumCache; +typedef ::std::map<BitmapChecksum, sal_uInt16> ChecksumCache; class GDIMetaFile; @@ -179,8 +180,8 @@ private: void exportShapes( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xShapes, bool bStream, bool bMaster ); void exportShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, bool bMaster); - sal_uInt32 ActionSummer(::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape); - sal_uInt32 ActionSummer(::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xShapes); + BitmapChecksum ActionSummer(::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape); + BitmapChecksum ActionSummer(::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xShapes); bool getMetaFile( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >&xComponent, GDIMetaFile& rMtf, bool bOnlyBackground = false, bool bExportAsJPEG = false ); diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx index 19e5235ad0cf..a9a795f34de7 100644 --- a/filter/source/flash/swfwriter.hxx +++ b/filter/source/flash/swfwriter.hxx @@ -23,6 +23,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/i18n/XBreakIterator.hpp> +#include <vcl/checksum.hxx> #include <vcl/font.hxx> #include <vcl/gradient.hxx> #include <vcl/vclptr.hxx> @@ -106,7 +107,7 @@ sal_uInt32 getFixed( double fValue ); -typedef ::std::map<sal_uInt32, sal_uInt16> ChecksumCache; +typedef ::std::map<BitmapChecksum, sal_uInt16> ChecksumCache; /** unsigned int 16 compare operation for stl */ struct ltuint16 diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx index db9f332d7b8a..ac7f94dfed62 100644 --- a/filter/source/flash/swfwriter1.cxx +++ b/filter/source/flash/swfwriter1.cxx @@ -787,7 +787,7 @@ void getBitmapData( const BitmapEx& aBmpEx, sal_uInt8*& tgadata, sal_uInt8*& tga sal_uInt16 Writer::defineBitmap( const BitmapEx &bmpSource, sal_Int32 nJPEGQualityLevel ) { - const sal_uInt32 bmpChecksum = bmpSource.GetChecksum(); + BitmapChecksum bmpChecksum = bmpSource.GetChecksum(); ChecksumCache::iterator it = mBitmapCache.find(bmpChecksum); diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 87891dcce71d..1773740f5754 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -424,9 +424,9 @@ bool ObjectRepresentation::operator==( const ObjectRepresentation& rPresentation namespace { -sal_uInt32 GetBitmapChecksum( const MetaAction* pAction ) +BitmapChecksum GetBitmapChecksum( const MetaAction* pAction ) { - sal_uInt32 nChecksum = 0; + BitmapChecksum nChecksum = 0; const MetaActionType nType = pAction->GetType(); switch( nType ) @@ -509,8 +509,8 @@ bool EqualityBitmap::operator()( const ObjectRepresentation& rObjRep1, const GDIMetaFile& aMtf2 = rObjRep2.GetRepresentation(); if( aMtf1.GetActionSize() == 1 && aMtf2.GetActionSize() == 1 ) { - const sal_uInt32 nChecksum1 = GetBitmapChecksum( aMtf1.GetAction( 0 ) ); - const sal_uInt32 nChecksum2 = GetBitmapChecksum( aMtf2.GetAction( 0 ) ); + BitmapChecksum nChecksum1 = GetBitmapChecksum( aMtf1.GetAction( 0 ) ); + BitmapChecksum nChecksum2 = GetBitmapChecksum( aMtf2.GetAction( 0 ) ); return ( nChecksum1 == nChecksum2 ); } else @@ -1302,7 +1302,7 @@ bool SVGFilter::implExportTextEmbeddedBitmaps() MetaAction* pAction = aMtf.GetAction( 0 ); if( pAction ) { - const sal_uInt32 nId = GetBitmapChecksum( pAction ); + BitmapChecksum nId = GetBitmapChecksum( pAction ); sId = "bitmap(" + OUString::number( nId ) + ")"; mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", sId ); diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 73c01f2f7fdc..62b9f29afd26 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -1359,7 +1359,7 @@ void SVGTextWriter::writeBitmapPlaceholder( const MetaBitmapActionType* pAction } // bitmap placeholder element - const sal_uInt32 nId = SVGActionWriter::GetChecksum( pAction ); + BitmapChecksum nId = SVGActionWriter::GetChecksum( pAction ); OUString sId = "bitmap-placeholder(" + msShapeId + "." + OUString::number( nId ) + ")"; @@ -1381,7 +1381,7 @@ void SVGTextWriter::implWriteEmbeddedBitmaps() const GDIMetaFile& rMtf = *mpTextEmbeddedBitmapMtf; OUString sId, sRefId; - sal_uInt32 nChecksum = 0; + BitmapChecksum nId, nChecksum = 0; Point aPt; Size aSz; sal_uLong nCount = rMtf.GetActionSize(); @@ -1779,7 +1779,7 @@ OUString SVGActionWriter::GetPathString( const tools::PolyPolygon& rPolyPoly, bo return aPathData; } -sal_uInt32 SVGActionWriter::GetChecksum( const MetaAction* pAction ) +BitmapChecksum SVGActionWriter::GetChecksum( const MetaAction* pAction ) { GDIMetaFile aMtf; MetaAction* pA = const_cast<MetaAction*>(pAction); diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index e96e5169ff08..280bd52c18f7 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -357,7 +357,7 @@ private: public: static OUString GetPathString( const tools::PolyPolygon& rPolyPoly, bool bLine ); - static sal_uInt32 GetChecksum( const MetaAction* pAction ); + static BitmapChecksum GetChecksum( const MetaAction* pAction ); public: diff --git a/include/vcl/alpha.hxx b/include/vcl/alpha.hxx index 8aba78d72418..e9439069e1c0 100644 --- a/include/vcl/alpha.hxx +++ b/include/vcl/alpha.hxx @@ -49,7 +49,7 @@ public: Size GetSizePixel() const { return Bitmap::GetSizePixel(); } - sal_uInt32 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 7650d6ffc45c..801d9e42d7c8 100644 --- a/include/vcl/animate.hxx +++ b/include/vcl/animate.hxx @@ -88,7 +88,7 @@ struct VCL_DLLPUBLIC AnimationBitmap { return !( *this == rAnimBmp ); } - sal_uInt32 GetChecksum() const; + BitmapChecksum GetChecksum() const; }; struct AInfo @@ -162,7 +162,7 @@ public: void Replace( const AnimationBitmap& rNewAnimationBmp, sal_uInt16 nAnimation ); sal_uLong GetSizeBytes() const; - sal_uInt32 GetChecksum() const; + BitmapChecksum GetChecksum() const; public: diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index af92b3e4394d..ddb6b3280fa3 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -23,6 +23,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> @@ -289,7 +290,7 @@ public: */ bool GetSystemData( BitmapSystemData& rData ) const; - sal_uInt32 GetChecksum() const; + BitmapChecksum GetChecksum() const; Bitmap CreateDisplayBitmap( OutputDevice* pDisplay ); diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx index a4b78572ed57..8d9b8ec4dbb4 100644 --- a/include/vcl/bitmapex.hxx +++ b/include/vcl/bitmapex.hxx @@ -91,7 +91,7 @@ public: sal_uInt16 GetBitCount() const { return aBitmap.GetBitCount(); } sal_uLong GetSizeBytes() const; - sal_uInt32 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 1ffb9dca467b..47509334f7e2 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -190,7 +190,7 @@ public: void SetPrefMapMode( const MapMode& rMapMode ) { aPrefMapMode = rMapMode; } - sal_uInt32 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 a99408d13ddb..cc2890dcf898 100644 --- a/include/vcl/graph.hxx +++ b/include/vcl/graph.hxx @@ -158,9 +158,9 @@ public: void SetAnimationNotifyHdl( const Link<>& rLink ); Link<> GetAnimationNotifyHdl() const; - sal_uLong GetAnimationLoopCount() const; + sal_uLong GetAnimationLoopCount() const; - sal_uInt32 GetChecksum() const; + BitmapChecksum GetChecksum() const; public: diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx index c7b573e772fb..25ae4f452851 100644 --- a/svtools/source/graphic/grfcache.cxx +++ b/svtools/source/graphic/grfcache.cxx @@ -43,7 +43,7 @@ private: sal_uInt32 mnID1; sal_uInt32 mnID2; sal_uInt32 mnID3; - sal_uInt32 mnID4; + BitmapChecksum mnID4; public: @@ -134,7 +134,7 @@ OString GraphicID::GetIDString() const for( nShift = 28; nShift >= 0; nShift -= 4 ) aHexStr[nIndex++] = aHexData[ ( mnID3 >> (sal_uInt32) nShift ) & 0xf ]; - for( nShift = 28; nShift >= 0; nShift -= 4 ) + for( nShift = BITMAP_CHECKSUM_BITS - 4; nShift >= 0; nShift -= 4 ) aHexStr[nIndex++] = aHexData[ ( mnID4 >> (sal_uInt32) nShift ) & 0xf ]; return aHexStr.makeStringAndClear(); diff --git a/vcl/inc/impbmp.hxx b/vcl/inc/impbmp.hxx index 9dd483a8a7f1..f2bd27dd352f 100644 --- a/vcl/inc/impbmp.hxx +++ b/vcl/inc/impbmp.hxx @@ -69,7 +69,7 @@ public: void ImplIncRefCount() { mnRefCount++; } void ImplDecRefCount() { mnRefCount--; } - sal_uLong ImplGetChecksum() const; + BitmapChecksum ImplGetChecksum() const; void ImplInvalidateChecksum(); bool ImplScale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ); diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx index b68e6d3484d0..51937b5e9349 100644 --- a/vcl/inc/impgraph.hxx +++ b/vcl/inc/impgraph.hxx @@ -145,7 +145,7 @@ private: GfxLink ImplGetLink(); bool ImplIsLink() const; - sal_uInt32 ImplGetChecksum() const; + BitmapChecksum ImplGetChecksum() const; bool ImplExportNative( SvStream& rOStm ) const; diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index c1f8f4b4123a..cb5c934be8d2 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -31,9 +31,9 @@ sal_uLong Animation::mnAnimCount = 0UL; -sal_uInt32 AnimationBitmap::GetChecksum() const +BitmapChecksum AnimationBitmap::GetChecksum() const { - sal_uInt32 nCrc = aBmpEx.GetChecksum(); + BitmapChecksum nCrc = aBmpEx.GetChecksum(); SVBT32 aBT32; UInt32ToSVBT32( aPosPix.X(), aBT32 ); @@ -206,10 +206,10 @@ sal_uLong Animation::GetSizeBytes() const return nSizeBytes; } -sal_uInt32 Animation::GetChecksum() const +BitmapChecksum Animation::GetChecksum() const { SVBT32 aBT32; - sal_uInt32 nCrc = GetBitmapEx().GetChecksum(); + BitmapChecksum nCrc = GetBitmapEx().GetChecksum(); UInt32ToSVBT32( maList.size(), aBT32 ); nCrc = rtl_crc32( nCrc, aBT32, 4 ); diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx index 6f96c050685d..23b752b4b21b 100644 --- a/vcl/source/gdi/bitmap.cxx +++ b/vcl/source/gdi/bitmap.cxx @@ -284,9 +284,9 @@ bool Bitmap::HasGreyPalette() const return bRet; } -sal_uInt32 Bitmap::GetChecksum() const +BitmapChecksum Bitmap::GetChecksum() const { - sal_uInt32 nRet = 0; + BitmapChecksum nRet = 0; if( mpImpBmp ) { diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index 1a28a2536c21..9559e9fe41fc 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -308,9 +308,9 @@ sal_uLong BitmapEx::GetSizeBytes() const return nSizeBytes; } -sal_uInt32 BitmapEx::GetChecksum() const +BitmapChecksum BitmapEx::GetChecksum() const { - sal_uInt32 nCrc = aBitmap.GetChecksum(); + BitmapChecksum nCrc = aBitmap.GetChecksum(); SVBT32 aBT32; UInt32ToSVBT32( (long) eTransparent, aBT32 ); diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index 9979e3cc3fe1..a4946bb81117 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -2340,14 +2340,14 @@ GDIMetaFile GDIMetaFile::GetMonochromeMtf( const Color& rColor ) const return aRet; } -sal_uInt32 GDIMetaFile::GetChecksum() const +BitmapChecksum GDIMetaFile::GetChecksum() const { GDIMetaFile aMtf; SvMemoryStream aMemStm( 65535, 65535 ); ImplMetaWriteData aWriteData; SVBT16 aBT16; SVBT32 aBT32; - sal_uInt32 nCrc = 0; + BitmapChecksum nCrc = 0; aWriteData.meActualCharSet = aMemStm.GetStreamCharSet(); for( size_t i = 0, nObjCount = GetActionSize(); i < nObjCount; i++ ) diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx index 93acaa1d8914..9eafd5083da3 100644 --- a/vcl/source/gdi/graph.cxx +++ b/vcl/source/gdi/graph.cxx @@ -535,7 +535,7 @@ bool Graphic::IsLink() const return mpImpGraphic->ImplIsLink(); } -sal_uInt32 Graphic::GetChecksum() const +BitmapChecksum Graphic::GetChecksum() const { return mpImpGraphic->ImplGetChecksum(); } diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx index f70012202b07..baf21913b288 100644 --- a/vcl/source/gdi/impbmp.cxx +++ b/vcl/source/gdi/impbmp.cxx @@ -92,11 +92,11 @@ void ImpBitmap::ImplReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ImplInvalidateChecksum(); } -sal_uLong ImpBitmap::ImplGetChecksum() const +BitmapChecksum ImpBitmap::ImplGetChecksum() const { SalBitmap::ChecksumType aChecksum; mpSalBitmap->GetChecksum(aChecksum); - sal_uLong a32BitChecksum = aChecksum; + BitmapChecksum a32BitChecksum = aChecksum; return a32BitChecksum; } diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 9dc9a32297a4..72abc23f84f2 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -1360,9 +1360,9 @@ bool ImpGraphic::ImplIsLink() const return ( mpGfxLink != NULL ); } -sal_uInt32 ImpGraphic::ImplGetChecksum() const +BitmapChecksum ImpGraphic::ImplGetChecksum() const { - sal_uInt32 nRet = 0; + BitmapChecksum nRet = 0; if( ImplIsSupportedGraphic() && !ImplIsSwapOut() ) { diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index 43081aa96afd..c9affe6bc942 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -177,8 +177,8 @@ public: { Size m_aPixelSize; sal_Int32 m_nSize; - sal_Int32 m_nChecksum; - sal_Int32 m_nMaskChecksum; + BitmapChecksum m_nChecksum; + BitmapChecksum m_nMaskChecksum; BitmapID() : m_nSize( 0 ), m_nChecksum( 0 ), m_nMaskChecksum( 0 ) {} |