[Libreoffice-commits] core.git: filter/source

[Caolán McNamara]

 filter/source/graphicfilter/ipict/ipict.cxx |    7 -------
 1 file changed, 7 deletions(-)

New commits:
commit e4f7e197f73bee4f9546528271f63a36d9ea0c89
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jan 29 21:22:36 2017 +0000

    we don't need read access, only write
    
    Change-Id: If9720a402ce360fd691a4ce83f267e2d19e19652

diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index d948d50..aa4af80 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -304,8 +304,6 @@ public:
 {                                                       \
     if ( pAcc )                                         \
         Bitmap::ReleaseAccess( pAcc );                  \
-    if ( pReadAcc )                                     \
-        Bitmap::ReleaseAccess( pReadAcc );              \
     return 0xffffffff;                                  \
 }
 
@@ -705,7 +703,6 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool bBaseAddr, bool bColo
 {
     Bitmap              aBitmap;
     BitmapWriteAccess*  pAcc = nullptr;
-    BitmapReadAccess*   pReadAcc = nullptr;
     sal_uInt16              nColTabSize;
     sal_uInt16              nRowBytes, nBndX, nBndY, nWidth, nHeight, nPackType,
                         nPixelSize, nCmpCount, nCmpSize;
@@ -1018,8 +1015,6 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool bBaseAddr, bool bColo
         size_t              nCount;
         sal_uLong           nSrcBitsPos;
         BitmapColor         aBitmapColor;
-        if ( ( pReadAcc = aBitmap.AcquireReadAccess() ) == nullptr )
-            BITMAPERROR;
         if ( nRowBytes != 4*nWidth )
             BITMAPERROR;
 
@@ -1126,8 +1121,6 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool bBaseAddr, bool bColo
     }
     else
         BITMAPERROR;
-    if ( pReadAcc )
-        Bitmap::ReleaseAccess( pReadAcc );
     Bitmap::ReleaseAccess( pAcc );
     rBitmap = aBitmap;
     return nDataSize;