vcl/inc/opengl/salbmp.hxx | 2 +- vcl/inc/salbmp.hxx | 10 ++++------ vcl/opengl/salbmp.cxx | 4 ++-- vcl/source/gdi/impbmp.cxx | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-)
New commits: commit 97b008d0e3a76d5b21ca6cc06fd84a90ed4593de Author: Noel Grandin <[email protected]> Date: Wed Jan 3 14:48:55 2018 +0200 drop ChecksumType typedef adds no value Change-Id: I14c168d16eb98eb8c065c4c9a8f2a486c59feebb Reviewed-on: https://gerrit.libreoffice.org/47341 Tested-by: Jenkins <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx index a060f09bdcb4..5c4fcd053464 100644 --- a/vcl/inc/opengl/salbmp.hxx +++ b/vcl/inc/opengl/salbmp.hxx @@ -47,7 +47,7 @@ private: virtual void updateChecksum() const override; - bool calcChecksumGL(OpenGLTexture& rInputTexture, ChecksumType& rChecksum) const; + bool calcChecksumGL(OpenGLTexture& rInputTexture, BitmapChecksum& rChecksum) const; public: OpenGLSalBitmap(); diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx index 574e6272d700..6053ab3d6ebd 100644 --- a/vcl/inc/salbmp.hxx +++ b/vcl/inc/salbmp.hxx @@ -38,8 +38,6 @@ class VCL_PLUGIN_PUBLIC SalBitmap { public: - typedef BitmapChecksum ChecksumType; - SalBitmap() : mnChecksum(0) , mbChecksumValid(false) @@ -76,7 +74,7 @@ public: return false; } - void GetChecksum(ChecksumType& rChecksum) const + void GetChecksum(BitmapChecksum& rChecksum) const { updateChecksum(); if (!mbChecksumValid) @@ -91,8 +89,8 @@ public: } protected: - ChecksumType mnChecksum; - bool mbChecksumValid; + BitmapChecksum mnChecksum; + bool mbChecksumValid; protected: virtual void updateChecksum() const @@ -100,7 +98,7 @@ protected: if (mbChecksumValid) return; - ChecksumType nCrc = 0; + BitmapChecksum nCrc = 0; SalBitmap* pThis = const_cast<SalBitmap*>(this); BitmapBuffer* pBuf = pThis->AcquireBuffer(BitmapAccessMode::Read); if (pBuf) diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx index b3f8f54c960f..93fcf0e670c2 100644 --- a/vcl/opengl/salbmp.cxx +++ b/vcl/opengl/salbmp.cxx @@ -642,7 +642,7 @@ sal_uInt16 OpenGLSalBitmap::GetBitCount() const return mnBits; } -bool OpenGLSalBitmap::calcChecksumGL(OpenGLTexture& rInputTexture, ChecksumType& rChecksum) const +bool OpenGLSalBitmap::calcChecksumGL(OpenGLTexture& rInputTexture, BitmapChecksum& rChecksum) const { OUString FragShader("areaHashCRC64TFragmentShader"); @@ -714,7 +714,7 @@ bool OpenGLSalBitmap::calcChecksumGL(OpenGLTexture& rInputTexture, ChecksumType& std::vector<sal_uInt8> aBuf( aFinalTexture.GetWidth() * aFinalTexture.GetHeight() * 4 ); aFinalTexture.Read(GL_RGBA, GL_UNSIGNED_BYTE, aBuf.data()); - ChecksumType nCrc = vcl_get_checksum(0, aBuf.data(), aBuf.size()); + BitmapChecksum nCrc = vcl_get_checksum(0, aBuf.data(), aBuf.size()); rChecksum = nCrc; return true; diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx index 5950da46d7cc..97b5182a7927 100644 --- a/vcl/source/gdi/impbmp.cxx +++ b/vcl/source/gdi/impbmp.cxx @@ -92,7 +92,7 @@ void ImpBitmap::ImplReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode BitmapChecksum ImpBitmap::ImplGetChecksum() const { - SalBitmap::ChecksumType aChecksum; + BitmapChecksum aChecksum; mpSalBitmap->GetChecksum(aChecksum); return aChecksum; } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
