| OLD | NEW |
| 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/fxcodec/codec/codec_int.h" | 9 #include "core/fxcodec/codec/codec_int.h" |
| 10 #include "core/fxcodec/include/fx_codec.h" |
| 10 #include "core/fxge/include/fx_dib.h" | 11 #include "core/fxge/include/fx_dib.h" |
| 11 #include "core/include/fxcodec/fx_codec.h" | |
| 12 | 12 |
| 13 extern "C" { | 13 extern "C" { |
| 14 #undef FAR | 14 #undef FAR |
| 15 #include "third_party/libpng16/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); |
| (...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 } |
| OLD | NEW |