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

Side by Side Diff: third_party/libpng16/png.c

Issue 1607053003: XFA: Unconditionally use static png_gt() in png.c (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: README.pdfium 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 | « third_party/libpng16/README.pdfium ('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 1
2 /* png.c - location for general purpose libpng functions 2 /* png.c - location for general purpose libpng functions
3 * 3 *
4 * Last changed in libpng 1.6.19 [November 12, 2015] 4 * Last changed in libpng 1.6.19 [November 12, 2015]
5 * Copyright (c) 1998-2015 Glenn Randers-Pehrson 5 * Copyright (c) 1998-2015 Glenn Randers-Pehrson
6 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) 6 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
7 * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) 7 * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
8 * 8 *
9 * This code is released under the libpng license. 9 * This code is released under the libpng license.
10 * For conditions of distribution and use, see the disclaimer 10 * For conditions of distribution and use, see the disclaimer
(...skipping 2446 matching lines...) Expand 10 before | Expand all | Expand 10 after
2457 * bug is fixed. 2457 * bug is fixed.
2458 */ 2458 */
2459 else 2459 else
2460 png_error(png_ptr, "internal error handling cHRM->XYZ"); 2460 png_error(png_ptr, "internal error handling cHRM->XYZ");
2461 } 2461 }
2462 } 2462 }
2463 #endif /* READ_RGB_TO_GRAY */ 2463 #endif /* READ_RGB_TO_GRAY */
2464 2464
2465 #endif /* COLORSPACE */ 2465 #endif /* COLORSPACE */
2466 2466
2467 #ifdef __GNUC__ 2467 /* #ifdef __GNUC__ */
Nico 2016/01/19 21:46:23 other possible fixes: * Change this line to `#if
Oliver Chang 2016/01/19 22:35:46 Hmm, I think this is still a valuable warning to k
2468 #if 1
2468 /* This exists solely to work round a warning from GNU C. */ 2469 /* This exists solely to work round a warning from GNU C. */
2469 static int /* PRIVATE */ 2470 static int /* PRIVATE */
2470 png_gt(size_t a, size_t b) 2471 png_gt(size_t a, size_t b)
2471 { 2472 {
2472 return a > b; 2473 return a > b;
2473 } 2474 }
2474 #else 2475 #else
2475 # define png_gt(a,b) ((a) > (b)) 2476 # define png_gt(a,b) ((a) > (b))
2476 #endif 2477 #endif
2477 2478
(...skipping 2011 matching lines...) Expand 10 before | Expand all | Expand 10 after
4489 { 4490 {
4490 /* Utility to log an error. */ 4491 /* Utility to log an error. */
4491 png_safecat(image->message, (sizeof image->message), 0, error_message); 4492 png_safecat(image->message, (sizeof image->message), 0, error_message);
4492 image->warning_or_error |= PNG_IMAGE_ERROR; 4493 image->warning_or_error |= PNG_IMAGE_ERROR;
4493 png_image_free(image); 4494 png_image_free(image);
4494 return 0; 4495 return 0;
4495 } 4496 }
4496 4497
4497 #endif /* SIMPLIFIED READ/WRITE */ 4498 #endif /* SIMPLIFIED READ/WRITE */
4498 #endif /* READ || WRITE */ 4499 #endif /* READ || WRITE */
OLDNEW
« no previous file with comments | « third_party/libpng16/README.pdfium ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698