From 24b11a6d4de1977d668cd0c3e57a3c221891efd1 Mon Sep 17 00:00:00 2001 From: Daniel Gredler Date: Tue, 12 Mar 2024 17:51:21 +0100 Subject: [PATCH] Symbols without readable text should start with text location NONE --- .../java/uk/org/okapibarcode/backend/AustraliaPost.java | 1 + src/main/java/uk/org/okapibarcode/backend/AztecCode.java | 7 +++++++ src/main/java/uk/org/okapibarcode/backend/AztecRune.java | 7 +++++++ src/main/java/uk/org/okapibarcode/backend/CodablockF.java | 7 +++++++ src/main/java/uk/org/okapibarcode/backend/Code16k.java | 7 +++++++ src/main/java/uk/org/okapibarcode/backend/Code49.java | 7 +++++++ src/main/java/uk/org/okapibarcode/backend/CodeOne.java | 7 +++++++ src/main/java/uk/org/okapibarcode/backend/DataMatrix.java | 7 +++++++ src/main/java/uk/org/okapibarcode/backend/GridMatrix.java | 7 +++++++ src/main/java/uk/org/okapibarcode/backend/JapanPost.java | 7 +++++++ src/main/java/uk/org/okapibarcode/backend/KixCode.java | 7 +++++++ src/main/java/uk/org/okapibarcode/backend/MaxiCode.java | 1 + src/main/java/uk/org/okapibarcode/backend/MicroQrCode.java | 7 +++++++ src/main/java/uk/org/okapibarcode/backend/Pdf417.java | 1 + src/main/java/uk/org/okapibarcode/backend/Pharmacode.java | 7 +++++++ .../java/uk/org/okapibarcode/backend/Pharmacode2Track.java | 7 +++++++ src/main/java/uk/org/okapibarcode/backend/QrCode.java | 7 +++++++ .../java/uk/org/okapibarcode/backend/RoyalMail4State.java | 7 +++++++ 18 files changed, 108 insertions(+) diff --git a/src/main/java/uk/org/okapibarcode/backend/AustraliaPost.java b/src/main/java/uk/org/okapibarcode/backend/AustraliaPost.java index 58b6f7dd..3cfab94f 100644 --- a/src/main/java/uk/org/okapibarcode/backend/AustraliaPost.java +++ b/src/main/java/uk/org/okapibarcode/backend/AustraliaPost.java @@ -147,6 +147,7 @@ public AustraliaPost() { */ public AustraliaPost(Mode mode) { this.mode = mode; + this.humanReadableLocation = HumanReadableLocation.NONE; } /** diff --git a/src/main/java/uk/org/okapibarcode/backend/AztecCode.java b/src/main/java/uk/org/okapibarcode/backend/AztecCode.java index f275a0e5..523ce12f 100644 --- a/src/main/java/uk/org/okapibarcode/backend/AztecCode.java +++ b/src/main/java/uk/org/okapibarcode/backend/AztecCode.java @@ -330,6 +330,13 @@ private static int avoidReferenceGrid(int input) { private int structuredAppendPosition = 1; private int structuredAppendTotal = 1; + /** + * Creates a new instance. + */ + public AztecCode() { + this.humanReadableLocation = HumanReadableLocation.NONE; + } + /** *

Sets a preferred symbol size. This value may be ignored if data string is * too large to fit in the specified symbol size. Values correspond to symbol diff --git a/src/main/java/uk/org/okapibarcode/backend/AztecRune.java b/src/main/java/uk/org/okapibarcode/backend/AztecRune.java index 3fa962e6..d9a8a44f 100644 --- a/src/main/java/uk/org/okapibarcode/backend/AztecRune.java +++ b/src/main/java/uk/org/okapibarcode/backend/AztecRune.java @@ -39,6 +39,13 @@ public class AztecRune extends Symbol { 0, 0, 22, 21, 20, 19, 18, 17, 16, 0, 0 }; + /** + * Creates a new instance. + */ + public AztecRune() { + this.humanReadableLocation = HumanReadableLocation.NONE; + } + @Override protected void encode() { diff --git a/src/main/java/uk/org/okapibarcode/backend/CodablockF.java b/src/main/java/uk/org/okapibarcode/backend/CodablockF.java index 19a91400..33568656 100644 --- a/src/main/java/uk/org/okapibarcode/backend/CodablockF.java +++ b/src/main/java/uk/org/okapibarcode/backend/CodablockF.java @@ -60,6 +60,13 @@ private enum CfMode { private CfMode final_mode; private CfMode[] subset_selector = new CfMode[44]; + /** + * Creates a new instance. + */ + public CodablockF() { + this.humanReadableLocation = HumanReadableLocation.NONE; + } + /** * TODO: It doesn't appear that this symbol should support GS1 (it's not in the GS1 spec and Zint doesn't * support GS1 with this type of symbology). However, the code below does contain GS1 checks, so we'll mark diff --git a/src/main/java/uk/org/okapibarcode/backend/Code16k.java b/src/main/java/uk/org/okapibarcode/backend/Code16k.java index 7fc25f1d..39f5b6a0 100644 --- a/src/main/java/uk/org/okapibarcode/backend/Code16k.java +++ b/src/main/java/uk/org/okapibarcode/backend/Code16k.java @@ -72,6 +72,13 @@ private enum Mode { private int[] block_length = new int[170]; /* RENAME block_length */ private int block_count; + /** + * Creates a new instance. + */ + public Code16k() { + this.humanReadableLocation = HumanReadableLocation.NONE; + } + @Override protected boolean gs1Supported() { return true; diff --git a/src/main/java/uk/org/okapibarcode/backend/Code49.java b/src/main/java/uk/org/okapibarcode/backend/Code49.java index 7f578968..29457da2 100644 --- a/src/main/java/uk/org/okapibarcode/backend/Code49.java +++ b/src/main/java/uk/org/okapibarcode/backend/Code49.java @@ -995,6 +995,13 @@ public class Code49 extends Symbol { '%', '!', '&', '*' }; + /** + * Creates a new instance. + */ + public Code49() { + this.humanReadableLocation = HumanReadableLocation.NONE; + } + @Override protected boolean gs1Supported() { return true; diff --git a/src/main/java/uk/org/okapibarcode/backend/CodeOne.java b/src/main/java/uk/org/okapibarcode/backend/CodeOne.java index fa1d3ca5..e19e2829 100644 --- a/src/main/java/uk/org/okapibarcode/backend/CodeOne.java +++ b/src/main/java/uk/org/okapibarcode/backend/CodeOne.java @@ -113,6 +113,13 @@ private enum Mode { private int[][] datagrid = new int[136][120]; private boolean[][] outputGrid = new boolean[148][134]; + /** + * Creates a new instance. + */ + public CodeOne() { + this.humanReadableLocation = HumanReadableLocation.NONE; + } + /** * Sets the preferred symbol size / version. Versions A to H are square symbols. * Version S and T are fixed height symbols. This value may be ignored if the input diff --git a/src/main/java/uk/org/okapibarcode/backend/DataMatrix.java b/src/main/java/uk/org/okapibarcode/backend/DataMatrix.java index 5cb1e575..d70dfaf2 100644 --- a/src/main/java/uk/org/okapibarcode/backend/DataMatrix.java +++ b/src/main/java/uk/org/okapibarcode/backend/DataMatrix.java @@ -145,6 +145,13 @@ private enum Mode { private int[] process_buffer = new int[8]; private int codewordCount; + /** + * Creates a new instance. + */ + public DataMatrix() { + this.humanReadableLocation = HumanReadableLocation.NONE; + } + /** * Forces the symbol to be either square or rectangular (non-square). Used only * if a {@link #getPreferredSize() preferred size} has not been specified. diff --git a/src/main/java/uk/org/okapibarcode/backend/GridMatrix.java b/src/main/java/uk/org/okapibarcode/backend/GridMatrix.java index 41f07f3e..f3e5a373 100644 --- a/src/main/java/uk/org/okapibarcode/backend/GridMatrix.java +++ b/src/main/java/uk/org/okapibarcode/backend/GridMatrix.java @@ -193,6 +193,13 @@ private enum Mode { private int preferredVersion = 0; private int preferredEccLevel = -1; + /** + * Creates a new instance. + */ + public GridMatrix() { + this.humanReadableLocation = HumanReadableLocation.NONE; + } + /** * Set preferred size, or "version" of the symbol according to the following * table. This value may be ignored if the data to be encoded does not fit diff --git a/src/main/java/uk/org/okapibarcode/backend/JapanPost.java b/src/main/java/uk/org/okapibarcode/backend/JapanPost.java index 24240291..1f2b55af 100644 --- a/src/main/java/uk/org/okapibarcode/backend/JapanPost.java +++ b/src/main/java/uk/org/okapibarcode/backend/JapanPost.java @@ -47,6 +47,13 @@ public class JapanPost extends Symbol { 'd', 'e', 'f', 'g', 'h' }; + /** + * Creates a new instance. + */ + public JapanPost() { + this.humanReadableLocation = HumanReadableLocation.NONE; + } + @Override protected void encode() { diff --git a/src/main/java/uk/org/okapibarcode/backend/KixCode.java b/src/main/java/uk/org/okapibarcode/backend/KixCode.java index e10e9c62..4c642582 100644 --- a/src/main/java/uk/org/okapibarcode/backend/KixCode.java +++ b/src/main/java/uk/org/okapibarcode/backend/KixCode.java @@ -48,6 +48,13 @@ public class KixCode extends Symbol { 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z' }; + /** + * Creates a new instance. + */ + public KixCode() { + this.humanReadableLocation = HumanReadableLocation.NONE; + } + @Override protected void encode() { diff --git a/src/main/java/uk/org/okapibarcode/backend/MaxiCode.java b/src/main/java/uk/org/okapibarcode/backend/MaxiCode.java index 1b787085..b44367c4 100644 --- a/src/main/java/uk/org/okapibarcode/backend/MaxiCode.java +++ b/src/main/java/uk/org/okapibarcode/backend/MaxiCode.java @@ -140,6 +140,7 @@ public MaxiCode() { */ public MaxiCode(int mode) { setMode(mode); + this.humanReadableLocation = HumanReadableLocation.NONE; } /** diff --git a/src/main/java/uk/org/okapibarcode/backend/MicroQrCode.java b/src/main/java/uk/org/okapibarcode/backend/MicroQrCode.java index 779eff0e..247cae2a 100644 --- a/src/main/java/uk/org/okapibarcode/backend/MicroQrCode.java +++ b/src/main/java/uk/org/okapibarcode/backend/MicroQrCode.java @@ -71,6 +71,13 @@ private enum qrMode { private int[] grid; private int[] eval; + /** + * Creates a new instance. + */ + public MicroQrCode() { + this.humanReadableLocation = HumanReadableLocation.NONE; + } + /** *

Sets the preferred symbol size. This value may be ignored if the * data string is too large to fit into the specified symbol. Input diff --git a/src/main/java/uk/org/okapibarcode/backend/Pdf417.java b/src/main/java/uk/org/okapibarcode/backend/Pdf417.java index 95c1678f..0b71bbc1 100644 --- a/src/main/java/uk/org/okapibarcode/backend/Pdf417.java +++ b/src/main/java/uk/org/okapibarcode/backend/Pdf417.java @@ -519,6 +519,7 @@ public Pdf417() { */ public Pdf417(Mode mode) { this.symbolMode = mode; + this.humanReadableLocation = HumanReadableLocation.NONE; setBarHeight(3); } diff --git a/src/main/java/uk/org/okapibarcode/backend/Pharmacode.java b/src/main/java/uk/org/okapibarcode/backend/Pharmacode.java index 036c4d05..0d6cd2d8 100644 --- a/src/main/java/uk/org/okapibarcode/backend/Pharmacode.java +++ b/src/main/java/uk/org/okapibarcode/backend/Pharmacode.java @@ -27,6 +27,13 @@ */ public class Pharmacode extends Symbol { + /** + * Creates a new instance. + */ + public Pharmacode() { + this.humanReadableLocation = HumanReadableLocation.NONE; + } + @Override protected void encode() { diff --git a/src/main/java/uk/org/okapibarcode/backend/Pharmacode2Track.java b/src/main/java/uk/org/okapibarcode/backend/Pharmacode2Track.java index 73baf584..57e23c1d 100644 --- a/src/main/java/uk/org/okapibarcode/backend/Pharmacode2Track.java +++ b/src/main/java/uk/org/okapibarcode/backend/Pharmacode2Track.java @@ -29,6 +29,13 @@ */ public class Pharmacode2Track extends Symbol { + /** + * Creates a new instance. + */ + public Pharmacode2Track() { + this.humanReadableLocation = HumanReadableLocation.NONE; + } + @Override protected void encode() { diff --git a/src/main/java/uk/org/okapibarcode/backend/QrCode.java b/src/main/java/uk/org/okapibarcode/backend/QrCode.java index ab35fd02..8fe76fcc 100644 --- a/src/main/java/uk/org/okapibarcode/backend/QrCode.java +++ b/src/main/java/uk/org/okapibarcode/backend/QrCode.java @@ -173,6 +173,13 @@ private enum QrMode { protected boolean improveEccLevelIfPossible = true; protected boolean forceByteCompaction; + /** + * Creates a new instance. + */ + public QrCode() { + this.humanReadableLocation = HumanReadableLocation.NONE; + } + /** * Sets the preferred symbol size / version. This value may be ignored if the data * string is too large to fit into the specified symbol. Input values correspond diff --git a/src/main/java/uk/org/okapibarcode/backend/RoyalMail4State.java b/src/main/java/uk/org/okapibarcode/backend/RoyalMail4State.java index 45724d4a..c3481f0f 100644 --- a/src/main/java/uk/org/okapibarcode/backend/RoyalMail4State.java +++ b/src/main/java/uk/org/okapibarcode/backend/RoyalMail4State.java @@ -54,6 +54,13 @@ public class RoyalMail4State extends Symbol { 'U', 'V', 'W', 'X', 'Y', 'Z' }; + /** + * Creates a new instance. + */ + public RoyalMail4State() { + this.humanReadableLocation = HumanReadableLocation.NONE; + } + @Override protected void encode() {