Kaydet (Commit) e4f7e197 authored tarafından Caolán McNamara's avatar Caolán McNamara

we don't need read access, only write

Change-Id: If9720a402ce360fd691a4ce83f267e2d19e19652
üst a48c22e1
...@@ -304,8 +304,6 @@ public: ...@@ -304,8 +304,6 @@ public:
{ \ { \
if ( pAcc ) \ if ( pAcc ) \
Bitmap::ReleaseAccess( pAcc ); \ Bitmap::ReleaseAccess( pAcc ); \
if ( pReadAcc ) \
Bitmap::ReleaseAccess( pReadAcc ); \
return 0xffffffff; \ return 0xffffffff; \
} }
...@@ -705,7 +703,6 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool bBaseAddr, bool bColo ...@@ -705,7 +703,6 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool bBaseAddr, bool bColo
{ {
Bitmap aBitmap; Bitmap aBitmap;
BitmapWriteAccess* pAcc = nullptr; BitmapWriteAccess* pAcc = nullptr;
BitmapReadAccess* pReadAcc = nullptr;
sal_uInt16 nColTabSize; sal_uInt16 nColTabSize;
sal_uInt16 nRowBytes, nBndX, nBndY, nWidth, nHeight, nPackType, sal_uInt16 nRowBytes, nBndX, nBndY, nWidth, nHeight, nPackType,
nPixelSize, nCmpCount, nCmpSize; nPixelSize, nCmpCount, nCmpSize;
...@@ -1018,8 +1015,6 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool bBaseAddr, bool bColo ...@@ -1018,8 +1015,6 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool bBaseAddr, bool bColo
size_t nCount; size_t nCount;
sal_uLong nSrcBitsPos; sal_uLong nSrcBitsPos;
BitmapColor aBitmapColor; BitmapColor aBitmapColor;
if ( ( pReadAcc = aBitmap.AcquireReadAccess() ) == nullptr )
BITMAPERROR;
if ( nRowBytes != 4*nWidth ) if ( nRowBytes != 4*nWidth )
BITMAPERROR; BITMAPERROR;
...@@ -1126,8 +1121,6 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool bBaseAddr, bool bColo ...@@ -1126,8 +1121,6 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool bBaseAddr, bool bColo
} }
else else
BITMAPERROR; BITMAPERROR;
if ( pReadAcc )
Bitmap::ReleaseAccess( pReadAcc );
Bitmap::ReleaseAccess( pAcc ); Bitmap::ReleaseAccess( pAcc );
rBitmap = aBitmap; rBitmap = aBitmap;
return nDataSize; return nDataSize;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment