-
Notifications
You must be signed in to change notification settings - Fork 3.3k
LibGfx/JBIG2+jbig2-from-json+Tests: Implement halftone "match_image" feature, add more halftone tests #26399
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
+434
−53
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
89e39f7
jbig2-from-json: Update outdated diagnostic messages
nico 3144b46
jbig2-from-json: Extract jbig2_bitmap_from_json()
nico 9fa696f
jbig2-from-json: Delay construction of HalftoneRegionSegmentData
nico 5e88558
LibGfx/JBIG2+jbig2-from-json: Implement halftone "match_image" feature
nico 66cf60b
Tests/LibGfx: Add JBIG2 halftone test using match_image
nico 4d48ca2
Tests/LibGfx: Add JBIG2 halftone tests for templates 1-3
nico File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
72 changes: 72 additions & 0 deletions
72
Tests/LibGfx/test-inputs/jbig2/json/bitmap-halftone-template1.json
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| { | ||
| "global_header": { | ||
| "organization": "sequential", | ||
| "number_of_pages": 1 | ||
| }, | ||
| "segments": [ | ||
| { | ||
| "segment_number": 0, | ||
| "type": "page_information", | ||
| "page_association": 1, | ||
| "data": { | ||
| "page_width": 399, | ||
| "page_height": 400, | ||
| "flags": { | ||
| "is_eventually_lossless": true | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "segment_number": 1, | ||
| "type": "pattern_dictionary", | ||
| "page_association": 1, | ||
| "retained": true, | ||
| "data": { | ||
| "flags": { | ||
| "pd_template": 1 | ||
| }, | ||
| "pattern_width": 16, | ||
| "pattern_height": 16, | ||
| "gray_max": "from_tiles", | ||
| "method": "unique_image_tiles", | ||
| "image_data": { | ||
| "from_file": "bitmap.bmp" | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "segment_number": 2, | ||
| "type": "lossless_halftone_region", | ||
| "page_association": 1, | ||
| "referred_to_segments": [ | ||
| { | ||
| "segment_number": 1, | ||
| "retained": false | ||
| } | ||
| ], | ||
| "data": { | ||
| "region_segment_information": { | ||
| "width": 399, | ||
| "height": 400 | ||
| }, | ||
| "flags": { | ||
| "ht_template": 1 | ||
| }, | ||
| "grayscale_width": 25, | ||
| "grayscale_height": 25, | ||
| "grid_offset_x_times_256": 0, | ||
| "grid_offset_y_times_256": 0, | ||
| "grid_vector_x_times_256": 4096, | ||
| "grid_vector_y_times_256": 0, | ||
| "graymap_data": { | ||
| "match_image": "bitmap.bmp" | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "segment_number": 3, | ||
| "type": "end_of_page", | ||
| "page_association": 1 | ||
| } | ||
| ] | ||
| } |
72 changes: 72 additions & 0 deletions
72
Tests/LibGfx/test-inputs/jbig2/json/bitmap-halftone-template2.json
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| { | ||
| "global_header": { | ||
| "organization": "sequential", | ||
| "number_of_pages": 1 | ||
| }, | ||
| "segments": [ | ||
| { | ||
| "segment_number": 0, | ||
| "type": "page_information", | ||
| "page_association": 1, | ||
| "data": { | ||
| "page_width": 399, | ||
| "page_height": 400, | ||
| "flags": { | ||
| "is_eventually_lossless": true | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "segment_number": 1, | ||
| "type": "pattern_dictionary", | ||
| "page_association": 1, | ||
| "retained": true, | ||
| "data": { | ||
| "flags": { | ||
| "pd_template": 2 | ||
| }, | ||
| "pattern_width": 16, | ||
| "pattern_height": 16, | ||
| "gray_max": "from_tiles", | ||
| "method": "unique_image_tiles", | ||
| "image_data": { | ||
| "from_file": "bitmap.bmp" | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "segment_number": 2, | ||
| "type": "lossless_halftone_region", | ||
| "page_association": 1, | ||
| "referred_to_segments": [ | ||
| { | ||
| "segment_number": 1, | ||
| "retained": false | ||
| } | ||
| ], | ||
| "data": { | ||
| "region_segment_information": { | ||
| "width": 399, | ||
| "height": 400 | ||
| }, | ||
| "flags": { | ||
| "ht_template": 2 | ||
| }, | ||
| "grayscale_width": 25, | ||
| "grayscale_height": 25, | ||
| "grid_offset_x_times_256": 0, | ||
| "grid_offset_y_times_256": 0, | ||
| "grid_vector_x_times_256": 4096, | ||
| "grid_vector_y_times_256": 0, | ||
| "graymap_data": { | ||
| "match_image": "bitmap.bmp" | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "segment_number": 3, | ||
| "type": "end_of_page", | ||
| "page_association": 1 | ||
| } | ||
| ] | ||
| } |
72 changes: 72 additions & 0 deletions
72
Tests/LibGfx/test-inputs/jbig2/json/bitmap-halftone-template3.json
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| { | ||
| "global_header": { | ||
| "organization": "sequential", | ||
| "number_of_pages": 1 | ||
| }, | ||
| "segments": [ | ||
| { | ||
| "segment_number": 0, | ||
| "type": "page_information", | ||
| "page_association": 1, | ||
| "data": { | ||
| "page_width": 399, | ||
| "page_height": 400, | ||
| "flags": { | ||
| "is_eventually_lossless": true | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "segment_number": 1, | ||
| "type": "pattern_dictionary", | ||
| "page_association": 1, | ||
| "retained": true, | ||
| "data": { | ||
| "flags": { | ||
| "pd_template": 3 | ||
| }, | ||
| "pattern_width": 16, | ||
| "pattern_height": 16, | ||
| "gray_max": "from_tiles", | ||
| "method": "unique_image_tiles", | ||
| "image_data": { | ||
| "from_file": "bitmap.bmp" | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "segment_number": 2, | ||
| "type": "lossless_halftone_region", | ||
| "page_association": 1, | ||
| "referred_to_segments": [ | ||
| { | ||
| "segment_number": 1, | ||
| "retained": false | ||
| } | ||
| ], | ||
| "data": { | ||
| "region_segment_information": { | ||
| "width": 399, | ||
| "height": 400 | ||
| }, | ||
| "flags": { | ||
| "ht_template": 3 | ||
| }, | ||
| "grayscale_width": 25, | ||
| "grayscale_height": 25, | ||
| "grid_offset_x_times_256": 0, | ||
| "grid_offset_y_times_256": 0, | ||
| "grid_vector_x_times_256": 4096, | ||
| "grid_vector_y_times_256": 0, | ||
| "graymap_data": { | ||
| "match_image": "bitmap.bmp" | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "segment_number": 3, | ||
| "type": "end_of_page", | ||
| "page_association": 1 | ||
| } | ||
| ] | ||
| } |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| { | ||
| "global_header": { | ||
| "organization": "sequential", | ||
| "number_of_pages": 1 | ||
| }, | ||
| "segments": [ | ||
| { | ||
| "segment_number": 0, | ||
| "type": "page_information", | ||
| "page_association": 1, | ||
| "data": { | ||
| "page_width": 399, | ||
| "page_height": 400, | ||
| "flags": { | ||
| "is_eventually_lossless": true | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "segment_number": 1, | ||
| "type": "pattern_dictionary", | ||
| "page_association": 1, | ||
| "retained": true, | ||
| "data": { | ||
| "pattern_width": 16, | ||
| "pattern_height": 16, | ||
| "gray_max": "from_tiles", | ||
| "method": "unique_image_tiles", | ||
| "image_data": { | ||
| "from_file": "bitmap.bmp" | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "segment_number": 2, | ||
| "type": "lossless_halftone_region", | ||
| "page_association": 1, | ||
| "referred_to_segments": [ | ||
| { | ||
| "segment_number": 1, | ||
| "retained": false | ||
| } | ||
| ], | ||
| "data": { | ||
| "region_segment_information": { | ||
| "width": 399, | ||
| "height": 400 | ||
| }, | ||
| "grayscale_width": 25, | ||
| "grayscale_height": 25, | ||
| "grid_offset_x_times_256": 0, | ||
| "grid_offset_y_times_256": 0, | ||
| "grid_vector_x_times_256": 4096, | ||
| "grid_vector_y_times_256": 0, | ||
| "graymap_data": { | ||
| "match_image": "bitmap.bmp" | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "segment_number": 3, | ||
| "type": "end_of_page", | ||
| "page_association": 1 | ||
| } | ||
| ] | ||
| } |
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
casual n^5 algo?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The halftone region is a tiling of the reference image, so the outer x/y walks the reference image in tile increments and the inner walks the tile data. So in a way this does O(number of patterns) work per pixel (to find the best pattern to match each tile). I'd call this O(n^3).
Still, as the comment says, yes, this is inefficient. (It's not super duper slow in practice though, just regular slow: I tried covering Tests/LibGfx/test-inputs/jpg/big_image.jpg, a 4000x3000 image, with 16 possible 4x4 tiles, and that took less than a second.)