diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-18 01:51:37 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-18 01:51:37 +0000 |
| commit | ddc6d877066d01a136e1b40c86865760d8cf414a (patch) | |
| tree | 35b8c1ca59daebf2cf2c8770943fed28206ea094 /ui | |
| parent | 0a57c025d1e88036c4ae01b3293a74fc84834d04 (diff) | |
| download | chromium_src-ddc6d877066d01a136e1b40c86865760d8cf414a.zip chromium_src-ddc6d877066d01a136e1b40c86865760d8cf414a.tar.gz chromium_src-ddc6d877066d01a136e1b40c86865760d8cf414a.tar.bz2 | |
Generate shim headers for libpng
BUG=165264
Review URL: https://codereview.chromium.org/11470020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173618 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gfx/codec/png_codec.cc | 4 | ||||
| -rw-r--r-- | ui/gfx/codec/png_codec_unittest.cc | 7 |
2 files changed, 1 insertions, 10 deletions
diff --git a/ui/gfx/codec/png_codec.cc b/ui/gfx/codec/png_codec.cc index 474fbc9..e0dc4c6 100644 --- a/ui/gfx/codec/png_codec.cc +++ b/ui/gfx/codec/png_codec.cc @@ -14,11 +14,7 @@ #include "third_party/skia/include/core/SkColorPriv.h" extern "C" { -#if defined(USE_SYSTEM_LIBPNG) -#include <png.h> -#else #include "third_party/libpng/png.h" -#endif #if defined(USE_SYSTEM_ZLIB) #include <zlib.h> diff --git a/ui/gfx/codec/png_codec_unittest.cc b/ui/gfx/codec/png_codec_unittest.cc index 83f535e..ef21d38 100644 --- a/ui/gfx/codec/png_codec_unittest.cc +++ b/ui/gfx/codec/png_codec_unittest.cc @@ -2,17 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#if defined(USE_SYSTEM_LIBPNG) -#include <png.h> -#else -#include "third_party/libpng/png.h" -#endif - #include <algorithm> #include <cmath> #include "base/logging.h" #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/libpng/png.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColorPriv.h" #include "third_party/skia/include/core/SkUnPreMultiply.h" |