Split alphanumeric encoding from QRCodeGenerator, split encoding tables #590
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
Shane32
changed the title
Shane32
changed the title
Shane32
commented
Apr 7, 2025
| /// <summary> | ||
| /// Checks if a character is present in the alphanumeric encoding table. | ||
| /// </summary> | ||
| public static bool CanEncode(char c) => IsInRange(c, 'A', 'Z') || Array.IndexOf(_alphanumEncTable, c) >= 0; |
There was a problem hiding this comment.
Changed from IsInRange(c, 'A', 'Z') || _alphanumEncTable.Contains(c) to eliminate LINQ use
Shane32
commented
Apr 7, 2025
| var localAlphanumEncDict = new Dictionary<char, int>(45); | ||
| // Add 0-9 | ||
| for (char c = '0'; c <= '9'; c++) | ||
| localAlphanumEncDict.Add(c, c - '0'); |
There was a problem hiding this comment.
Changed from localAlphanumEncDict.Add($"{i}"[0], i); to eliminate string encoding
Shane32
commented
Apr 7, 2025
| /// <returns>A dictionary where keys are QR code version numbers and values are AlignmentPattern structures detailing the positions of alignment patterns for each version.</returns> | ||
| private static Dictionary<int, AlignmentPattern> CreateAlignmentPatternTable() | ||
| { | ||
| var alignmentPatternBaseValues = new int[] { 0, 0, 0, 0, 0, 0, 0, 6, 18, 0, 0, 0, 0, 0, 6, 22, 0, 0, 0, 0, 0, 6, 26, 0, 0, 0, 0, 0, 6, 30, 0, 0, 0, 0, 0, 6, 34, 0, 0, 0, 0, 0, 6, 22, 38, 0, 0, 0, 0, 6, 24, 42, 0, 0, 0, 0, 6, 26, 46, 0, 0, 0, 0, 6, 28, 50, 0, 0, 0, 0, 6, 30, 54, 0, 0, 0, 0, 6, 32, 58, 0, 0, 0, 0, 6, 34, 62, 0, 0, 0, 0, 6, 26, 46, 66, 0, 0, 0, 6, 26, 48, 70, 0, 0, 0, 6, 26, 50, 74, 0, 0, 0, 6, 30, 54, 78, 0, 0, 0, 6, 30, 56, 82, 0, 0, 0, 6, 30, 58, 86, 0, 0, 0, 6, 34, 62, 90, 0, 0, 0, 6, 28, 50, 72, 94, 0, 0, 6, 26, 50, 74, 98, 0, 0, 6, 30, 54, 78, 102, 0, 0, 6, 28, 54, 80, 106, 0, 0, 6, 32, 58, 84, 110, 0, 0, 6, 30, 58, 86, 114, 0, 0, 6, 34, 62, 90, 118, 0, 0, 6, 26, 50, 74, 98, 122, 0, 6, 30, 54, 78, 102, 126, 0, 6, 26, 52, 78, 104, 130, 0, 6, 30, 56, 82, 108, 134, 0, 6, 34, 60, 86, 112, 138, 0, 6, 30, 58, 86, 114, 142, 0, 6, 34, 62, 90, 118, 146, 0, 6, 30, 54, 78, 102, 126, 150, 6, 24, 50, 76, 102, 128, 154, 6, 28, 54, 80, 106, 132, 158, 6, 32, 58, 84, 110, 136, 162, 6, 26, 54, 82, 110, 138, 166, 6, 30, 58, 86, 114, 142, 170 }; |
There was a problem hiding this comment.
Move from static field so that array is not retained in memory after creating the dictionary
Shane32
commented
Apr 7, 2025
Shane32
commented
Apr 7, 2025
| @@ -113,7 +113,6 @@ public void can_render_pngbyte_qrcode_color_without_quietzones() | |||
| var result = HelperFunctions.ByteArrayToHash(pngCodeGfx); | |||
| result.ShouldBe("07f760b3eb54901840b094d31e299713"); | |||
| #else | |||
| File.WriteAllBytes(@"C:\Temp\pngbyte_35.png", pngCodeGfx); | |||
There was a problem hiding this comment.
seems to be a temporary line of code, crashing local tests when C:\Temp does not exist
|
@codebude Ready for review please. This is pretty basic refactoring, further code-splitting |
gfoidl
approved these changes
Apr 15, 2025
Co-authored-by: Günther Foidl <[email protected]>
Shane32
commented
Apr 16, 2025
| /// This is particularly necessary when performing multiplications in the field which can result in exponents exceeding the field's maximum. | ||
| /// </summary> | ||
| public static int ShrinkAlphaExp(int alphaExp) | ||
| => (alphaExp % 256) + (alphaExp / 256); |
There was a problem hiding this comment.
Changed from:
=> (int)((alphaExp % 256) + Math.Floor((double)(alphaExp / 256)));Since the conversion to double had taken place AFTER integer division, the Math.Floor and casts were pointless, so they are now removed. Thanks @gfoidl for noticing.
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.
Refactoring for readability, maybe as prep to add Micro QR code support; no functional changes; no public API changes. Also made a few other inconsequential changes; see notes below.
Note that tests are not all passing locally for me anymore, probably due to PNG encoding not being stable across .NET versions/frameworks