EncodeHintType.java (zxing-zxing-3.4.1) | : | EncodeHintType.java (zxing-zxing-3.5.0) | ||
---|---|---|---|---|
skipping to change at line 48 | skipping to change at line 48 | |||
* Specifies what character encoding to use where applicable (type {@link Stri ng}) | * Specifies what character encoding to use where applicable (type {@link Stri ng}) | |||
*/ | */ | |||
CHARACTER_SET, | CHARACTER_SET, | |||
/** | /** | |||
* Specifies the matrix shape for Data Matrix (type {@link com.google.zxing.da tamatrix.encoder.SymbolShapeHint}) | * Specifies the matrix shape for Data Matrix (type {@link com.google.zxing.da tamatrix.encoder.SymbolShapeHint}) | |||
*/ | */ | |||
DATA_MATRIX_SHAPE, | DATA_MATRIX_SHAPE, | |||
/** | /** | |||
* Specifies whether to use compact mode for Data Matrix (type {@link Boolean} | ||||
, or "true" or "false" | ||||
* {@link String } value). | ||||
* The compact encoding mode also supports the encoding of characters that are | ||||
not in the ISO-8859-1 | ||||
* character set via ECIs. | ||||
* Please note that in that case, the most compact character encoding is chose | ||||
n for characters in | ||||
* the input that are not in the ISO-8859-1 character set. Based on experience | ||||
, some scanners do not | ||||
* support encodings like cp-1256 (Arabic). In such cases the encoding can be | ||||
forced to UTF-8 by | ||||
* means of the {@link #CHARACTER_SET} encoding hint. | ||||
* Compact encoding also provides GS1-FNC1 support when {@link #GS1_FORMAT} is | ||||
selected. In this case | ||||
* group-separator character (ASCII 29 decimal) can be used to encode the posi | ||||
tions of FNC1 codewords | ||||
* for the purpose of delimiting AIs. | ||||
* This option and {@link #FORCE_C40} are mutually exclusive. | ||||
*/ | ||||
DATA_MATRIX_COMPACT, | ||||
/** | ||||
* Specifies a minimum barcode size (type {@link Dimension}). Only applicable to Data Matrix now. | * Specifies a minimum barcode size (type {@link Dimension}). Only applicable to Data Matrix now. | |||
* | * | |||
* @deprecated use width/height params in | * @deprecated use width/height params in | |||
* {@link com.google.zxing.datamatrix.DataMatrixWriter#encode(String, BarcodeF ormat, int, int)} | * {@link com.google.zxing.datamatrix.DataMatrixWriter#encode(String, BarcodeF ormat, int, int)} | |||
*/ | */ | |||
@Deprecated | @Deprecated | |||
MIN_SIZE, | MIN_SIZE, | |||
/** | /** | |||
* Specifies a maximum barcode size (type {@link Dimension}). Only applicable to Data Matrix now. | * Specifies a maximum barcode size (type {@link Dimension}). Only applicable to Data Matrix now. | |||
skipping to change at line 91 | skipping to change at line 107 | |||
*/ | */ | |||
PDF417_COMPACTION, | PDF417_COMPACTION, | |||
/** | /** | |||
* Specifies the minimum and maximum number of rows and columns for PDF417 (ty pe | * Specifies the minimum and maximum number of rows and columns for PDF417 (ty pe | |||
* {@link com.google.zxing.pdf417.encoder.Dimensions Dimensions}). | * {@link com.google.zxing.pdf417.encoder.Dimensions Dimensions}). | |||
*/ | */ | |||
PDF417_DIMENSIONS, | PDF417_DIMENSIONS, | |||
/** | /** | |||
* Specifies whether to automatically insert ECIs when encoding PDF417 (type { | ||||
@link Boolean}, or "true" or "false" | ||||
* {@link String} value). | ||||
* Please note that in that case, the most compact character encoding is chose | ||||
n for characters in | ||||
* the input that are not in the ISO-8859-1 character set. Based on experience | ||||
, some scanners do not | ||||
* support encodings like cp-1256 (Arabic). In such cases the encoding can be | ||||
forced to UTF-8 by | ||||
* means of the {@link #CHARACTER_SET} encoding hint. | ||||
*/ | ||||
PDF417_AUTO_ECI, | ||||
/** | ||||
* Specifies the required number of layers for an Aztec code. | * Specifies the required number of layers for an Aztec code. | |||
* A negative number (-1, -2, -3, -4) specifies a compact Aztec code. | * A negative number (-1, -2, -3, -4) specifies a compact Aztec code. | |||
* 0 indicates to use the minimum number of layers (the default). | * 0 indicates to use the minimum number of layers (the default). | |||
* A positive number (1, 2, .. 32) specifies a normal (non-compact) Aztec code . | * A positive number (1, 2, .. 32) specifies a normal (non-compact) Aztec code . | |||
* (Type {@link Integer}, or {@link String} representation of the integer valu e). | * (Type {@link Integer}, or {@link String} representation of the integer valu e). | |||
*/ | */ | |||
AZTEC_LAYERS, | AZTEC_LAYERS, | |||
/** | /** | |||
* Specifies the exact version of QR code to be encoded. | * Specifies the exact version of QR code to be encoded. | |||
skipping to change at line 114 | skipping to change at line 140 | |||
/** | /** | |||
* Specifies the QR code mask pattern to be used. Allowed values are | * Specifies the QR code mask pattern to be used. Allowed values are | |||
* 0..QRCode.NUM_MASK_PATTERNS-1. By default the code will automatically selec t | * 0..QRCode.NUM_MASK_PATTERNS-1. By default the code will automatically selec t | |||
* the optimal mask pattern. | * the optimal mask pattern. | |||
* * (Type {@link Integer}, or {@link String} representation of the integer va lue). | * * (Type {@link Integer}, or {@link String} representation of the integer va lue). | |||
*/ | */ | |||
QR_MASK_PATTERN, | QR_MASK_PATTERN, | |||
/** | /** | |||
* Specifies whether to use compact mode for QR code (type {@link Boolean}, or | ||||
"true" or "false" | ||||
* {@link String } value). | ||||
* Please note that when compaction is performed, the most compact character e | ||||
ncoding is chosen | ||||
* for characters in the input that are not in the ISO-8859-1 character set. B | ||||
ased on experience, | ||||
* some scanners do not support encodings like cp-1256 (Arabic). In such cases | ||||
the encoding can | ||||
* be forced to UTF-8 by means of the {@link #CHARACTER_SET} encoding hint. | ||||
*/ | ||||
QR_COMPACT, | ||||
/** | ||||
* Specifies whether the data should be encoded to the GS1 standard (type {@li nk Boolean}, or "true" or "false" | * Specifies whether the data should be encoded to the GS1 standard (type {@li nk Boolean}, or "true" or "false" | |||
* {@link String } value). | * {@link String } value). | |||
*/ | */ | |||
GS1_FORMAT, | GS1_FORMAT, | |||
/** | ||||
* Forces which encoding will be used. Currently only used for Code-128 code s | ||||
ets (Type {@link String}). | ||||
* Valid values are "A", "B", "C". | ||||
* This option and {@link #CODE128_COMPACT} are mutually exclusive. | ||||
*/ | ||||
FORCE_CODE_SET, | ||||
/** | ||||
* Forces C40 encoding for data-matrix (type {@link Boolean}, or "true" or "fa | ||||
lse") {@link String } value). This | ||||
* option and {@link #DATA_MATRIX_COMPACT} are mutually exclusive. | ||||
*/ | ||||
FORCE_C40, | ||||
/** | ||||
* Specifies whether to use compact mode for Code-128 code (type {@link Boolea | ||||
n}, or "true" or "false" | ||||
* {@link String } value). | ||||
* This can yield slightly smaller bar codes. This option and {@link #FORCE_CO | ||||
DE_SET} are mutually | ||||
* exclusive. | ||||
*/ | ||||
CODE128_COMPACT, | ||||
} | } | |||
End of changes. 4 change blocks. | ||||
0 lines changed or deleted | 77 lines changed or added |