OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ui/gfx/codec/png_codec.h" | 5 #include "ui/gfx/codec/png_codec.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
10 #include "ui/gfx/size.h" | 10 #include "ui/gfx/size.h" |
11 #include "ui/gfx/skia_util.h" | 11 #include "ui/gfx/skia_util.h" |
12 #include "third_party/skia/include/core/SkBitmap.h" | 12 #include "third_party/skia/include/core/SkBitmap.h" |
13 #include "third_party/skia/include/core/SkUnPreMultiply.h" | 13 #include "third_party/skia/include/core/SkUnPreMultiply.h" |
14 #include "third_party/skia/include/core/SkColorPriv.h" | 14 #include "third_party/skia/include/core/SkColorPriv.h" |
15 | 15 |
16 extern "C" { | 16 extern "C" { |
17 #if defined(USE_SYSTEM_LIBPNG) | |
18 #include <png.h> | |
19 #else | |
20 #include "third_party/libpng/png.h" | 17 #include "third_party/libpng/png.h" |
21 #endif | |
22 | 18 |
23 #if defined(USE_SYSTEM_ZLIB) | 19 #if defined(USE_SYSTEM_ZLIB) |
24 #include <zlib.h> | 20 #include <zlib.h> |
25 #else | 21 #else |
26 #include "third_party/zlib/zlib.h" | 22 #include "third_party/zlib/zlib.h" |
27 #endif | 23 #endif |
28 } | 24 } |
29 | 25 |
30 namespace gfx { | 26 namespace gfx { |
31 | 27 |
(...skipping 751 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
783 } | 779 } |
784 | 780 |
785 PNGCodec::Comment::Comment(const std::string& k, const std::string& t) | 781 PNGCodec::Comment::Comment(const std::string& k, const std::string& t) |
786 : key(k), text(t) { | 782 : key(k), text(t) { |
787 } | 783 } |
788 | 784 |
789 PNGCodec::Comment::~Comment() { | 785 PNGCodec::Comment::~Comment() { |
790 } | 786 } |
791 | 787 |
792 } // namespace gfx | 788 } // namespace gfx |
OLD | NEW |