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

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

Issue 1572523002: XFA: Remove relative includes outside of xfa/. (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
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 "../../../include/fxcodec/fx_codec.h" 7 #include "core/include/fxcodec/fx_codec.h"
8 #include "../../../include/fxge/fx_dib.h" 8 #include "core/include/fxge/fx_dib.h"
9 #include "codec_int.h" 9 #include "codec_int.h"
Tom Sepez 2016/01/08 18:07:18 ditto
10 10
11 extern "C" { 11 extern "C" {
12 #undef FAR 12 #undef FAR
13 #include "third_party/lpng_v163/png.h" 13 #include "third_party/lpng_v163/png.h"
14 } 14 }
15 15
16 static void _png_error_data(png_structp png_ptr, png_const_charp error_msg) { 16 static void _png_error_data(png_structp png_ptr, png_const_charp error_msg) {
17 if (png_get_error_ptr(png_ptr)) { 17 if (png_get_error_ptr(png_ptr)) {
18 FXSYS_strncpy((char*)png_get_error_ptr(png_ptr), error_msg, 18 FXSYS_strncpy((char*)png_get_error_ptr(png_ptr), error_msg,
19 PNG_ERROR_SIZE - 1); 19 PNG_ERROR_SIZE - 1);
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 if (setjmp(png_jmpbuf(p->png_ptr))) { 245 if (setjmp(png_jmpbuf(p->png_ptr))) {
246 if (pAttribute && 246 if (pAttribute &&
247 0 == FXSYS_strcmp(m_szLastError, "Read Header Callback Error")) { 247 0 == FXSYS_strcmp(m_szLastError, "Read Header Callback Error")) {
248 _png_load_bmp_attribute(p->png_ptr, p->info_ptr, pAttribute); 248 _png_load_bmp_attribute(p->png_ptr, p->info_ptr, pAttribute);
249 } 249 }
250 return FALSE; 250 return FALSE;
251 } 251 }
252 png_process_data(p->png_ptr, p->info_ptr, (uint8_t*)src_buf, src_size); 252 png_process_data(p->png_ptr, p->info_ptr, (uint8_t*)src_buf, src_size);
253 return TRUE; 253 return TRUE;
254 } 254 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698