From 297ea7bf808bb080d566abb4dffb8a2d65e401f3 Mon Sep 17 00:00:00 2001 From: Henry Schimke Date: Tue, 30 Jan 2024 17:26:51 -0600 Subject: [PATCH] chore: prepare for release update version to v0.5.5. fixes: #48 changes name of `image-formats` to `image_formats` to more allign with the naming convention of the library. --- .vscode/launch.json | 520 ++++++++++++++++++ Cargo.toml | 6 +- README.md | 13 +- crates/cli/src/main.rs | 1 + src/maxicode/detector.rs | 16 +- src/multi/multi_test_case.rs | 4 +- src/multi/qrcode/qr_code_multi_reader.rs | 2 +- .../rss_expanded_image_2_binary_test_case.rs | 36 +- .../rss_expanded_image_2_string_test_case.rs | 54 +- .../rss_expanded_internal_test_case.rs | 8 +- ...rss_expanded_stacked_internal_test_case.rs | 4 +- src/qrcode/QRCodeWriterTestCase.rs | 2 +- tests/aztec_blackbox_tests.rs | 4 +- tests/codabar_blackbox_1_test_case.rs | 2 +- tests/code_128_blackbox.rs | 6 +- tests/code_39_blackbox_reader.rs | 6 +- tests/code_93_blackbox_1_testcase.rs | 2 +- tests/cpp_qr_code_blackbox_tests.rs | 28 +- tests/datamatrix_black_box_test_cases.rs | 6 +- tests/ean_13_blackbox_tests.rs | 10 +- tests/ean_8_black_box_1_testcase.rs | 2 +- ...inverted_data_matrix_black_box_testcase.rs | 2 +- tests/itf_blackbox.rs | 4 +- tests/maxicode_blackbox_tests.rs | 4 +- tests/pdf_417_black_box_4_testcase.rs | 2 +- tests/pdf_417_blackbox_tests.rs | 6 +- tests/qr_code_blackbox_tests.rs | 12 +- tests/rss_14_blackbox.rs | 4 +- tests/rss_expanded_blackbox.rs | 10 +- tests/telepen_blackbox_1_test_case.rs | 4 +- tests/upc_a_blackbox_tests.rs | 12 +- tests/upc_e_blackbox_tests.rs | 6 +- .../upc_ean_extension_black_box_1_testcase.rs | 2 +- 33 files changed, 666 insertions(+), 134 deletions(-) create mode 100644 .vscode/launch.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..9d32531 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,520 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "lldb", + "request": "launch", + "name": "Debug executable 'rxing-cli'", + "cargo": { + "args": [ + "build", + "--bin=rxing-cli", + "--package=rxing-cli" + ], + "filter": { + "name": "rxing-cli", + "kind": "bin" + } + }, + "args": ["/Users/henry/Downloads/300908088-2b3ffe34-1067-48c9-8663-f841b5d0acf6.png", "decode", "--try-harder", "--decode-multi"], + "cwd": "${workspaceFolder}" + }, + { + "type": "lldb", + "request": "launch", + "name": "Debug unit tests in executable 'rxing-cli'", + "cargo": { + "args": [ + "test", + "--no-run", + "--bin=rxing-cli", + "--package=rxing-cli" + ], + "filter": { + "name": "rxing-cli", + "kind": "bin" + } + }, + "args": [], + "cwd": "${workspaceFolder}" + }, + { + "type": "lldb", + "request": "launch", + "name": "Debug unit tests in library 'rxing'", + "cargo": { + "args": [ + "test", + "--no-run", + "--lib", + "--package=rxing" + ], + "filter": { + "name": "rxing", + "kind": "lib" + } + }, + "args": [], + "cwd": "${workspaceFolder}" + }, + { + "type": "lldb", + "request": "launch", + "name": "Debug integration test 'upc_e_blackbox_tests'", + "cargo": { + "args": [ + "test", + "--no-run", + "--test=upc_e_blackbox_tests", + "--package=rxing" + ], + "filter": { + "name": "upc_e_blackbox_tests", + "kind": "test" + } + }, + "args": [], + "cwd": "${workspaceFolder}" + }, + { + "type": "lldb", + "request": "launch", + "name": "Debug integration test 'aztec_blackbox_tests'", + "cargo": { + "args": [ + "test", + "--no-run", + "--test=aztec_blackbox_tests", + "--package=rxing" + ], + "filter": { + "name": "aztec_blackbox_tests", + "kind": "test" + } + }, + "args": [], + "cwd": "${workspaceFolder}" + }, + { + "type": "lldb", + "request": "launch", + "name": "Debug integration test 'rss_expanded_blackbox'", + "cargo": { + "args": [ + "test", + "--no-run", + "--test=rss_expanded_blackbox", + "--package=rxing" + ], + "filter": { + "name": "rss_expanded_blackbox", + "kind": "test" + } + }, + "args": [], + "cwd": "${workspaceFolder}" + }, + { + "type": "lldb", + "request": "launch", + "name": "Debug integration test 'itf_blackbox'", + "cargo": { + "args": [ + "test", + "--no-run", + "--test=itf_blackbox", + "--package=rxing" + ], + "filter": { + "name": "itf_blackbox", + "kind": "test" + } + }, + "args": [], + "cwd": "${workspaceFolder}" + }, + { + "type": "lldb", + "request": "launch", + "name": "Debug integration test 'qr_code_blackbox_tests'", + "cargo": { + "args": [ + "test", + "--no-run", + "--test=qr_code_blackbox_tests", + "--package=rxing" + ], + "filter": { + "name": "qr_code_blackbox_tests", + "kind": "test" + } + }, + "args": [], + "cwd": "${workspaceFolder}" + }, + { + "type": "lldb", + "request": "launch", + "name": "Debug integration test 'cropped_transposed_luma'", + "cargo": { + "args": [ + "test", + "--no-run", + "--test=cropped_transposed_luma", + "--package=rxing" + ], + "filter": { + "name": "cropped_transposed_luma", + "kind": "test" + } + }, + "args": [], + "cwd": "${workspaceFolder}" + }, + { + "type": "lldb", + "request": "launch", + "name": "Debug integration test 'inverted_data_matrix_black_box_testcase'", + "cargo": { + "args": [ + "test", + "--no-run", + "--test=inverted_data_matrix_black_box_testcase", + "--package=rxing" + ], + "filter": { + "name": "inverted_data_matrix_black_box_testcase", + "kind": "test" + } + }, + "args": [], + "cwd": "${workspaceFolder}" + }, + { + "type": "lldb", + "request": "launch", + "name": "Debug integration test 'code_39_blackbox_reader'", + "cargo": { + "args": [ + "test", + "--no-run", + "--test=code_39_blackbox_reader", + "--package=rxing" + ], + "filter": { + "name": "code_39_blackbox_reader", + "kind": "test" + } + }, + "args": [], + "cwd": "${workspaceFolder}" + }, + { + "type": "lldb", + "request": "launch", + "name": "Debug integration test 'upc_a_blackbox_tests'", + "cargo": { + "args": [ + "test", + "--no-run", + "--test=upc_a_blackbox_tests", + "--package=rxing" + ], + "filter": { + "name": "upc_a_blackbox_tests", + "kind": "test" + } + }, + "args": [], + "cwd": "${workspaceFolder}" + }, + { + "type": "lldb", + "request": "launch", + "name": "Debug integration test 'codabar_blackbox_1_test_case'", + "cargo": { + "args": [ + "test", + "--no-run", + "--test=codabar_blackbox_1_test_case", + "--package=rxing" + ], + "filter": { + "name": "codabar_blackbox_1_test_case", + "kind": "test" + } + }, + "args": [], + "cwd": "${workspaceFolder}" + }, + { + "type": "lldb", + "request": "launch", + "name": "Debug integration test 'datamatrix_black_box_test_cases'", + "cargo": { + "args": [ + "test", + "--no-run", + "--test=datamatrix_black_box_test_cases", + "--package=rxing" + ], + "filter": { + "name": "datamatrix_black_box_test_cases", + "kind": "test" + } + }, + "args": [], + "cwd": "${workspaceFolder}" + }, + { + "type": "lldb", + "request": "launch", + "name": "Debug integration test 'telepen_blackbox_1_test_case'", + "cargo": { + "args": [ + "test", + "--no-run", + "--test=telepen_blackbox_1_test_case", + "--package=rxing" + ], + "filter": { + "name": "telepen_blackbox_1_test_case", + "kind": "test" + } + }, + "args": [], + "cwd": "${workspaceFolder}" + }, + { + "type": "lldb", + "request": "launch", + "name": "Debug integration test 'rss_14_blackbox'", + "cargo": { + "args": [ + "test", + "--no-run", + "--test=rss_14_blackbox", + "--package=rxing" + ], + "filter": { + "name": "rss_14_blackbox", + "kind": "test" + } + }, + "args": [], + "cwd": "${workspaceFolder}" + }, + { + "type": "lldb", + "request": "launch", + "name": "Debug integration test 'code_93_blackbox_1_testcase'", + "cargo": { + "args": [ + "test", + "--no-run", + "--test=code_93_blackbox_1_testcase", + "--package=rxing" + ], + "filter": { + "name": "code_93_blackbox_1_testcase", + "kind": "test" + } + }, + "args": [], + "cwd": "${workspaceFolder}" + }, + { + "type": "lldb", + "request": "launch", + "name": "Debug integration test 'code_128_blackbox'", + "cargo": { + "args": [ + "test", + "--no-run", + "--test=code_128_blackbox", + "--package=rxing" + ], + "filter": { + "name": "code_128_blackbox", + "kind": "test" + } + }, + "args": [], + "cwd": "${workspaceFolder}" + }, + { + "type": "lldb", + "request": "launch", + "name": "Debug integration test 'ean_8_black_box_1_testcase'", + "cargo": { + "args": [ + "test", + "--no-run", + "--test=ean_8_black_box_1_testcase", + "--package=rxing" + ], + "filter": { + "name": "ean_8_black_box_1_testcase", + "kind": "test" + } + }, + "args": [], + "cwd": "${workspaceFolder}" + }, + { + "type": "lldb", + "request": "launch", + "name": "Debug integration test 'pdf_417_blackbox_tests'", + "cargo": { + "args": [ + "test", + "--no-run", + "--test=pdf_417_blackbox_tests", + "--package=rxing" + ], + "filter": { + "name": "pdf_417_blackbox_tests", + "kind": "test" + } + }, + "args": [], + "cwd": "${workspaceFolder}" + }, + { + "type": "lldb", + "request": "launch", + "name": "Debug integration test 'cpp_qr_code_blackbox_tests'", + "cargo": { + "args": [ + "test", + "--no-run", + "--test=cpp_qr_code_blackbox_tests", + "--package=rxing" + ], + "filter": { + "name": "cpp_qr_code_blackbox_tests", + "kind": "test" + } + }, + "args": [], + "cwd": "${workspaceFolder}" + }, + { + "type": "lldb", + "request": "launch", + "name": "Debug integration test 'upc_ean_extension_black_box_1_testcase'", + "cargo": { + "args": [ + "test", + "--no-run", + "--test=upc_ean_extension_black_box_1_testcase", + "--package=rxing" + ], + "filter": { + "name": "upc_ean_extension_black_box_1_testcase", + "kind": "test" + } + }, + "args": [], + "cwd": "${workspaceFolder}" + }, + { + "type": "lldb", + "request": "launch", + "name": "Debug integration test 'pdf_417_black_box_4_testcase'", + "cargo": { + "args": [ + "test", + "--no-run", + "--test=pdf_417_black_box_4_testcase", + "--package=rxing" + ], + "filter": { + "name": "pdf_417_black_box_4_testcase", + "kind": "test" + } + }, + "args": [], + "cwd": "${workspaceFolder}" + }, + { + "type": "lldb", + "request": "launch", + "name": "Debug integration test 'maxicode_blackbox_tests'", + "cargo": { + "args": [ + "test", + "--no-run", + "--test=maxicode_blackbox_tests", + "--package=rxing" + ], + "filter": { + "name": "maxicode_blackbox_tests", + "kind": "test" + } + }, + "args": [], + "cwd": "${workspaceFolder}" + }, + { + "type": "lldb", + "request": "launch", + "name": "Debug integration test 'ean_13_blackbox_tests'", + "cargo": { + "args": [ + "test", + "--no-run", + "--test=ean_13_blackbox_tests", + "--package=rxing" + ], + "filter": { + "name": "ean_13_blackbox_tests", + "kind": "test" + } + }, + "args": [], + "cwd": "${workspaceFolder}" + }, + { + "type": "lldb", + "request": "launch", + "name": "Debug integration test 'github_issues'", + "cargo": { + "args": [ + "test", + "--no-run", + "--test=github_issues", + "--package=rxing" + ], + "filter": { + "name": "github_issues", + "kind": "test" + } + }, + "args": [], + "cwd": "${workspaceFolder}" + }, + { + "type": "lldb", + "request": "launch", + "name": "Debug benchmark 'benchmarks'", + "cargo": { + "args": [ + "test", + "--no-run", + "--bench=benchmarks", + "--package=rxing" + ], + "filter": { + "name": "benchmarks", + "kind": "bench" + } + }, + "args": [], + "cwd": "${workspaceFolder}" + } + ] +} \ No newline at end of file diff --git a/Cargo.toml b/Cargo.toml index a696b38..ddcce5a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rxing" -version = "0.5.4" +version = "0.5.5" description="A rust port of the zxing barcode library." license="Apache-2.0" repository="https://github.com/rxing-core/rxing" @@ -41,10 +41,10 @@ rand = "0.8.5" criterion = "0.5" [features] -default = ["image", "client_support", "image-formats"] +default = ["image", "client_support", "image_formats"] #/// Enable features required for image manipulation and reading. image = ["dep:image", "dep:imageproc"] -image-formats = [ +image_formats = [ "image", "image/gif", "image/jpeg", diff --git a/README.md b/README.md index b7f74a6..5b29054 100644 --- a/README.md +++ b/README.md @@ -40,13 +40,17 @@ All barcode formats are tested and functioning in their current state against cu | rss-14 | complete | no | yes | | rss-expanded | complete | no | yes| | telepen | complete | yes | yes | +| micro qr | complete | no | yes | +| rMQR | complete | no | yes | Please note that currently UPC/EAN Extension 2/5 is supported. ## Feature Flags The following feature flags are available: * `image`: Enable features required for image manipulation and reading. +* `image_formats`: Enabled by default. Compile all `image` crate image format support options. * `allow_forced_iso_ied_18004_compliance`: Allows the ability to force ISO/IED 18004 compliance. Leave disabled unless specificially needed. +* `client_support`: Enable the client library. This is used for parsing the result of barcodes. * `svg_write`: Enable support for writing SVG files * `svg_read`: Enable support for reading SVG files * `wasm_support`: Make certain changes to support building this module in WASM @@ -56,7 +60,7 @@ The following feature flags are available: This is not used by any of the helper functions, you must specifically use it while setting up a new decoder. The `OtsuLevelBinarizer` is not well tested and it does *not* pass the current test suite. Consider this only if you know why you would want to use it. In many cases, the standard binarizer is likely better. If you have a very specific use case, and you know what your incoming data will resemble, you should consider implementing your own `Binarizer` and using that instead. -The default feature set includes only the `image` feature mentioned above. +The default feature set includes the `image`, `client_support`, and `image_formats` features mentioned above. ## Incomplete The library has only been thurougly tested with the `BufferedImageLuminanceSource` source format. Using any other @@ -82,6 +86,13 @@ fn main() { ``` ## Latest Release Notes +* *v0.5.5* -> Add support for rMQR, allows building the library without image_formats, fixes an issue with multiple barcode detection. + + New default feature flag `image_formats` enables all of the `image` crates image formats for use. + rMQR support is basic and is most effective on pure-barcodes. + The previous version of the `GenericMultipleBarcodeReader` used the contents of the barcode as they determination of uniquness. + This was incorrect and the new version attempts to elimate duplicates by detecting if they are within one another. + * *v0.5.0* -> Added support for [telepen](https://advanova.co.uk/wp-content/uploads/2022/05/Barcode-Symbology-information-and-History.pdf) thanks to the work of first time contributor [cpwood](https://github.com/cpwood). This release also adds the ability to exclude building the "client" result parsing features. Currently part of the default diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs index 2776e52..c5a3b50 100644 --- a/crates/cli/src/main.rs +++ b/crates/cli/src/main.rs @@ -344,6 +344,7 @@ fn decode_command( rxing::DecodeHintValue::PureBarcode(*pure_barcode), ); } + if let Some(character_set) = character_set { hints.insert( rxing::DecodeHintType::CHARACTER_SET, diff --git a/src/maxicode/detector.rs b/src/maxicode/detector.rs index b58c031..d09eb74 100644 --- a/src/maxicode/detector.rs +++ b/src/maxicode/detector.rs @@ -1054,7 +1054,7 @@ mod detector_test { Binarizer, BufferedImageLuminanceSource, }; - #[cfg(feature = "image-formats")] + #[cfg(feature = "image_formats")] #[test] fn mode_1() { finder_test( @@ -1063,7 +1063,7 @@ mod detector_test { ) } - #[cfg(feature = "image-formats")] + #[cfg(feature = "image_formats")] #[test] fn mode_2() { finder_test( @@ -1072,7 +1072,7 @@ mod detector_test { ) } - #[cfg(feature = "image-formats")] + #[cfg(feature = "image_formats")] #[test] fn mode_2_rot90() { finder_test( @@ -1081,7 +1081,7 @@ mod detector_test { ) } - #[cfg(feature = "image-formats")] + #[cfg(feature = "image_formats")] #[test] fn mode3() { finder_test( @@ -1090,7 +1090,7 @@ mod detector_test { ) } - #[cfg(feature = "image-formats")] + #[cfg(feature = "image_formats")] #[test] fn mixed_sets() { finder_test( @@ -1099,7 +1099,7 @@ mod detector_test { ) } - #[cfg(feature = "image-formats")] + #[cfg(feature = "image_formats")] #[test] fn mode4() { finder_test( @@ -1108,7 +1108,7 @@ mod detector_test { ) } - #[cfg(feature = "image-formats")] + #[cfg(feature = "image_formats")] #[test] fn mode5() { finder_test( @@ -1117,7 +1117,7 @@ mod detector_test { ) } - #[cfg(feature = "image-formats")] + #[cfg(feature = "image_formats")] #[test] fn mode6() { finder_test( diff --git a/src/multi/multi_test_case.rs b/src/multi/multi_test_case.rs index b429c6d..2f76a72 100644 --- a/src/multi/multi_test_case.rs +++ b/src/multi/multi_test_case.rs @@ -27,7 +27,7 @@ use super::{GenericMultipleBarcodeReader, MultipleBarcodeReader}; * Tests {@link MultipleBarcodeReader}. */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testMulti() { // Very basic test for now @@ -55,7 +55,7 @@ fn testMulti() { assert_eq!(&BarcodeFormat::QR_CODE, results[1].getBarcodeFormat()); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testMultiQR() { // Very basic test for now diff --git a/src/multi/qrcode/qr_code_multi_reader.rs b/src/multi/qrcode/qr_code_multi_reader.rs index 08e1644..cc5b531 100644 --- a/src/multi/qrcode/qr_code_multi_reader.rs +++ b/src/multi/qrcode/qr_code_multi_reader.rs @@ -237,7 +237,7 @@ mod multi_qr_code_test_case { * Tests {@link QRCodeMultiReader}. */ - #[cfg(feature = "image-formats")] + #[cfg(feature = "image_formats")] #[test] fn testMultiQRCodes() { // Very basic test for now diff --git a/src/oned/rss/expanded/rss_expanded_image_2_binary_test_case.rs b/src/oned/rss/expanded/rss_expanded_image_2_binary_test_case.rs index 22132b5..8816b37 100644 --- a/src/oned/rss/expanded/rss_expanded_image_2_binary_test_case.rs +++ b/src/oned/rss/expanded/rss_expanded_image_2_binary_test_case.rs @@ -35,7 +35,7 @@ use crate::{ use super::bit_array_builder; -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2binary1() { // (11)100224(17)110224(3102)000100 @@ -43,7 +43,7 @@ fn testDecodeRow2binary1() { " ...X...X .X....X. .XX...X. X..X...X ...XX.X. ..X.X... ..X.X..X ...X..X. X.X....X .X....X. .....X.. X...X..."); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2binary2() { // (01)90012345678908(3103)001750 @@ -53,14 +53,14 @@ fn testDecodeRow2binary2() { ); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2binary3() { // (10)12A assertCorrectImage2binary("3.png", " .......X ..XX..X. X.X....X .......X ...."); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2binary4() { // (01)98898765432106(3202)012345(15)991231 @@ -68,7 +68,7 @@ fn testDecodeRow2binary4() { "4.png", " ..XXXX.X XX.XXXX. .XXX.XX. XX..X... .XXXXX.. XX.X..X. ..XX..XX XX.X.XXX X..XX..X .X.XXXXX XXXX"); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2binary5() { // (01)90614141000015(3202)000150 @@ -78,7 +78,7 @@ fn testDecodeRow2binary5() { ); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2binary10() { // (01)98898765432106(15)991231(3103)001750(10)12A(422)123(21)123456(423)0123456789012 @@ -86,7 +86,7 @@ fn testDecodeRow2binary10() { " .X.XX..X XX.XXXX. .XXX.XX. XX..X... .XXXXX.. XX.X..X. ..XX...X XX.X.... X.X.X.X. X.X..X.X .X....X. XX...X.. ...XX.X. .XXXXXX. .X..XX.. X.X.X... .X...... XXXX.... XX.XX... XXXXX.X. ...XXXXX .....X.X ...X.... X.XXX..X X.X.X... XX.XX..X .X..X..X .X.X.X.X X.XX...X .XX.XXX. XXX.X.XX ..X."); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2binary11() { // (01)98898765432106(15)991231(3103)001750(10)12A(422)123(21)123456 @@ -94,7 +94,7 @@ fn testDecodeRow2binary11() { " .X.XX..X XX.XXXX. .XXX.XX. XX..X... .XXXXX.. XX.X..X. ..XX...X XX.X.... X.X.X.X. X.X..X.X .X....X. XX...X.. ...XX.X. .XXXXXX. .X..XX.. X.X.X... .X...... XXXX.... XX.XX... XXXXX.X. ...XXXXX .....X.X ...X.... X.XXX..X X.X.X... ...."); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2binary12() { // (01)98898765432106(3103)001750 @@ -104,7 +104,7 @@ fn testDecodeRow2binary12() { ); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2binary13() { // (01)90012345678908(3922)795 @@ -114,7 +114,7 @@ fn testDecodeRow2binary13() { ); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2binary14() { // (01)90012345678908(3932)0401234 @@ -122,7 +122,7 @@ fn testDecodeRow2binary14() { "14.png", " ..XX.X.. ........ .X..XXX. X.X.X... XX.XXXXX .XXXX.X. X.....X. X.....X. X.X.X.XX .X...... X..."); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2binary15() { // (01)90012345678908(3102)001750(11)100312 @@ -130,7 +130,7 @@ fn testDecodeRow2binary15() { "15.png", " ..XXX... ........ .X..XXX. X.X.X... XX.XXXXX .XXXX.X. ..XX...X .X.....X .XX..... XXXX.X.. XX.."); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2binary16() { // (01)90012345678908(3202)001750(11)100312 @@ -138,7 +138,7 @@ fn testDecodeRow2binary16() { "16.png", " ..XXX..X ........ .X..XXX. X.X.X... XX.XXXXX .XXXX.X. ..XX...X .X.....X .XX..... XXXX.X.. XX.."); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2binary17() { // (01)90012345678908(3102)001750(13)100312 @@ -146,7 +146,7 @@ fn testDecodeRow2binary17() { "17.png", " ..XXX.X. ........ .X..XXX. X.X.X... XX.XXXXX .XXXX.X. ..XX...X .X.....X .XX..... XXXX.X.. XX.."); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2binary18() { // (01)90012345678908(3202)001750(13)100312 @@ -154,7 +154,7 @@ fn testDecodeRow2binary18() { "18.png", " ..XXX.XX ........ .X..XXX. X.X.X... XX.XXXXX .XXXX.X. ..XX...X .X.....X .XX..... XXXX.X.. XX.."); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2binary19() { // (01)90012345678908(3102)001750(15)100312 @@ -162,7 +162,7 @@ fn testDecodeRow2binary19() { "19.png", " ..XXXX.. ........ .X..XXX. X.X.X... XX.XXXXX .XXXX.X. ..XX...X .X.....X .XX..... XXXX.X.. XX.."); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2binary20() { // (01)90012345678908(3202)001750(15)100312 @@ -170,7 +170,7 @@ fn testDecodeRow2binary20() { "20.png", " ..XXXX.X ........ .X..XXX. X.X.X... XX.XXXXX .XXXX.X. ..XX...X .X.....X .XX..... XXXX.X.. XX.."); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2binary21() { // (01)90012345678908(3102)001750(17)100312 @@ -178,7 +178,7 @@ fn testDecodeRow2binary21() { "21.png", " ..XXXXX. ........ .X..XXX. X.X.X... XX.XXXXX .XXXX.X. ..XX...X .X.....X .XX..... XXXX.X.. XX.."); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2binary22() { // (01)90012345678908(3202)001750(17)100312 diff --git a/src/oned/rss/expanded/rss_expanded_image_2_string_test_case.rs b/src/oned/rss/expanded/rss_expanded_image_2_string_test_case.rs index 8618a76..cb398f2 100644 --- a/src/oned/rss/expanded/rss_expanded_image_2_string_test_case.rs +++ b/src/oned/rss/expanded/rss_expanded_image_2_string_test_case.rs @@ -37,43 +37,43 @@ use crate::{ * @author Eduardo Castillejo, University of Deusto (eduardo.castillejo@deusto.es) */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2string1() { assertCorrectImage2string("1.png", "(11)100224(17)110224(3102)000100"); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2string2() { assertCorrectImage2string("2.png", "(01)90012345678908(3103)001750"); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2string3() { assertCorrectImage2string("3.png", "(10)12A"); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2string4() { assertCorrectImage2string("4.png", "(01)98898765432106(3202)012345(15)991231"); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2string5() { assertCorrectImage2string("5.png", "(01)90614141000015(3202)000150"); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2string7() { assertCorrectImage2string("7.png", "(10)567(11)010101"); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2string10() { let expected = @@ -81,7 +81,7 @@ fn testDecodeRow2string10() { assertCorrectImage2string("10.png", expected); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2string11() { assertCorrectImage2string( @@ -90,115 +90,115 @@ fn testDecodeRow2string11() { ); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2string12() { assertCorrectImage2string("12.png", "(01)98898765432106(3103)001750"); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2string13() { assertCorrectImage2string("13.png", "(01)90012345678908(3922)795"); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2string14() { assertCorrectImage2string("14.png", "(01)90012345678908(3932)0401234"); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2string15() { assertCorrectImage2string("15.png", "(01)90012345678908(3102)001750(11)100312"); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2string16() { assertCorrectImage2string("16.png", "(01)90012345678908(3202)001750(11)100312"); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2string17() { assertCorrectImage2string("17.png", "(01)90012345678908(3102)001750(13)100312"); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2string18() { assertCorrectImage2string("18.png", "(01)90012345678908(3202)001750(13)100312"); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2string19() { assertCorrectImage2string("19.png", "(01)90012345678908(3102)001750(15)100312"); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2string20() { assertCorrectImage2string("20.png", "(01)90012345678908(3202)001750(15)100312"); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2string21() { assertCorrectImage2string("21.png", "(01)90012345678908(3102)001750(17)100312"); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2string22() { assertCorrectImage2string("22.png", "(01)90012345678908(3202)001750(17)100312"); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2string25() { assertCorrectImage2string("25.png", "(10)123"); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2string26() { assertCorrectImage2string("26.png", "(10)5678(11)010101"); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2string27() { assertCorrectImage2string("27.png", "(10)1098-1234"); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2string28() { assertCorrectImage2string("28.png", "(10)1098/1234"); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2string29() { assertCorrectImage2string("29.png", "(10)1098.1234"); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2string30() { assertCorrectImage2string("30.png", "(10)1098*1234"); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2string31() { assertCorrectImage2string("31.png", "(10)1098,1234"); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeRow2string32() { assertCorrectImage2string( diff --git a/src/oned/rss/expanded/rss_expanded_internal_test_case.rs b/src/oned/rss/expanded/rss_expanded_internal_test_case.rs index 4e4a748..f0298ff 100644 --- a/src/oned/rss/expanded/rss_expanded_internal_test_case.rs +++ b/src/oned/rss/expanded/rss_expanded_internal_test_case.rs @@ -37,7 +37,7 @@ use super::RSSExpandedReader; * @author Eduardo Castillejo, University of Deusto (eduardo.castillejo@deusto.es) */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testFindFinderPatterns() { let image = readImage("2.png"); @@ -84,7 +84,7 @@ fn testFindFinderPatterns() { // } } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testRetrieveNextPairPatterns() { let image = readImage("3.png"); @@ -113,7 +113,7 @@ fn testRetrieveNextPairPatterns() { assert_eq!(0, finderPattern.getValue()); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeCheckCharacter() { let image = readImage("3.png"); @@ -142,7 +142,7 @@ fn testDecodeCheckCharacter() { assert_eq!(98, dataCharacter.getValue()); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodeDataCharacter() { let image = readImage("3.png"); diff --git a/src/oned/rss/expanded/rss_expanded_stacked_internal_test_case.rs b/src/oned/rss/expanded/rss_expanded_stacked_internal_test_case.rs index 5a2d3a8..65c4f4e 100644 --- a/src/oned/rss/expanded/rss_expanded_stacked_internal_test_case.rs +++ b/src/oned/rss/expanded/rss_expanded_stacked_internal_test_case.rs @@ -32,7 +32,7 @@ use super::{test_case_util, RSSExpandedReader}; * Tests {@link RSSExpandedReader} handling of stacked RSS barcodes. */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testDecodingRowByRow() { let mut rssExpandedReader = RSSExpandedReader::new(); @@ -88,7 +88,7 @@ fn testDecodingRowByRow() { assert_eq!("(01)98898765432106(3202)012345(15)991231", result.getText()); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testCompleteDecode() { let mut rssExpandedReader = RSSExpandedReader::new(); diff --git a/src/qrcode/QRCodeWriterTestCase.rs b/src/qrcode/QRCodeWriterTestCase.rs index 989085b..71c3f93 100644 --- a/src/qrcode/QRCodeWriterTestCase.rs +++ b/src/qrcode/QRCodeWriterTestCase.rs @@ -159,7 +159,7 @@ fn compareToGoldenFile( // Golden images are generated with "qrcode_sample.cc". The images are checked with both eye balls // and cell phones. We expect pixel-perfect results, because the error correction level is known, // and the pixel dimensions matches exactly. -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn testRegressionTest() { compareToGoldenFile( diff --git a/tests/aztec_blackbox_tests.rs b/tests/aztec_blackbox_tests.rs index cb7ae0f..933fcf6 100644 --- a/tests/aztec_blackbox_tests.rs +++ b/tests/aztec_blackbox_tests.rs @@ -22,7 +22,7 @@ mod common; /** * @author David Olivier */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn aztec_black_box1_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -45,7 +45,7 @@ fn aztec_black_box1_test_case() { * * @author dswitkin@google.com (Daniel Switkin) */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn aztec_black_box2_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( diff --git a/tests/codabar_blackbox_1_test_case.rs b/tests/codabar_blackbox_1_test_case.rs index 6b438cf..f9f3266 100644 --- a/tests/codabar_blackbox_1_test_case.rs +++ b/tests/codabar_blackbox_1_test_case.rs @@ -22,7 +22,7 @@ mod common; /** * @author Sean Owen */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn codabar_black_box1_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( diff --git a/tests/code_128_blackbox.rs b/tests/code_128_blackbox.rs index a8e20f4..35aa488 100644 --- a/tests/code_128_blackbox.rs +++ b/tests/code_128_blackbox.rs @@ -7,7 +7,7 @@ mod common; /** * @author Sean Owen */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn code128_black_box1_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -26,7 +26,7 @@ fn code128_black_box1_test_case() { /** * @author dswitkin@google.com (Daniel Switkin) */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn code128_black_box2_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -45,7 +45,7 @@ fn code128_black_box2_test_case() { /** * @author Sean Owen */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn code128_black_box3_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( diff --git a/tests/code_39_blackbox_reader.rs b/tests/code_39_blackbox_reader.rs index 8e475fb..ee8d8bf 100644 --- a/tests/code_39_blackbox_reader.rs +++ b/tests/code_39_blackbox_reader.rs @@ -14,7 +14,7 @@ mod common; /** * @author Sean Owen */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn code39_black_box1_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -35,7 +35,7 @@ fn code39_black_box1_test_case() { /** * @author dswitkin@google.com (Daniel Switkin) */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn code39_black_box3_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -54,7 +54,7 @@ fn code39_black_box3_test_case() { /** * @author Sean Owen */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn code39_extended_black_box2_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( diff --git a/tests/code_93_blackbox_1_testcase.rs b/tests/code_93_blackbox_1_testcase.rs index b398bb5..fbaf05f 100644 --- a/tests/code_93_blackbox_1_testcase.rs +++ b/tests/code_93_blackbox_1_testcase.rs @@ -22,7 +22,7 @@ mod common; /** * @author Sean Owen */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn code93_black_box1_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( diff --git a/tests/cpp_qr_code_blackbox_tests.rs b/tests/cpp_qr_code_blackbox_tests.rs index 7883373..6908c41 100644 --- a/tests/cpp_qr_code_blackbox_tests.rs +++ b/tests/cpp_qr_code_blackbox_tests.rs @@ -25,7 +25,7 @@ mod common; * @author Sean Owen */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn qrcode_black_box1_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -68,7 +68,7 @@ fn qrcode_black_box1_test_case() { * @author dswitkin@google.com (Daniel Switkin) */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn qrcode_black_box3_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -90,7 +90,7 @@ fn qrcode_black_box3_test_case() { * @author dswitkin@google.com (Daniel Switkin) */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn qrcode_black_box4_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -115,7 +115,7 @@ fn qrcode_black_box4_test_case() { * @author dswitkin@google.com (Daniel Switkin) */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn qrcode_black_box5_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -136,7 +136,7 @@ fn qrcode_black_box5_test_case() { * rotation, which was a weak spot. */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn qrcode_black_box6_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -152,7 +152,7 @@ fn qrcode_black_box6_test_case() { tester.test_black_box(); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn mqr_black_box_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -178,7 +178,7 @@ fn mqr_black_box_test_case() { * be a function of the barcode. */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn cpp_qrcode_black_box1_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -199,7 +199,7 @@ fn cpp_qrcode_black_box1_test_case() { * @author Sean Owen */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn cpp_qrcode_black_box2_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -228,7 +228,7 @@ fn cpp_qrcode_black_box2_test_case() { * @author dswitkin@google.com (Daniel Switkin) */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn cpp_qrcode_black_box3_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -251,7 +251,7 @@ fn cpp_qrcode_black_box3_test_case() { * @author dswitkin@google.com (Daniel Switkin) */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn cpp_qrcode_black_box4_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -276,7 +276,7 @@ fn cpp_qrcode_black_box4_test_case() { * @author dswitkin@google.com (Daniel Switkin) */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn cpp_qrcode_black_box5_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -297,7 +297,7 @@ fn cpp_qrcode_black_box5_test_case() { * rotation, which was a weak spot. */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn cpp_qrcode_black_box6_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -313,7 +313,7 @@ fn cpp_qrcode_black_box6_test_case() { tester.test_black_box(); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn cpp_qrcode_black_box7_test_case() { let mut tester = common::MultiImageSpanAbstractBlackBoxTestCase::new( @@ -328,7 +328,7 @@ fn cpp_qrcode_black_box7_test_case() { tester.test_black_box(); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn cpp_rmqr_blackbox_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( diff --git a/tests/datamatrix_black_box_test_cases.rs b/tests/datamatrix_black_box_test_cases.rs index f2b1da7..48d1923 100644 --- a/tests/datamatrix_black_box_test_cases.rs +++ b/tests/datamatrix_black_box_test_cases.rs @@ -22,7 +22,7 @@ mod common; /** * @author bbrown@google.com (Brian Brown) */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn data_matrix_black_box1_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -42,7 +42,7 @@ fn data_matrix_black_box1_test_case() { /** * @author dswitkin@google.com (Daniel Switkin) */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn data_matrix_black_box2_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -62,7 +62,7 @@ fn data_matrix_black_box2_test_case() { /** * @author gitlost */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn data_matrix_black_box3_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( diff --git a/tests/ean_13_blackbox_tests.rs b/tests/ean_13_blackbox_tests.rs index 17c9350..1a22729 100644 --- a/tests/ean_13_blackbox_tests.rs +++ b/tests/ean_13_blackbox_tests.rs @@ -22,7 +22,7 @@ mod common; /** * @author Sean Owen */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn ean13_black_box1_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -44,7 +44,7 @@ fn ean13_black_box1_test_case() { * * @author dswitkin@google.com (Daniel Switkin) */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn ean13_black_box2_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -64,7 +64,7 @@ fn ean13_black_box2_test_case() { /** * @author dswitkin@google.com (Daniel Switkin) */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn ean13_black_box3_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -85,7 +85,7 @@ fn ean13_black_box3_test_case() { * A very difficult set of images taken with extreme shadows and highlights. * @author dswitkin@google.com (Daniel Switkin) */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn ean13_black_box4_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -105,7 +105,7 @@ fn ean13_black_box4_test_case() { * A set of blurry images taken with a fixed-focus device. * @author dswitkin@google.com (Daniel Switkin) */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn ean13_black_box5_blurry_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( diff --git a/tests/ean_8_black_box_1_testcase.rs b/tests/ean_8_black_box_1_testcase.rs index 9f66f92..4a2033f 100644 --- a/tests/ean_8_black_box_1_testcase.rs +++ b/tests/ean_8_black_box_1_testcase.rs @@ -22,7 +22,7 @@ mod common; /** * @author Sean Owen */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn ean8_black_box1_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( diff --git a/tests/inverted_data_matrix_black_box_testcase.rs b/tests/inverted_data_matrix_black_box_testcase.rs index 405a784..48ebb7f 100644 --- a/tests/inverted_data_matrix_black_box_testcase.rs +++ b/tests/inverted_data_matrix_black_box_testcase.rs @@ -22,7 +22,7 @@ mod common; /** * Inverted barcodes */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn inverted_data_matrix_black_box_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( diff --git a/tests/itf_blackbox.rs b/tests/itf_blackbox.rs index 41716ef..1b4adc0 100644 --- a/tests/itf_blackbox.rs +++ b/tests/itf_blackbox.rs @@ -22,7 +22,7 @@ mod common; /** * @author kevin.osullivan@sita.aero */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn itfblack_box1_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -41,7 +41,7 @@ fn itfblack_box1_test_case() { /** * @author dswitkin@google.com (Daniel Switkin) */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn itfblack_box2_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( diff --git a/tests/maxicode_blackbox_tests.rs b/tests/maxicode_blackbox_tests.rs index f61e02b..9cbcdf1 100644 --- a/tests/maxicode_blackbox_tests.rs +++ b/tests/maxicode_blackbox_tests.rs @@ -22,7 +22,7 @@ mod common; /** * Tests {@link MaxiCodeReader} against a fixed set of test images. */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn maxicode1_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -44,7 +44,7 @@ fn maxicode1_test_case() { * @author Daniel Gredler * @see Defect 1543 */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn maxi_code_black_box1_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( diff --git a/tests/pdf_417_black_box_4_testcase.rs b/tests/pdf_417_black_box_4_testcase.rs index dfe9ec5..9ae9cbb 100644 --- a/tests/pdf_417_black_box_4_testcase.rs +++ b/tests/pdf_417_black_box_4_testcase.rs @@ -25,7 +25,7 @@ use rxing::pdf417::PDF417Reader; * * @author Guenther Grau */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn pdf417_black_box4_test_case() { let mut tester = common::MultiImageSpanAbstractBlackBoxTestCase::new( diff --git a/tests/pdf_417_blackbox_tests.rs b/tests/pdf_417_blackbox_tests.rs index 46af1b5..20f623d 100644 --- a/tests/pdf_417_blackbox_tests.rs +++ b/tests/pdf_417_blackbox_tests.rs @@ -9,7 +9,7 @@ mod common; * * @author SITA Lab (kevin.osullivan@sita.aero) */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn pdf417_black_box1_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -31,7 +31,7 @@ fn pdf417_black_box1_test_case() { * * @author dswitkin@google.com (Daniel Switkin) */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn pdf417_black_box2_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -48,7 +48,7 @@ fn pdf417_black_box2_test_case() { /** * Tests {@link PDF417Reader} against more sample images. */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn pdf417_black_box3_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( diff --git a/tests/qr_code_blackbox_tests.rs b/tests/qr_code_blackbox_tests.rs index fde89a2..0a7e9e5 100644 --- a/tests/qr_code_blackbox_tests.rs +++ b/tests/qr_code_blackbox_tests.rs @@ -23,7 +23,7 @@ mod common; * @author Sean Owen */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn qrcode_black_box1_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -44,7 +44,7 @@ fn qrcode_black_box1_test_case() { * @author Sean Owen */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn qrcode_black_box2_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -65,7 +65,7 @@ fn qrcode_black_box2_test_case() { * @author dswitkin@google.com (Daniel Switkin) */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn qrcode_black_box3_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -87,7 +87,7 @@ fn qrcode_black_box3_test_case() { * @author dswitkin@google.com (Daniel Switkin) */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn qrcode_black_box4_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -112,7 +112,7 @@ fn qrcode_black_box4_test_case() { * @author dswitkin@google.com (Daniel Switkin) */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn qrcode_black_box5_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -133,7 +133,7 @@ fn qrcode_black_box5_test_case() { * rotation, which was a weak spot. */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn qrcode_black_box6_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( diff --git a/tests/rss_14_blackbox.rs b/tests/rss_14_blackbox.rs index faeb9a3..afc0f03 100644 --- a/tests/rss_14_blackbox.rs +++ b/tests/rss_14_blackbox.rs @@ -22,7 +22,7 @@ mod common; /** * @author Sean Owen */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn rss14_black_box1_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -41,7 +41,7 @@ fn rss14_black_box1_test_case() { /** * @author Sean Owen */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn rss14_black_box2_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( diff --git a/tests/rss_expanded_blackbox.rs b/tests/rss_expanded_blackbox.rs index e41f103..5ed68fe 100644 --- a/tests/rss_expanded_blackbox.rs +++ b/tests/rss_expanded_blackbox.rs @@ -32,7 +32,7 @@ mod common; /** * A test of {@link RSSExpandedReader} against a fixed test set of images. */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn rssexpanded_black_box1_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -51,7 +51,7 @@ fn rssexpanded_black_box1_test_case() { /** * A test of {@link RSSExpandedReader} against a fixed test set of images. */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn rssexpanded_black_box2_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -70,7 +70,7 @@ fn rssexpanded_black_box2_test_case() { /** * A test of {@link RSSExpandedReader} against a fixed test set of images. */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn rssexpanded_black_box3_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -90,7 +90,7 @@ fn rssexpanded_black_box3_test_case() { * A test of {@link RSSExpandedReader} against a fixed test set of images including * stacked RSS barcodes. */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn rssexpanded_stacked_black_box1_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -110,7 +110,7 @@ fn rssexpanded_stacked_black_box1_test_case() { * A test of {@link RSSExpandedReader} against a fixed test set of images including * stacked RSS barcodes. */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn rssexpanded_stacked_black_box2_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( diff --git a/tests/telepen_blackbox_1_test_case.rs b/tests/telepen_blackbox_1_test_case.rs index fd11ca6..d474a44 100644 --- a/tests/telepen_blackbox_1_test_case.rs +++ b/tests/telepen_blackbox_1_test_case.rs @@ -22,7 +22,7 @@ mod common; /** * @author Chris Wood */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn telepen_alpha_test_case() { const NUMTESTS: u32 = 5; @@ -39,7 +39,7 @@ fn telepen_alpha_test_case() { tester.test_black_box(); } -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn telepen_numeric_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( diff --git a/tests/upc_a_blackbox_tests.rs b/tests/upc_a_blackbox_tests.rs index 6c8a4b5..15d164b 100644 --- a/tests/upc_a_blackbox_tests.rs +++ b/tests/upc_a_blackbox_tests.rs @@ -22,7 +22,7 @@ mod common; /** * @author Sean Owen */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn upcablack_box1_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -42,7 +42,7 @@ fn upcablack_box1_test_case() { /** * @author dswitkin@google.com (Daniel Switkin) */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn upcablack_box2_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -62,7 +62,7 @@ fn upcablack_box2_test_case() { /** * @author dswitkin@google.com (Daniel Switkin) */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn upcablack_box3_reflective_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -82,7 +82,7 @@ fn upcablack_box3_reflective_test_case() { /** * @author dswitkin@google.com (Daniel Switkin) */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn upcablack_box4_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -102,7 +102,7 @@ fn upcablack_box4_test_case() { /** * @author dswitkin@google.com (Daniel Switkin) */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn upcablack_box5_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -123,7 +123,7 @@ fn upcablack_box5_test_case() { * A set of blurry images taken with a fixed-focus device. * @author dswitkin@google.com (Daniel Switkin) */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn upcablack_box6_blurry_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( diff --git a/tests/upc_e_blackbox_tests.rs b/tests/upc_e_blackbox_tests.rs index 6d5a682..08ac6b7 100644 --- a/tests/upc_e_blackbox_tests.rs +++ b/tests/upc_e_blackbox_tests.rs @@ -22,7 +22,7 @@ mod common; /** * @author Sean Owen */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn upceblack_box1_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -42,7 +42,7 @@ fn upceblack_box1_test_case() { /** * @author dswitkin@google.com (Daniel Switkin) */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn upceblack_box2_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( @@ -62,7 +62,7 @@ fn upceblack_box2_test_case() { /** * @author dswitkin@google.com (Daniel Switkin) */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn upceblack_box3_reflective_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( diff --git a/tests/upc_ean_extension_black_box_1_testcase.rs b/tests/upc_ean_extension_black_box_1_testcase.rs index 6bd3d90..b0039ab 100644 --- a/tests/upc_ean_extension_black_box_1_testcase.rs +++ b/tests/upc_ean_extension_black_box_1_testcase.rs @@ -22,7 +22,7 @@ mod common; /** * @author Sean Owen */ -#[cfg(feature = "image-formats")] +#[cfg(feature = "image_formats")] #[test] fn upceanextension_black_box1_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new(