Skip to content

Overhaul GD test helpers and affected tests #17309

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.

Sign up for GitHub

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 9 commits into from
Jan 25, 2025
Merged

Overhaul GD test helpers and affected tests #17309

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
41e9f7e
Use type declarations instead of doc-block annotations
cmb69 Dec 31, 2024
b5234c7
Inline the terrible get_rgb() function
cmb69 Dec 31, 2024
93c8b70
Always traverse pixels in Z order
cmb69 Dec 31, 2024
518474f
Add assertions to avoid misuse of the functions
cmb69 Dec 31, 2024
8464a45
Drop implicit conversion to truecolor
cmb69 Dec 31, 2024
a0f2699
Merge similarity.inc into func.inc
cmb69 Dec 31, 2024
fc0b229
Simplify bug43475.phpt and bug64641.phpt
cmb69 Dec 31, 2024
9efc96f
Replace calc_image_dissimilarity() with the well-known mse()
cmb69 Dec 31, 2024
2f1d25f
review
cmb69 Jan 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 3 additions & 14 deletions ext/gd/tests/similarity.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,15 @@
* mainly useful for checking lossy compression.
*/

/**
* Gets the individual components of an RGB value.
*/
function get_rgb(int $color, &$red, &$green, &$blue): void
{
// assumes $color is an RGB value
$red = ($color >> 16) & 0xFF;
$green = ($color >> 8) & 0xFF;
$blue = $color & 0xFF;
}

/**
* Calculates the euclidean distance of two RGB values.
*/
function calc_pixel_distance(int $color1, int $color2): float
{
get_rgb($color1, $red1, $green1, $blue1);
get_rgb($color2, $red2, $green2, $blue2);
return sqrt(
pow($red1 - $red2, 2) + pow($green1 - $green2, 2) + pow($blue1 - $blue2, 2)
((($color1 >> 16) & 0xFF) - (($color2 >> 16) & 0xFF)) ** 2 +
((($color1 >> 8) & 0xFF) - (($color2 >> 8) & 0xFF)) ** 2 +
((($color1 >> 0) & 0xFF) - (($color2 >> 0) & 0xFF)) ** 2
);
}

Expand Down