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

Side by Side Diff: core/src/fxcodec/codec/fx_codec_png.cpp

Issue 1599513004: XFA: Rename libpng to libpng16. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Created 4 years, 11 months 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
« no previous file with comments | « core/src/fxcodec/codec/DEPS ('k') | samples/image_diff_png.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium 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 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "core/include/fxcodec/fx_codec.h" 9 #include "core/include/fxcodec/fx_codec.h"
10 #include "core/include/fxge/fx_dib.h" 10 #include "core/include/fxge/fx_dib.h"
11 #include "codec_int.h" 11 #include "codec_int.h"
12 12
13 extern "C" { 13 extern "C" {
14 #undef FAR 14 #undef FAR
15 #include "third_party/libpng/png.h" 15 #include "third_party/libpng16/png.h"
16 } 16 }
17 17
18 static void _png_error_data(png_structp png_ptr, png_const_charp error_msg) { 18 static void _png_error_data(png_structp png_ptr, png_const_charp error_msg) {
19 if (png_get_error_ptr(png_ptr)) { 19 if (png_get_error_ptr(png_ptr)) {
20 FXSYS_strncpy((char*)png_get_error_ptr(png_ptr), error_msg, 20 FXSYS_strncpy((char*)png_get_error_ptr(png_ptr), error_msg,
21 PNG_ERROR_SIZE - 1); 21 PNG_ERROR_SIZE - 1);
22 } 22 }
23 longjmp(png_jmpbuf(png_ptr), 1); 23 longjmp(png_jmpbuf(png_ptr), 1);
24 } 24 }
25 static void _png_warning_data(png_structp png_ptr, png_const_charp error_msg) {} 25 static void _png_warning_data(png_structp png_ptr, png_const_charp error_msg) {}
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 if (setjmp(png_jmpbuf(p->png_ptr))) { 247 if (setjmp(png_jmpbuf(p->png_ptr))) {
248 if (pAttribute && 248 if (pAttribute &&
249 0 == FXSYS_strcmp(m_szLastError, "Read Header Callback Error")) { 249 0 == FXSYS_strcmp(m_szLastError, "Read Header Callback Error")) {
250 _png_load_bmp_attribute(p->png_ptr, p->info_ptr, pAttribute); 250 _png_load_bmp_attribute(p->png_ptr, p->info_ptr, pAttribute);
251 } 251 }
252 return FALSE; 252 return FALSE;
253 } 253 }
254 png_process_data(p->png_ptr, p->info_ptr, (uint8_t*)src_buf, src_size); 254 png_process_data(p->png_ptr, p->info_ptr, (uint8_t*)src_buf, src_size);
255 return TRUE; 255 return TRUE;
256 } 256 }
OLDNEW
« no previous file with comments | « core/src/fxcodec/codec/DEPS ('k') | samples/image_diff_png.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698