New feature: Flood-fill #684
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ripytide
reviewed
Sep 8, 2024
tests/regression.rs
Outdated
Comment on lines
752
to
770
| #[test] | ||
| fn test_draw_flood_filled_shape() { | ||
| use imageproc::drawing::{draw_hollow_ellipse_mut, flood_fill}; | ||
|
|
||
| let red = Rgb([255, 0, 0]); | ||
| let green = Rgb([0, 255, 0]); | ||
| let blue = Rgb([0, 0, 255]); | ||
| let mut image = RgbImage::from_pixel(200, 200, Rgb([255, 255, 255])); | ||
|
|
||
| draw_hollow_ellipse_mut(&mut image, (100, 100), 50, 50, red); | ||
| draw_hollow_ellipse_mut(&mut image, (50, 100), 40, 90, blue); | ||
| draw_hollow_ellipse_mut(&mut image, (100, 150), 80, 30, green); | ||
| draw_hollow_ellipse_mut(&mut image, (150, 150), 100, 60, blue); | ||
|
|
||
| flood_fill(&mut image, 120, 120, red); | ||
|
|
||
| compare_to_truth_image(&image, "flood_filled_shape.png"); | ||
| } | ||
|
|
ripytide
reviewed
Sep 15, 2024
src/drawing/fill.rs
Outdated
| filled_image | ||
| } | ||
|
|
||
| #[doc=generate_mut_doc_comment!("draw_line_segment")] |
There was a problem hiding this comment.
You need to update this to the same name as the non-mut method
tests/regression.rs
Outdated
Comment on lines
766
to
768
| flood_fill(&mut image, 120, 120, red); | ||
| let filled_image = flood_fill(&image, 120, 120, red); | ||
| compare_to_truth_image(&filled_image, "flood_filled_shape.png"); | ||
|
|
||
| flood_fill_mut(&mut image, 120, 120, red); |
There was a problem hiding this comment.
Not really any need to test both variants since they are the same method underneath.
|
Apart from the two new nits, I'm happy for this PR to be merged. |
|
All done. Thanks. |
|
for |
|
CI should pass now. |
|
Actually I think |
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Similar to bucket tool in MS-PAINT.
I've just taken the algorithm from here:
https://en.wikipedia.org/wiki/Flood_fill#Span_filling
I'm fairly new to rust and didn't know how to do generic Pixel equality without first converting to rgba pixel, perhaps someone knows how to do this better?:
imageproc/src/drawing/fill.rs
Line 61 in d2a187c