|
| 1 | +From 83f11d630aa1cb6d5ceb292364412f7b0585a201 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Matt Jolly <kangie@gentoo.org> |
| 3 | +Date: Mon, 19 May 2025 11:21:10 -0700 |
| 4 | +Subject: [PATCH] Fix build with system libpng |
| 5 | + |
| 6 | +`cbc692a42241970e1da492d5b14326e81ecb1061` refactored |
| 7 | +`fxcodec::CFX_DIBAttribute` and changed the names of its members. |
| 8 | + |
| 9 | +Unfortunately this change appears to have been typo'd in the |
| 10 | +'system libpng' build path, which is not checked by CI, resulting |
| 11 | +in downstream build failures in Chromium. |
| 12 | + |
| 13 | +Signed-off-by: Matt Jolly <kangie@gentoo.org> |
| 14 | +Change-Id: Id4c2c24f76cb709a0bc78badcaf63eb9c5868fe3 |
| 15 | +Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/132130 |
| 16 | +Reviewed-by: Lei Zhang <thestig@chromium.org> |
| 17 | +Commit-Queue: Tom Sepez <tsepez@chromium.org> |
| 18 | +Reviewed-by: Tom Sepez <tsepez@chromium.org> |
| 19 | +--- |
| 20 | + AUTHORS | 1 + |
| 21 | + core/fxcodec/png/png_decoder.cpp | 4 ++-- |
| 22 | + 2 files changed, 3 insertions(+), 2 deletions(-) |
| 23 | + |
| 24 | +diff --git a/AUTHORS b/AUTHORS |
| 25 | +index 3cd57a711..567f8f5c9 100644 |
| 26 | +--- a/third_party/pdfium/AUTHORS |
| 27 | ++++ b/third_party/pdfium/AUTHORS |
| 28 | +@@ -32,6 +32,7 @@ Justin Pierce <brkfstmnchr@gmail.com> |
| 29 | + Ke Liu <stackexploit@gmail.com> |
| 30 | + Luật Nguyễn <manhluat93.php@gmail.com> |
| 31 | + Manuel Geißer <geisserml@gmail.com> |
| 32 | ++Matt Jolly <kangie@gentoo.org> |
| 33 | + Michael Doppler <m.doppler@gmail.com> |
| 34 | + Miklos Vajna <vmiklos@vmiklos.hu> |
| 35 | + Minh Trần <myoki.crystal@gmail.com> |
| 36 | +diff --git a/core/fxcodec/png/png_decoder.cpp b/core/fxcodec/png/png_decoder.cpp |
| 37 | +index 278e381ea..7b6edcd04 100644 |
| 38 | +--- a/third_party/pdfium/core/fxcodec/png/png_decoder.cpp |
| 39 | ++++ b/third_party/pdfium/core/fxcodec/png/png_decoder.cpp |
| 40 | +@@ -52,8 +52,8 @@ void _png_load_bmp_attribute(png_structp png_ptr, |
| 41 | + CFX_DIBAttribute* pAttribute) { |
| 42 | + if (pAttribute) { |
| 43 | + #if defined(PNG_pHYs_SUPPORTED) |
| 44 | +- pAttribute->xdpi_ = png_get_x_pixels_per_meter(png_ptr, info_ptr); |
| 45 | +- pAttribute->ydpi_ = png_get_y_pixels_per_meter(png_ptr, info_ptr); |
| 46 | ++ pAttribute->x_dpi_ = png_get_x_pixels_per_meter(png_ptr, info_ptr); |
| 47 | ++ pAttribute->y_dpi_ = png_get_y_pixels_per_meter(png_ptr, info_ptr); |
| 48 | + png_uint_32 res_x, res_y; |
| 49 | + int unit_type; |
| 50 | + png_get_pHYs(png_ptr, info_ptr, &res_x, &res_y, &unit_type); |
0 commit comments