diff options
author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/platform/image-encoders | |
parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/platform/image-encoders')
-rw-r--r-- | Source/WebCore/platform/image-encoders/JPEGImageEncoder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/image-encoders/JPEGImageEncoder.cpp b/Source/WebCore/platform/image-encoders/JPEGImageEncoder.cpp index d707aa8..a4ee4fd 100644 --- a/Source/WebCore/platform/image-encoders/JPEGImageEncoder.cpp +++ b/Source/WebCore/platform/image-encoders/JPEGImageEncoder.cpp @@ -65,7 +65,7 @@ static void jpegInitializeDestination(j_compress_ptr compressData) static boolean jpegEmptyOutputBuffer(j_compress_ptr compressData) { JPEGDestinationManager* dest = static_cast<JPEGDestinationManager*>(compressData->dest); - dest->m_dump.append(dest->m_buffer.data(), dest->m_buffer.size() - dest->free_in_buffer); + dest->m_dump.append(dest->m_buffer.data(), dest->m_buffer.size()); dest->next_output_byte = reinterpret_cast<JOCTET*>(dest->m_buffer.data()); dest->free_in_buffer = dest->m_buffer.size(); return TRUE; |