| 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 "base/gfx/png_decoder.h" | 5 #include "base/gfx/png_decoder.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "third_party/skia/include/core/SkBitmap.h" | 8 #include "third_party/skia/include/core/SkBitmap.h" |
| 9 | 9 |
| 10 extern "C" { | 10 extern "C" { |
| 11 #if defined(USE_SYSTEM_LIBPNG) |
| 12 #include <png.h> |
| 13 #else |
| 11 #include "third_party/libpng/png.h" | 14 #include "third_party/libpng/png.h" |
| 15 #endif |
| 12 } | 16 } |
| 13 | 17 |
| 14 namespace { | 18 namespace { |
| 15 | 19 |
| 16 // Converts BGRA->RGBA and RGBA->BGRA. | 20 // Converts BGRA->RGBA and RGBA->BGRA. |
| 17 void ConvertBetweenBGRAandRGBA(const unsigned char* input, int pixel_width, | 21 void ConvertBetweenBGRAandRGBA(const unsigned char* input, int pixel_width, |
| 18 unsigned char* output) { | 22 unsigned char* output) { |
| 19 for (int x = 0; x < pixel_width; x++) { | 23 for (int x = 0; x < pixel_width; x++) { |
| 20 const unsigned char* pixel_in = &input[x * 4]; | 24 const unsigned char* pixel_in = &input[x * 4]; |
| 21 unsigned char* pixel_out = &output[x * 4]; | 25 unsigned char* pixel_out = &output[x * 4]; |
| (...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 364 } | 368 } |
| 365 bitmap_data[i + 3] = alpha; | 369 bitmap_data[i + 3] = alpha; |
| 366 bitmap_data[i] = (bgra[i] * alpha) >> 8; | 370 bitmap_data[i] = (bgra[i] * alpha) >> 8; |
| 367 bitmap_data[i + 1] = (bgra[i + 1] * alpha) >> 8; | 371 bitmap_data[i + 1] = (bgra[i + 1] * alpha) >> 8; |
| 368 bitmap_data[i + 2] = (bgra[i + 2] * alpha) >> 8; | 372 bitmap_data[i + 2] = (bgra[i + 2] * alpha) >> 8; |
| 369 } | 373 } |
| 370 | 374 |
| 371 bitmap->setIsOpaque(opaque); | 375 bitmap->setIsOpaque(opaque); |
| 372 return bitmap; | 376 return bitmap; |
| 373 } | 377 } |
| OLD | NEW |