Skip to content
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

pcx: Switch test images out #2376

Merged
merged 1 commit into from
Nov 1, 2024
Merged

Conversation

lupine
Copy link
Contributor

@lupine lupine commented Nov 1, 2024

The PCX images included in #2364 have dubious licenses. The CGA ones may be LGPL or GPL (provenance breadcrumb: https://samples.ffmpeg.org/image-samples/pcx/cga/cga-pcx.txt ), while the marbles ones appear to be copyright O'Reilly, with no license grant (https://netghost.narod.ru/gff/sample/images/pcx/index.htm ).

It's worth noting that the tests/ directory is excluded from the crate build, but it's still worth swapping these out for an unambiguously OK image. To do that, I converted the tests/images/bmp/images/V5_24_Bit.bmp to a 24-bit PCX file:

$ file tests/images/pcx/images/24bit.pcx 
tests/images/pcx/images/24bit.pcx: PCX ver. 3.0 image data bounding box [0, 0] - [434, 352], 3 planes each of 8-bit colour, 72 x 72 dpi, RLE compressed

I then downsampled that to a 256-colour paletted image, to exercise both of the code paths we call in the pcx crate.

$ file tests/images/pcx/images/256-palette.pcx 
tests/images/pcx/images/256-palette.pcx: PCX ver. 3.0 image data bounding box [0, 0] - [434, 352], 8-bit colour, 72 x 72 dpi, RLE compressed

cc @HeroicKatora @fintelia

@lupine lupine marked this pull request as ready for review November 1, 2024 18:34
@kornelski kornelski merged commit 43aa0c7 into image-rs:main Nov 1, 2024
33 checks passed
@lupine lupine deleted the nt-pcx-test-images branch November 1, 2024 19:04
@kornelski
Copy link
Contributor

@HeroicKatora The PCX supoprt has been merged recently. Maybe rebase+fixup and force-push the main branch to purge the old images from git history?

@fintelia
Copy link
Contributor

fintelia commented Nov 1, 2024

Feel free to disable the branch protection, force-push a fixup, and then re-enable the protection

@kornelski
Copy link
Contributor

I don't have permissions to access settings. I've created https://github.com/image-rs/image/tree/main-rebased branch that you can push

git push origin -f 9ee68e2afaff118987e953e470cf7221d5f04e71:main

@fintelia
Copy link
Contributor

fintelia commented Nov 1, 2024

Done. Thanks everyone

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants