diff options
| author | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-08-01 20:18:45 +0000 |
|---|---|---|
| committer | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-08-01 20:18:45 +0000 |
| commit | 9a92670322442238277aa5a998c0841762ba7d41 (patch) | |
| tree | bc291655ee1a338ff3d85d2dd74095060f5b6614 /ports/SkImageDecoder_WIC.cpp | |
| parent | 513776788194d255b64831265c30e6fdebf95f87 (diff) | |
| download | src-9a92670322442238277aa5a998c0841762ba7d41.tar.gz | |
Make WIC encoder lock the bitmap pixels.
http://codereview.appspot.com/4832045/
git-svn-id: http://skia.googlecode.com/svn/trunk/src@2016 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'ports/SkImageDecoder_WIC.cpp')
| -rw-r--r-- | ports/SkImageDecoder_WIC.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ports/SkImageDecoder_WIC.cpp b/ports/SkImageDecoder_WIC.cpp index fc15ef4a..48a927d0 100644 --- a/ports/SkImageDecoder_WIC.cpp +++ b/ports/SkImageDecoder_WIC.cpp @@ -121,7 +121,7 @@ bool SkImageDecoder_WIC::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) { //Copy the pixels into the bitmap. if (SUCCEEDED(hr)) { - bm->lockPixels(); + SkAutoLockPixels alp(*bm); bm->eraseColor(0); const int stride = bm->rowBytes(); hr = piBitmapSourceConverted->CopyPixels( @@ -130,7 +130,6 @@ bool SkImageDecoder_WIC::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) { stride * height, reinterpret_cast<BYTE *>(bm->getPixels()) ); - bm->unlockPixels(); } return SUCCEEDED(hr); @@ -268,6 +267,7 @@ bool SkImageEncoder_WIC::onEncode(SkWStream* stream //Write the pixels into the frame. if (SUCCEEDED(hr)) { + SkAutoLockPixels alp(*bitmap); hr = piBitmapFrameEncode->WritePixels( height , bitmap->rowBytes() |