summaryrefslogtreecommitdiffstats
path: root/chrome/common/jpeg_codec.cc
diff options
context:
space:
mode:
authordeanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-17 16:45:34 +0000
committerdeanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-17 16:45:34 +0000
commitbc9147a10c7287f285ddc1c246cc9d38cd5987c4 (patch)
tree0e8516815d0fd31b439a4cebe4baf8e9e94c98d6 /chrome/common/jpeg_codec.cc
parentc12bf1a1aa1a24d7f516b7e76428518c594d7da5 (diff)
downloadchromium_src-bc9147a10c7287f285ddc1c246cc9d38cd5987c4.zip
chromium_src-bc9147a10c7287f285ddc1c246cc9d38cd5987c4.tar.gz
chromium_src-bc9147a10c7287f285ddc1c246cc9d38cd5987c4.tar.bz2
Some initial work on compiling chrome/common/ on Linux.
Patch from Pawel Hajdan Jr. BUG=2410 Review URL: http://codereview.chromium.org/2929 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2311 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/jpeg_codec.cc')
-rw-r--r--chrome/common/jpeg_codec.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/common/jpeg_codec.cc b/chrome/common/jpeg_codec.cc
index 452c23d..08d5d45 100644
--- a/chrome/common/jpeg_codec.cc
+++ b/chrome/common/jpeg_codec.cc
@@ -514,7 +514,7 @@ SkBitmap* JPEGCodec::Decode(const unsigned char* input, size_t input_size) {
SkBitmap* bitmap = new SkBitmap();
bitmap->setConfig(SkBitmap::kARGB_8888_Config, w, h);
bitmap->allocPixels();
- memcpy(bitmap->getAddr32(0, 0), &data_vector[0], w * h * 4);
+ memcpy(bitmap->getAddr32(0, 0), &data_vector[0], data_length);
return bitmap;
}