Remove legacy OneToFourBitPattern function from Code93 decoder
#972
+105
−77
Conversation
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
axxel
requested changes
Jul 1, 2025
|
|
||
| namespace ZXing::OneD::Code93 { | ||
|
|
||
| const std::array<std::array<int, 6>, 48> CODE_PATTERNS = { { |
There was a problem hiding this comment.
I'd prefer to see this in the header and making it constexpr.
| 0x11A, 0x158, 0x14C, 0x146, 0x12C, 0x116, 0x1B4, 0x1B2, 0x1AC, 0x1A6, // K-T | ||
| 0x196, 0x19A, 0x16C, 0x166, 0x136, 0x13A, // U-Z | ||
| 0x12E, 0x1D4, 0x1D2, 0x1CA, 0x16E, 0x176, 0x1AE, // - - % | ||
| 0x126, 0x1DA, 0x1D6, 0x132, 0x15E, // Control chars ($)==a, (%)==b, (/)==c, (+)==d, * |
There was a problem hiding this comment.
Saving the comment regarding the control characters would be nice.
| 0x126, 0x1DA, 0x1D6, 0x132, 0x15E, // Control chars ($)==a, (%)==b, (/)==c, (+)==d, * | ||
| }; | ||
|
|
||
| static_assert(Size(ALPHABET) == Size(CHARACTER_ENCODINGS), "table size mismatch"); |
There was a problem hiding this comment.
This static_assert should also be preserved.
| // quiet zone is half the width of a character symbol | ||
| constexpr float QUIET_ZONE_SCALE = 0.5f; | ||
|
|
||
| //TODO: make this a constexpr variable initialization | ||
| static auto E2E_PATTERNS = [ ] { |
There was a problem hiding this comment.
Would you be able to implement this TODO (see also comment above)?
| @@ -99,9 +95,13 @@ Barcode Code93Reader::decodePattern(int rowNumber, PatternView& next, std::uniqu | |||
| if (!next.skipSymbol()) | |||
| return {}; | |||
|
|
|||
| txt += LookupBitPattern(OneToFourBitPattern<CHAR_LEN, CHAR_SUM>(next), CHARACTER_ENCODINGS, ALPHABET); | |||
There was a problem hiding this comment.
The LookupBitPattern helper use could very well stay.
| @@ -62,46 +61,6 @@ static bool DecodeDigit(const PatternView& view, std::string& txt, int* lgPatter | |||
| AppendBit(*lgPattern, bestMatch >= 10); | |||
|
|
|||
| return true; | |||
| #else | |||
There was a problem hiding this comment.
Please leave this disabled code alone. It might be useful as documentation in the future.
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.
This PR removes the
OneToFourBitPatternfunction, which was part of the legacy Code93 decoding logic.Code93 now consistently uses
NormalizedE2EPattern, instead ofOneToFourBitPattern.Removing this helps simplify the code and reduce technical debt.
Key changes:
OneToFourBitPatternwith the standardizedNormalizedE2EPatternapproach, already used across other symbologies.ODCode93Patterns.cpp: Contains theCODE_PATTERNSdefinition for Code93.ODCode93Patterns.h: Corresponding header for pattern definitions.Modified files:
ODCode93Reader.cpp: RemovedOneToFourBitPattern, updated decoding logic to useNormalizedE2EPattern.ODMultiUPCEANReader.cpp: Removed residual mentions ofOneToFourBitPatternfrom an unused/dead code path inDecodeDigit. This was done for cleanup and consistency.ODRowReader.h: RemovedOneToFourBitPattern, which is no more needed.core/CMakeLists.txt: Added the newODCode93Patternsfiles to the build.Please review the changes and let me know if further adjustments are needed.
Thank you.