| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "gfx/codec/jpeg_codec.h" | 5 #include "gfx/codec/jpeg_codec.h" |
| 6 | 6 |
| 7 #include <setjmp.h> | 7 #include <setjmp.h> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/scoped_ptr.h" | 10 #include "base/scoped_ptr.h" |
| (...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 526 | 526 |
| 527 SkBitmap* bitmap = new SkBitmap(); | 527 SkBitmap* bitmap = new SkBitmap(); |
| 528 bitmap->setConfig(SkBitmap::kARGB_8888_Config, w, h); | 528 bitmap->setConfig(SkBitmap::kARGB_8888_Config, w, h); |
| 529 bitmap->allocPixels(); | 529 bitmap->allocPixels(); |
| 530 memcpy(bitmap->getAddr32(0, 0), &data_vector[0], data_length); | 530 memcpy(bitmap->getAddr32(0, 0), &data_vector[0], data_length); |
| 531 | 531 |
| 532 return bitmap; | 532 return bitmap; |
| 533 } | 533 } |
| 534 | 534 |
| 535 } // namespace gfx | 535 } // namespace gfx |
| OLD | NEW |