Skip to content

Port "move pixelate filter to gd_filter.c" (sync with upstream) #17361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 5, 2025

Conversation

cmb69
Copy link
Member

@cmb69 cmb69 commented Jan 4, 2025

@nielsdos
Copy link
Member

nielsdos commented Jan 4, 2025

Is the goal to completely sync all upstream fixes into bundled libgd? How do you approach this?

@cmb69
Copy link
Member Author

cmb69 commented Jan 4, 2025

Is the goal to completely sync all upstream fixes into bundled libgd?

My goal is to finally unbundle libgd (this is long overdue; the double maintenance is a nightmare). Since this can't happen right away (one show-stopper are missing custom allocators; in my opinion particularly important for image reading), I'm trying to pave the way to get both in sync (without too much BC breaks in one version; I don't see unbundling or complete sync as realistic option for PHP 8.5).

Note that this is not one-way, though. There are some cases where our bundled libgd seems to be correct, but not external (e.g. libgd/libgd#928).

How do you approach this?

Pretty much ad-hoc. Doing some diffs, ignoring minor differences (such as formatting and comments), focusing on relevant differences. And not to step on my toes with too many conflicting PRs. :)

@nielsdos
Copy link
Member

nielsdos commented Jan 4, 2025

I see. Note that there is some PHP-specific code in the bundled (search for e.g. VCWD) so they might not reach equivalence easily.

@cmb69
Copy link
Member Author

cmb69 commented Jan 5, 2025

Note that there is some PHP-specific code in the bundled (search for e.g. VCWD) so they might not reach equivalence easily.

Yeah, but at least some of that is broken anyway (see https://bugs.php.net/64823).

@cmb69 cmb69 merged commit a3ef48c into php:master Jan 5, 2025
10 checks passed
@cmb69 cmb69 deleted the cmb/move-pixelate branch January 5, 2025 10:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants