Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(91)

Side by Side Diff: webkit/support/webkit_support_gfx.cc

Issue 11470020: Generate shim headers for libpng (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/gfx/codec/png_codec_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "build/build_config.h" 5 #include "build/build_config.h"
6 #include "webkit/support/webkit_support_gfx.h" 6 #include "webkit/support/webkit_support_gfx.h"
7 7
8 #include <stdlib.h> 8 #include <stdlib.h>
9 #include <string.h> 9 #include <string.h>
10 10
11 extern "C" { 11 extern "C" {
12 #if defined(USE_SYSTEM_LIBPNG)
13 #include <png.h>
14 #else
15 #include "third_party/libpng/png.h" 12 #include "third_party/libpng/png.h"
16 #endif
17 13
18 #if defined(USE_SYSTEM_ZLIB) 14 #if defined(USE_SYSTEM_ZLIB)
19 #include <zlib.h> 15 #include <zlib.h>
20 #else 16 #else
21 #include "third_party/zlib/zlib.h" 17 #include "third_party/zlib/zlib.h"
22 #endif 18 #endif
23 } 19 }
24 20
25 namespace webkit_support { 21 namespace webkit_support {
26 22
(...skipping 657 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 const std::string& checksum, 680 const std::string& checksum,
685 std::vector<unsigned char>* output) { 681 std::vector<unsigned char>* output) {
686 std::vector<Comment> comments; 682 std::vector<Comment> comments;
687 comments.push_back(Comment("checksum", checksum)); 683 comments.push_back(Comment("checksum", checksum));
688 return Encode(input, FORMAT_RGBA, 684 return Encode(input, FORMAT_RGBA,
689 width, height, row_byte_width, discard_transparency, 685 width, height, row_byte_width, discard_transparency,
690 comments, output); 686 comments, output);
691 } 687 }
692 688
693 } // namespace webkit_support 689 } // namespace webkit_support
OLDNEW
« no previous file with comments | « ui/gfx/codec/png_codec_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698