diff options
| -rw-r--r-- | vcl/opengl/salbmp.cxx | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx index e76ebd7cbfc8..05a55d7d504e 100644 --- a/vcl/opengl/salbmp.cxx +++ b/vcl/opengl/salbmp.cxx @@ -141,9 +141,15 @@ bool OpenGLSalBitmap::Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount // execute any pending operations on the source bitmap maTexture = rSourceBitmap.GetTexture(); mbDirtyTexture = false; + + // be careful here, we are share & reference-count the + // maUserBuffer, BUT this Create() is called from + // Bitmap::ImplMakeUnique(). + // Consequently, there might be cases when this needs to be made + // unique later (when we don't do that right away here), like when + // using the BitmapWriteAccess. maUserBuffer = rSourceBitmap.maUserBuffer; - // TODO Copy buffer data if the bitcount and palette are the same return true; } return false; @@ -649,6 +655,16 @@ BitmapBuffer* OpenGLSalBitmap::AcquireBuffer( BitmapAccessMode nMode ) } } + // maUserBuffer must be unique when we are doing the write access + if (nMode == BITMAP_WRITE_ACCESS && maUserBuffer && !maUserBuffer.unique()) + { + basebmp::RawMemorySharedArray aBuffer(maUserBuffer); + + maUserBuffer.reset(); + AllocateUserData(); + memcpy(maUserBuffer.get(), aBuffer.get(), static_cast<sal_uInt32>(mnBytesPerRow) * mnHeight); + } + BitmapBuffer* pBuffer = new BitmapBuffer; pBuffer->mnWidth = mnWidth; pBuffer->mnHeight = mnHeight; |