mirror of
https://git.code.sf.net/p/zint/code
synced 2025-05-18 00:54:36 -04:00
- vector: ensure separators don't overlap with other rectangles so that
they render correctly when have RGBA alpha channel - GUI: update_preview() after Data Dialog return to ensure preview in sync - GUI: add automatic info feedback to "Automatic" combo item of size/row/height comboboxes - backend_qt: always call getMaxRectsRightBottom() for render fudge; use ZBarcode_Clear() instead of ZBarcode_Delete() after 1st call - update BWIPP to latest & add some MICROQR tests to exercise optimize change
This commit is contained in:
gitlost
parent
c0a5c7b125
commit
c0ec67f99e
18 changed files with 2115 additions and 809 deletions
|
|
@ -666,6 +666,7 @@ static void draw_bind_box(const struct zint_symbol *symbol, unsigned char *pixel
|
|||
const int xoffset_si, const int yoffset_si, const int symbol_height_si, const int dot_overspill_si,
|
||||
const int image_width, const int image_height, const int si) {
|
||||
if (symbol->border_width > 0 && (symbol->output_options & (BARCODE_BOX | BARCODE_BIND))) {
|
||||
const int is_codablockf = symbol->symbology == BARCODE_CODABLOCKF || symbol->symbology == BARCODE_HIBC_BLOCKF;
|
||||
const int horz_outside = is_fixed_ratio(symbol->symbology);
|
||||
const int bwidth_si = symbol->border_width * si;
|
||||
int ybind_top = yoffset_si - bwidth_si;
|
||||
|
|
@ -675,8 +676,7 @@ static void draw_bind_box(const struct zint_symbol *symbol, unsigned char *pixel
|
|||
ybind_bot = image_height - bwidth_si;
|
||||
}
|
||||
/* Horizontal boundary bars */
|
||||
if ((symbol->output_options & BARCODE_BOX)
|
||||
|| (symbol->symbology != BARCODE_CODABLOCKF && symbol->symbology != BARCODE_HIBC_BLOCKF)) {
|
||||
if ((symbol->output_options & BARCODE_BOX) || !is_codablockf) {
|
||||
/* Box or not CodaBlockF */
|
||||
draw_bar(pixelbuf, 0, image_width, ybind_top, bwidth_si, image_width, image_height, DEFAULT_INK);
|
||||
draw_bar(pixelbuf, 0, image_width, ybind_bot, bwidth_si, image_width, image_height, DEFAULT_INK);
|
||||
|
|
@ -928,6 +928,7 @@ static int plot_raster_default(struct zint_symbol *symbol, const int rotate_angl
|
|||
int text_height; /* Font pixel size (so whole integers) */
|
||||
float text_gap; /* Gap between barcode and text */
|
||||
float guard_descent;
|
||||
const int is_codablockf = symbol->symbology == BARCODE_CODABLOCKF || symbol->symbology == BARCODE_HIBC_BLOCKF;
|
||||
|
||||
int textflags = 0;
|
||||
int xoffset_si, yoffset_si, roffset_si, boffset_si;
|
||||
|
|
@ -1266,7 +1267,7 @@ static int plot_raster_default(struct zint_symbol *symbol, const int rotate_angl
|
|||
}
|
||||
sep_height_si = (int) (sep_height * si);
|
||||
sep_yoffset_si = yoffset_si + row_heights_si[0] - sep_height_si / 2;
|
||||
if (symbol->symbology == BARCODE_CODABLOCKF || symbol->symbology == BARCODE_HIBC_BLOCKF) {
|
||||
if (is_codablockf) {
|
||||
/* Avoid 11-module start and 13-module stop chars */
|
||||
sep_xoffset_si += 11 * si;
|
||||
sep_width_si -= (11 + 13) * si;
|
||||
|
|
|
|||
|
|
@ -11,50 +11,73 @@
|
|||
<rect x="20.00" y="2.00" width="4.00" height="60.00" />
|
||||
<rect x="26.00" y="2.00" width="2.00" height="60.00" />
|
||||
<rect x="36.00" y="2.00" width="2.00" height="60.00" />
|
||||
<rect x="42.00" y="2.00" width="2.00" height="60.00" />
|
||||
<rect x="46.00" y="2.00" width="8.00" height="60.00" />
|
||||
<rect x="56.00" y="2.00" width="6.00" height="60.00" />
|
||||
<rect x="64.00" y="2.00" width="2.00" height="20.00" />
|
||||
<rect x="70.00" y="2.00" width="2.00" height="20.00" />
|
||||
<rect x="74.00" y="2.00" width="4.00" height="20.00" />
|
||||
<rect x="86.00" y="2.00" width="2.00" height="60.00" />
|
||||
<rect x="90.00" y="2.00" width="2.00" height="60.00" />
|
||||
<rect x="98.00" y="2.00" width="4.00" height="60.00" />
|
||||
<rect x="108.00" y="2.00" width="2.00" height="60.00" />
|
||||
<rect x="112.00" y="2.00" width="2.00" height="40.00" />
|
||||
<rect x="120.00" y="2.00" width="4.00" height="40.00" />
|
||||
<rect x="130.00" y="2.00" width="2.00" height="40.00" />
|
||||
<rect x="134.00" y="2.00" width="2.00" height="40.00" />
|
||||
<rect x="142.00" y="2.00" width="4.00" height="40.00" />
|
||||
<rect x="152.00" y="2.00" width="2.00" height="40.00" />
|
||||
<rect x="156.00" y="2.00" width="2.00" height="40.00" />
|
||||
<rect x="164.00" y="2.00" width="4.00" height="40.00" />
|
||||
<rect x="174.00" y="2.00" width="4.00" height="20.00" />
|
||||
<rect x="180.00" y="2.00" width="4.00" height="20.00" />
|
||||
<rect x="188.00" y="2.00" width="4.00" height="20.00" />
|
||||
<rect x="42.00" y="2.00" width="2.00" height="19.00" />
|
||||
<rect x="46.00" y="2.00" width="8.00" height="19.00" />
|
||||
<rect x="56.00" y="2.00" width="6.00" height="19.00" />
|
||||
<rect x="64.00" y="2.00" width="2.00" height="19.00" />
|
||||
<rect x="70.00" y="2.00" width="2.00" height="19.00" />
|
||||
<rect x="74.00" y="2.00" width="4.00" height="19.00" />
|
||||
<rect x="86.00" y="2.00" width="2.00" height="19.00" />
|
||||
<rect x="90.00" y="2.00" width="2.00" height="19.00" />
|
||||
<rect x="98.00" y="2.00" width="4.00" height="19.00" />
|
||||
<rect x="108.00" y="2.00" width="2.00" height="19.00" />
|
||||
<rect x="112.00" y="2.00" width="2.00" height="19.00" />
|
||||
<rect x="120.00" y="2.00" width="4.00" height="19.00" />
|
||||
<rect x="130.00" y="2.00" width="2.00" height="19.00" />
|
||||
<rect x="134.00" y="2.00" width="2.00" height="19.00" />
|
||||
<rect x="142.00" y="2.00" width="4.00" height="19.00" />
|
||||
<rect x="152.00" y="2.00" width="2.00" height="19.00" />
|
||||
<rect x="156.00" y="2.00" width="2.00" height="19.00" />
|
||||
<rect x="164.00" y="2.00" width="4.00" height="19.00" />
|
||||
<rect x="174.00" y="2.00" width="4.00" height="19.00" />
|
||||
<rect x="180.00" y="2.00" width="4.00" height="19.00" />
|
||||
<rect x="188.00" y="2.00" width="4.00" height="19.00" />
|
||||
<rect x="196.00" y="2.00" width="4.00" height="60.00" />
|
||||
<rect x="206.00" y="2.00" width="6.00" height="60.00" />
|
||||
<rect x="214.00" y="2.00" width="2.00" height="60.00" />
|
||||
<rect x="218.00" y="2.00" width="4.00" height="60.00" />
|
||||
<rect x="64.00" y="22.00" width="4.00" height="20.00" />
|
||||
<rect x="74.00" y="22.00" width="2.00" height="20.00" />
|
||||
<rect x="80.00" y="22.00" width="2.00" height="20.00" />
|
||||
<rect x="174.00" y="22.00" width="8.00" height="20.00" />
|
||||
<rect x="184.00" y="22.00" width="2.00" height="40.00" />
|
||||
<rect x="192.00" y="22.00" width="2.00" height="20.00" />
|
||||
<rect x="64.00" y="42.00" width="2.00" height="20.00" />
|
||||
<rect x="68.00" y="42.00" width="4.00" height="20.00" />
|
||||
<rect x="76.00" y="42.00" width="6.00" height="20.00" />
|
||||
<rect x="112.00" y="42.00" width="6.00" height="20.00" />
|
||||
<rect x="120.00" y="42.00" width="8.00" height="20.00" />
|
||||
<rect x="130.00" y="42.00" width="4.00" height="20.00" />
|
||||
<rect x="138.00" y="42.00" width="4.00" height="20.00" />
|
||||
<rect x="144.00" y="42.00" width="4.00" height="20.00" />
|
||||
<rect x="152.00" y="42.00" width="4.00" height="20.00" />
|
||||
<rect x="160.00" y="42.00" width="6.00" height="20.00" />
|
||||
<rect x="170.00" y="42.00" width="2.00" height="20.00" />
|
||||
<rect x="174.00" y="42.00" width="4.00" height="20.00" />
|
||||
<rect x="190.00" y="42.00" width="2.00" height="20.00" />
|
||||
<rect x="42.00" y="23.00" width="2.00" height="18.00" />
|
||||
<rect x="46.00" y="23.00" width="8.00" height="18.00" />
|
||||
<rect x="56.00" y="23.00" width="6.00" height="18.00" />
|
||||
<rect x="64.00" y="23.00" width="4.00" height="18.00" />
|
||||
<rect x="74.00" y="23.00" width="2.00" height="18.00" />
|
||||
<rect x="80.00" y="23.00" width="2.00" height="18.00" />
|
||||
<rect x="86.00" y="23.00" width="2.00" height="18.00" />
|
||||
<rect x="90.00" y="23.00" width="2.00" height="18.00" />
|
||||
<rect x="98.00" y="23.00" width="4.00" height="18.00" />
|
||||
<rect x="108.00" y="23.00" width="2.00" height="18.00" />
|
||||
<rect x="112.00" y="23.00" width="2.00" height="18.00" />
|
||||
<rect x="120.00" y="23.00" width="4.00" height="18.00" />
|
||||
<rect x="130.00" y="23.00" width="2.00" height="18.00" />
|
||||
<rect x="134.00" y="23.00" width="2.00" height="18.00" />
|
||||
<rect x="142.00" y="23.00" width="4.00" height="18.00" />
|
||||
<rect x="152.00" y="23.00" width="2.00" height="18.00" />
|
||||
<rect x="156.00" y="23.00" width="2.00" height="18.00" />
|
||||
<rect x="164.00" y="23.00" width="4.00" height="18.00" />
|
||||
<rect x="174.00" y="23.00" width="8.00" height="18.00" />
|
||||
<rect x="184.00" y="23.00" width="2.00" height="18.00" />
|
||||
<rect x="192.00" y="23.00" width="2.00" height="18.00" />
|
||||
<rect x="42.00" y="43.00" width="2.00" height="19.00" />
|
||||
<rect x="46.00" y="43.00" width="8.00" height="19.00" />
|
||||
<rect x="56.00" y="43.00" width="6.00" height="19.00" />
|
||||
<rect x="64.00" y="43.00" width="2.00" height="19.00" />
|
||||
<rect x="68.00" y="43.00" width="4.00" height="19.00" />
|
||||
<rect x="76.00" y="43.00" width="6.00" height="19.00" />
|
||||
<rect x="86.00" y="43.00" width="2.00" height="19.00" />
|
||||
<rect x="90.00" y="43.00" width="2.00" height="19.00" />
|
||||
<rect x="98.00" y="43.00" width="4.00" height="19.00" />
|
||||
<rect x="108.00" y="43.00" width="2.00" height="19.00" />
|
||||
<rect x="112.00" y="43.00" width="6.00" height="19.00" />
|
||||
<rect x="120.00" y="43.00" width="8.00" height="19.00" />
|
||||
<rect x="130.00" y="43.00" width="4.00" height="19.00" />
|
||||
<rect x="138.00" y="43.00" width="4.00" height="19.00" />
|
||||
<rect x="144.00" y="43.00" width="4.00" height="19.00" />
|
||||
<rect x="152.00" y="43.00" width="4.00" height="19.00" />
|
||||
<rect x="160.00" y="43.00" width="6.00" height="19.00" />
|
||||
<rect x="170.00" y="43.00" width="2.00" height="19.00" />
|
||||
<rect x="174.00" y="43.00" width="4.00" height="19.00" />
|
||||
<rect x="184.00" y="43.00" width="2.00" height="19.00" />
|
||||
<rect x="190.00" y="43.00" width="2.00" height="19.00" />
|
||||
<rect x="42.00" y="21.00" width="154.00" height="2.00" />
|
||||
<rect x="42.00" y="41.00" width="154.00" height="2.00" />
|
||||
<rect x="20.00" y="0.00" width="202.00" height="2.00" />
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 4.9 KiB |
120
backend/tests/data/svg/codablockf_comph_sep2_fgbgalpha.svg
Normal file
120
backend/tests/data/svg/codablockf_comph_sep2_fgbgalpha.svg
Normal file
|
|
@ -0,0 +1,120 @@
|
|||
<?xml version="1.0" standalone="no"?>
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
|
||||
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg width="264" height="84" version="1.1"
|
||||
xmlns="http://www.w3.org/2000/svg">
|
||||
<desc>Zint Generated Symbol
|
||||
</desc>
|
||||
|
||||
<g id="barcode" fill="#000000">
|
||||
<rect x="0" y="0" width="264" height="84" fill="#FFFFFF" opacity="0.400" />
|
||||
<rect x="20.00" y="2.00" width="4.00" height="80.00" opacity="0.200" />
|
||||
<rect x="26.00" y="2.00" width="2.00" height="80.00" opacity="0.200" />
|
||||
<rect x="36.00" y="2.00" width="2.00" height="80.00" opacity="0.200" />
|
||||
<rect x="42.00" y="2.00" width="2.00" height="18.00" opacity="0.200" />
|
||||
<rect x="46.00" y="2.00" width="6.00" height="18.00" opacity="0.200" />
|
||||
<rect x="54.00" y="2.00" width="8.00" height="18.00" opacity="0.200" />
|
||||
<rect x="64.00" y="2.00" width="4.00" height="18.00" opacity="0.200" />
|
||||
<rect x="72.00" y="2.00" width="4.00" height="18.00" opacity="0.200" />
|
||||
<rect x="80.00" y="2.00" width="4.00" height="18.00" opacity="0.200" />
|
||||
<rect x="86.00" y="2.00" width="2.00" height="18.00" opacity="0.200" />
|
||||
<rect x="90.00" y="2.00" width="4.00" height="18.00" opacity="0.200" />
|
||||
<rect x="98.00" y="2.00" width="6.00" height="18.00" opacity="0.200" />
|
||||
<rect x="108.00" y="2.00" width="2.00" height="18.00" opacity="0.200" />
|
||||
<rect x="116.00" y="2.00" width="2.00" height="18.00" opacity="0.200" />
|
||||
<rect x="120.00" y="2.00" width="4.00" height="18.00" opacity="0.200" />
|
||||
<rect x="130.00" y="2.00" width="6.00" height="18.00" opacity="0.200" />
|
||||
<rect x="142.00" y="2.00" width="2.00" height="18.00" opacity="0.200" />
|
||||
<rect x="146.00" y="2.00" width="4.00" height="18.00" opacity="0.200" />
|
||||
<rect x="152.00" y="2.00" width="4.00" height="18.00" opacity="0.200" />
|
||||
<rect x="164.00" y="2.00" width="2.00" height="18.00" opacity="0.200" />
|
||||
<rect x="168.00" y="2.00" width="2.00" height="18.00" opacity="0.200" />
|
||||
<rect x="174.00" y="2.00" width="4.00" height="18.00" opacity="0.200" />
|
||||
<rect x="180.00" y="2.00" width="8.00" height="18.00" opacity="0.200" />
|
||||
<rect x="190.00" y="2.00" width="4.00" height="18.00" opacity="0.200" />
|
||||
<rect x="196.00" y="2.00" width="2.00" height="18.00" opacity="0.200" />
|
||||
<rect x="204.00" y="2.00" width="2.00" height="18.00" opacity="0.200" />
|
||||
<rect x="210.00" y="2.00" width="4.00" height="18.00" opacity="0.200" />
|
||||
<rect x="218.00" y="2.00" width="4.00" height="80.00" opacity="0.200" />
|
||||
<rect x="228.00" y="2.00" width="6.00" height="80.00" opacity="0.200" />
|
||||
<rect x="236.00" y="2.00" width="2.00" height="80.00" opacity="0.200" />
|
||||
<rect x="240.00" y="2.00" width="4.00" height="80.00" opacity="0.200" />
|
||||
<rect x="42.00" y="24.00" width="2.00" height="16.00" opacity="0.200" />
|
||||
<rect x="46.00" y="24.00" width="6.00" height="16.00" opacity="0.200" />
|
||||
<rect x="54.00" y="24.00" width="8.00" height="16.00" opacity="0.200" />
|
||||
<rect x="64.00" y="24.00" width="2.00" height="16.00" opacity="0.200" />
|
||||
<rect x="68.00" y="24.00" width="4.00" height="16.00" opacity="0.200" />
|
||||
<rect x="78.00" y="24.00" width="6.00" height="16.00" opacity="0.200" />
|
||||
<rect x="86.00" y="24.00" width="2.00" height="16.00" opacity="0.200" />
|
||||
<rect x="90.00" y="24.00" width="4.00" height="16.00" opacity="0.200" />
|
||||
<rect x="98.00" y="24.00" width="6.00" height="16.00" opacity="0.200" />
|
||||
<rect x="108.00" y="24.00" width="2.00" height="16.00" opacity="0.200" />
|
||||
<rect x="116.00" y="24.00" width="2.00" height="16.00" opacity="0.200" />
|
||||
<rect x="120.00" y="24.00" width="4.00" height="16.00" opacity="0.200" />
|
||||
<rect x="130.00" y="24.00" width="6.00" height="16.00" opacity="0.200" />
|
||||
<rect x="142.00" y="24.00" width="2.00" height="16.00" opacity="0.200" />
|
||||
<rect x="146.00" y="24.00" width="4.00" height="16.00" opacity="0.200" />
|
||||
<rect x="152.00" y="24.00" width="4.00" height="16.00" opacity="0.200" />
|
||||
<rect x="164.00" y="24.00" width="2.00" height="16.00" opacity="0.200" />
|
||||
<rect x="168.00" y="24.00" width="2.00" height="16.00" opacity="0.200" />
|
||||
<rect x="174.00" y="24.00" width="4.00" height="16.00" opacity="0.200" />
|
||||
<rect x="180.00" y="24.00" width="8.00" height="16.00" opacity="0.200" />
|
||||
<rect x="190.00" y="24.00" width="4.00" height="16.00" opacity="0.200" />
|
||||
<rect x="196.00" y="24.00" width="8.00" height="16.00" opacity="0.200" />
|
||||
<rect x="208.00" y="24.00" width="2.00" height="16.00" opacity="0.200" />
|
||||
<rect x="212.00" y="24.00" width="2.00" height="16.00" opacity="0.200" />
|
||||
<rect x="42.00" y="44.00" width="2.00" height="16.00" opacity="0.200" />
|
||||
<rect x="46.00" y="44.00" width="6.00" height="16.00" opacity="0.200" />
|
||||
<rect x="54.00" y="44.00" width="8.00" height="16.00" opacity="0.200" />
|
||||
<rect x="64.00" y="44.00" width="2.00" height="16.00" opacity="0.200" />
|
||||
<rect x="72.00" y="44.00" width="4.00" height="16.00" opacity="0.200" />
|
||||
<rect x="78.00" y="44.00" width="6.00" height="16.00" opacity="0.200" />
|
||||
<rect x="86.00" y="44.00" width="2.00" height="16.00" opacity="0.200" />
|
||||
<rect x="90.00" y="44.00" width="4.00" height="16.00" opacity="0.200" />
|
||||
<rect x="98.00" y="44.00" width="6.00" height="16.00" opacity="0.200" />
|
||||
<rect x="108.00" y="44.00" width="2.00" height="16.00" opacity="0.200" />
|
||||
<rect x="116.00" y="44.00" width="2.00" height="16.00" opacity="0.200" />
|
||||
<rect x="120.00" y="44.00" width="4.00" height="16.00" opacity="0.200" />
|
||||
<rect x="130.00" y="44.00" width="6.00" height="16.00" opacity="0.200" />
|
||||
<rect x="142.00" y="44.00" width="2.00" height="16.00" opacity="0.200" />
|
||||
<rect x="146.00" y="44.00" width="4.00" height="16.00" opacity="0.200" />
|
||||
<rect x="152.00" y="44.00" width="4.00" height="16.00" opacity="0.200" />
|
||||
<rect x="164.00" y="44.00" width="2.00" height="16.00" opacity="0.200" />
|
||||
<rect x="168.00" y="44.00" width="2.00" height="16.00" opacity="0.200" />
|
||||
<rect x="174.00" y="44.00" width="4.00" height="16.00" opacity="0.200" />
|
||||
<rect x="180.00" y="44.00" width="8.00" height="16.00" opacity="0.200" />
|
||||
<rect x="190.00" y="44.00" width="4.00" height="16.00" opacity="0.200" />
|
||||
<rect x="196.00" y="44.00" width="4.00" height="16.00" opacity="0.200" />
|
||||
<rect x="202.00" y="44.00" width="4.00" height="16.00" opacity="0.200" />
|
||||
<rect x="208.00" y="44.00" width="8.00" height="16.00" opacity="0.200" />
|
||||
<rect x="42.00" y="64.00" width="2.00" height="18.00" opacity="0.200" />
|
||||
<rect x="46.00" y="64.00" width="6.00" height="18.00" opacity="0.200" />
|
||||
<rect x="54.00" y="64.00" width="8.00" height="18.00" opacity="0.200" />
|
||||
<rect x="64.00" y="64.00" width="2.00" height="18.00" opacity="0.200" />
|
||||
<rect x="68.00" y="64.00" width="6.00" height="18.00" opacity="0.200" />
|
||||
<rect x="76.00" y="64.00" width="4.00" height="18.00" opacity="0.200" />
|
||||
<rect x="86.00" y="64.00" width="2.00" height="18.00" opacity="0.200" />
|
||||
<rect x="90.00" y="64.00" width="4.00" height="18.00" opacity="0.200" />
|
||||
<rect x="98.00" y="64.00" width="6.00" height="18.00" opacity="0.200" />
|
||||
<rect x="108.00" y="64.00" width="2.00" height="18.00" opacity="0.200" />
|
||||
<rect x="116.00" y="64.00" width="2.00" height="18.00" opacity="0.200" />
|
||||
<rect x="120.00" y="64.00" width="4.00" height="18.00" opacity="0.200" />
|
||||
<rect x="130.00" y="64.00" width="2.00" height="18.00" opacity="0.200" />
|
||||
<rect x="134.00" y="64.00" width="8.00" height="18.00" opacity="0.200" />
|
||||
<rect x="144.00" y="64.00" width="6.00" height="18.00" opacity="0.200" />
|
||||
<rect x="152.00" y="64.00" width="6.00" height="18.00" opacity="0.200" />
|
||||
<rect x="160.00" y="64.00" width="4.00" height="18.00" opacity="0.200" />
|
||||
<rect x="168.00" y="64.00" width="2.00" height="18.00" opacity="0.200" />
|
||||
<rect x="174.00" y="64.00" width="6.00" height="18.00" opacity="0.200" />
|
||||
<rect x="186.00" y="64.00" width="2.00" height="18.00" opacity="0.200" />
|
||||
<rect x="190.00" y="64.00" width="4.00" height="18.00" opacity="0.200" />
|
||||
<rect x="196.00" y="64.00" width="4.00" height="18.00" opacity="0.200" />
|
||||
<rect x="204.00" y="64.00" width="2.00" height="18.00" opacity="0.200" />
|
||||
<rect x="208.00" y="64.00" width="2.00" height="18.00" opacity="0.200" />
|
||||
<rect x="42.00" y="20.00" width="176.00" height="4.00" opacity="0.200" />
|
||||
<rect x="42.00" y="40.00" width="176.00" height="4.00" opacity="0.200" />
|
||||
<rect x="42.00" y="60.00" width="176.00" height="4.00" opacity="0.200" />
|
||||
<rect x="20.00" y="0.00" width="224.00" height="2.00" opacity="0.200" />
|
||||
<rect x="20.00" y="82.00" width="224.00" height="2.00" opacity="0.200" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 8.8 KiB |
|
|
@ -11,50 +11,73 @@
|
|||
<rect x="24.00" y="6.00" width="4.00" height="60.00" />
|
||||
<rect x="30.00" y="6.00" width="2.00" height="60.00" />
|
||||
<rect x="40.00" y="6.00" width="2.00" height="60.00" />
|
||||
<rect x="46.00" y="6.00" width="2.00" height="60.00" />
|
||||
<rect x="50.00" y="6.00" width="8.00" height="60.00" />
|
||||
<rect x="60.00" y="6.00" width="6.00" height="60.00" />
|
||||
<rect x="68.00" y="6.00" width="2.00" height="20.00" />
|
||||
<rect x="74.00" y="6.00" width="2.00" height="20.00" />
|
||||
<rect x="78.00" y="6.00" width="4.00" height="20.00" />
|
||||
<rect x="90.00" y="6.00" width="2.00" height="60.00" />
|
||||
<rect x="94.00" y="6.00" width="2.00" height="60.00" />
|
||||
<rect x="102.00" y="6.00" width="4.00" height="60.00" />
|
||||
<rect x="112.00" y="6.00" width="2.00" height="60.00" />
|
||||
<rect x="116.00" y="6.00" width="2.00" height="40.00" />
|
||||
<rect x="124.00" y="6.00" width="4.00" height="40.00" />
|
||||
<rect x="134.00" y="6.00" width="2.00" height="40.00" />
|
||||
<rect x="138.00" y="6.00" width="2.00" height="40.00" />
|
||||
<rect x="146.00" y="6.00" width="4.00" height="40.00" />
|
||||
<rect x="156.00" y="6.00" width="2.00" height="40.00" />
|
||||
<rect x="160.00" y="6.00" width="2.00" height="40.00" />
|
||||
<rect x="168.00" y="6.00" width="4.00" height="40.00" />
|
||||
<rect x="178.00" y="6.00" width="4.00" height="20.00" />
|
||||
<rect x="184.00" y="6.00" width="4.00" height="20.00" />
|
||||
<rect x="192.00" y="6.00" width="4.00" height="20.00" />
|
||||
<rect x="46.00" y="6.00" width="2.00" height="19.00" />
|
||||
<rect x="50.00" y="6.00" width="8.00" height="19.00" />
|
||||
<rect x="60.00" y="6.00" width="6.00" height="19.00" />
|
||||
<rect x="68.00" y="6.00" width="2.00" height="19.00" />
|
||||
<rect x="74.00" y="6.00" width="2.00" height="19.00" />
|
||||
<rect x="78.00" y="6.00" width="4.00" height="19.00" />
|
||||
<rect x="90.00" y="6.00" width="2.00" height="19.00" />
|
||||
<rect x="94.00" y="6.00" width="2.00" height="19.00" />
|
||||
<rect x="102.00" y="6.00" width="4.00" height="19.00" />
|
||||
<rect x="112.00" y="6.00" width="2.00" height="19.00" />
|
||||
<rect x="116.00" y="6.00" width="2.00" height="19.00" />
|
||||
<rect x="124.00" y="6.00" width="4.00" height="19.00" />
|
||||
<rect x="134.00" y="6.00" width="2.00" height="19.00" />
|
||||
<rect x="138.00" y="6.00" width="2.00" height="19.00" />
|
||||
<rect x="146.00" y="6.00" width="4.00" height="19.00" />
|
||||
<rect x="156.00" y="6.00" width="2.00" height="19.00" />
|
||||
<rect x="160.00" y="6.00" width="2.00" height="19.00" />
|
||||
<rect x="168.00" y="6.00" width="4.00" height="19.00" />
|
||||
<rect x="178.00" y="6.00" width="4.00" height="19.00" />
|
||||
<rect x="184.00" y="6.00" width="4.00" height="19.00" />
|
||||
<rect x="192.00" y="6.00" width="4.00" height="19.00" />
|
||||
<rect x="200.00" y="6.00" width="4.00" height="60.00" />
|
||||
<rect x="210.00" y="6.00" width="6.00" height="60.00" />
|
||||
<rect x="218.00" y="6.00" width="2.00" height="60.00" />
|
||||
<rect x="222.00" y="6.00" width="4.00" height="60.00" />
|
||||
<rect x="68.00" y="26.00" width="4.00" height="20.00" />
|
||||
<rect x="78.00" y="26.00" width="2.00" height="20.00" />
|
||||
<rect x="84.00" y="26.00" width="2.00" height="20.00" />
|
||||
<rect x="178.00" y="26.00" width="8.00" height="20.00" />
|
||||
<rect x="188.00" y="26.00" width="2.00" height="40.00" />
|
||||
<rect x="196.00" y="26.00" width="2.00" height="20.00" />
|
||||
<rect x="68.00" y="46.00" width="2.00" height="20.00" />
|
||||
<rect x="72.00" y="46.00" width="4.00" height="20.00" />
|
||||
<rect x="80.00" y="46.00" width="6.00" height="20.00" />
|
||||
<rect x="116.00" y="46.00" width="6.00" height="20.00" />
|
||||
<rect x="124.00" y="46.00" width="8.00" height="20.00" />
|
||||
<rect x="134.00" y="46.00" width="4.00" height="20.00" />
|
||||
<rect x="142.00" y="46.00" width="4.00" height="20.00" />
|
||||
<rect x="148.00" y="46.00" width="4.00" height="20.00" />
|
||||
<rect x="156.00" y="46.00" width="4.00" height="20.00" />
|
||||
<rect x="164.00" y="46.00" width="6.00" height="20.00" />
|
||||
<rect x="174.00" y="46.00" width="2.00" height="20.00" />
|
||||
<rect x="178.00" y="46.00" width="4.00" height="20.00" />
|
||||
<rect x="194.00" y="46.00" width="2.00" height="20.00" />
|
||||
<rect x="46.00" y="27.00" width="2.00" height="18.00" />
|
||||
<rect x="50.00" y="27.00" width="8.00" height="18.00" />
|
||||
<rect x="60.00" y="27.00" width="6.00" height="18.00" />
|
||||
<rect x="68.00" y="27.00" width="4.00" height="18.00" />
|
||||
<rect x="78.00" y="27.00" width="2.00" height="18.00" />
|
||||
<rect x="84.00" y="27.00" width="2.00" height="18.00" />
|
||||
<rect x="90.00" y="27.00" width="2.00" height="18.00" />
|
||||
<rect x="94.00" y="27.00" width="2.00" height="18.00" />
|
||||
<rect x="102.00" y="27.00" width="4.00" height="18.00" />
|
||||
<rect x="112.00" y="27.00" width="2.00" height="18.00" />
|
||||
<rect x="116.00" y="27.00" width="2.00" height="18.00" />
|
||||
<rect x="124.00" y="27.00" width="4.00" height="18.00" />
|
||||
<rect x="134.00" y="27.00" width="2.00" height="18.00" />
|
||||
<rect x="138.00" y="27.00" width="2.00" height="18.00" />
|
||||
<rect x="146.00" y="27.00" width="4.00" height="18.00" />
|
||||
<rect x="156.00" y="27.00" width="2.00" height="18.00" />
|
||||
<rect x="160.00" y="27.00" width="2.00" height="18.00" />
|
||||
<rect x="168.00" y="27.00" width="4.00" height="18.00" />
|
||||
<rect x="178.00" y="27.00" width="8.00" height="18.00" />
|
||||
<rect x="188.00" y="27.00" width="2.00" height="18.00" />
|
||||
<rect x="196.00" y="27.00" width="2.00" height="18.00" />
|
||||
<rect x="46.00" y="47.00" width="2.00" height="19.00" />
|
||||
<rect x="50.00" y="47.00" width="8.00" height="19.00" />
|
||||
<rect x="60.00" y="47.00" width="6.00" height="19.00" />
|
||||
<rect x="68.00" y="47.00" width="2.00" height="19.00" />
|
||||
<rect x="72.00" y="47.00" width="4.00" height="19.00" />
|
||||
<rect x="80.00" y="47.00" width="6.00" height="19.00" />
|
||||
<rect x="90.00" y="47.00" width="2.00" height="19.00" />
|
||||
<rect x="94.00" y="47.00" width="2.00" height="19.00" />
|
||||
<rect x="102.00" y="47.00" width="4.00" height="19.00" />
|
||||
<rect x="112.00" y="47.00" width="2.00" height="19.00" />
|
||||
<rect x="116.00" y="47.00" width="6.00" height="19.00" />
|
||||
<rect x="124.00" y="47.00" width="8.00" height="19.00" />
|
||||
<rect x="134.00" y="47.00" width="4.00" height="19.00" />
|
||||
<rect x="142.00" y="47.00" width="4.00" height="19.00" />
|
||||
<rect x="148.00" y="47.00" width="4.00" height="19.00" />
|
||||
<rect x="156.00" y="47.00" width="4.00" height="19.00" />
|
||||
<rect x="164.00" y="47.00" width="6.00" height="19.00" />
|
||||
<rect x="174.00" y="47.00" width="2.00" height="19.00" />
|
||||
<rect x="178.00" y="47.00" width="4.00" height="19.00" />
|
||||
<rect x="188.00" y="47.00" width="2.00" height="19.00" />
|
||||
<rect x="194.00" y="47.00" width="2.00" height="19.00" />
|
||||
<rect x="46.00" y="25.00" width="154.00" height="2.00" />
|
||||
<rect x="46.00" y="45.00" width="154.00" height="2.00" />
|
||||
<rect x="24.00" y="4.00" width="202.00" height="2.00" />
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 4.9 KiB |
|
|
@ -11,50 +11,73 @@
|
|||
<rect x="28.00" y="8.00" width="4.00" height="60.00" />
|
||||
<rect x="34.00" y="8.00" width="2.00" height="60.00" />
|
||||
<rect x="44.00" y="8.00" width="2.00" height="60.00" />
|
||||
<rect x="50.00" y="8.00" width="2.00" height="60.00" />
|
||||
<rect x="54.00" y="8.00" width="8.00" height="60.00" />
|
||||
<rect x="64.00" y="8.00" width="6.00" height="60.00" />
|
||||
<rect x="72.00" y="8.00" width="2.00" height="20.00" />
|
||||
<rect x="78.00" y="8.00" width="2.00" height="20.00" />
|
||||
<rect x="82.00" y="8.00" width="4.00" height="20.00" />
|
||||
<rect x="94.00" y="8.00" width="2.00" height="60.00" />
|
||||
<rect x="98.00" y="8.00" width="2.00" height="60.00" />
|
||||
<rect x="106.00" y="8.00" width="4.00" height="60.00" />
|
||||
<rect x="116.00" y="8.00" width="2.00" height="60.00" />
|
||||
<rect x="120.00" y="8.00" width="2.00" height="40.00" />
|
||||
<rect x="128.00" y="8.00" width="4.00" height="40.00" />
|
||||
<rect x="138.00" y="8.00" width="2.00" height="40.00" />
|
||||
<rect x="142.00" y="8.00" width="2.00" height="40.00" />
|
||||
<rect x="150.00" y="8.00" width="4.00" height="40.00" />
|
||||
<rect x="160.00" y="8.00" width="2.00" height="40.00" />
|
||||
<rect x="164.00" y="8.00" width="2.00" height="40.00" />
|
||||
<rect x="172.00" y="8.00" width="4.00" height="40.00" />
|
||||
<rect x="182.00" y="8.00" width="4.00" height="20.00" />
|
||||
<rect x="188.00" y="8.00" width="4.00" height="20.00" />
|
||||
<rect x="196.00" y="8.00" width="4.00" height="20.00" />
|
||||
<rect x="50.00" y="8.00" width="2.00" height="19.00" />
|
||||
<rect x="54.00" y="8.00" width="8.00" height="19.00" />
|
||||
<rect x="64.00" y="8.00" width="6.00" height="19.00" />
|
||||
<rect x="72.00" y="8.00" width="2.00" height="19.00" />
|
||||
<rect x="78.00" y="8.00" width="2.00" height="19.00" />
|
||||
<rect x="82.00" y="8.00" width="4.00" height="19.00" />
|
||||
<rect x="94.00" y="8.00" width="2.00" height="19.00" />
|
||||
<rect x="98.00" y="8.00" width="2.00" height="19.00" />
|
||||
<rect x="106.00" y="8.00" width="4.00" height="19.00" />
|
||||
<rect x="116.00" y="8.00" width="2.00" height="19.00" />
|
||||
<rect x="120.00" y="8.00" width="2.00" height="19.00" />
|
||||
<rect x="128.00" y="8.00" width="4.00" height="19.00" />
|
||||
<rect x="138.00" y="8.00" width="2.00" height="19.00" />
|
||||
<rect x="142.00" y="8.00" width="2.00" height="19.00" />
|
||||
<rect x="150.00" y="8.00" width="4.00" height="19.00" />
|
||||
<rect x="160.00" y="8.00" width="2.00" height="19.00" />
|
||||
<rect x="164.00" y="8.00" width="2.00" height="19.00" />
|
||||
<rect x="172.00" y="8.00" width="4.00" height="19.00" />
|
||||
<rect x="182.00" y="8.00" width="4.00" height="19.00" />
|
||||
<rect x="188.00" y="8.00" width="4.00" height="19.00" />
|
||||
<rect x="196.00" y="8.00" width="4.00" height="19.00" />
|
||||
<rect x="204.00" y="8.00" width="4.00" height="60.00" />
|
||||
<rect x="214.00" y="8.00" width="6.00" height="60.00" />
|
||||
<rect x="222.00" y="8.00" width="2.00" height="60.00" />
|
||||
<rect x="226.00" y="8.00" width="4.00" height="60.00" />
|
||||
<rect x="72.00" y="28.00" width="4.00" height="20.00" />
|
||||
<rect x="82.00" y="28.00" width="2.00" height="20.00" />
|
||||
<rect x="88.00" y="28.00" width="2.00" height="20.00" />
|
||||
<rect x="182.00" y="28.00" width="8.00" height="20.00" />
|
||||
<rect x="192.00" y="28.00" width="2.00" height="40.00" />
|
||||
<rect x="200.00" y="28.00" width="2.00" height="20.00" />
|
||||
<rect x="72.00" y="48.00" width="2.00" height="20.00" />
|
||||
<rect x="76.00" y="48.00" width="4.00" height="20.00" />
|
||||
<rect x="84.00" y="48.00" width="6.00" height="20.00" />
|
||||
<rect x="120.00" y="48.00" width="6.00" height="20.00" />
|
||||
<rect x="128.00" y="48.00" width="8.00" height="20.00" />
|
||||
<rect x="138.00" y="48.00" width="4.00" height="20.00" />
|
||||
<rect x="146.00" y="48.00" width="4.00" height="20.00" />
|
||||
<rect x="152.00" y="48.00" width="4.00" height="20.00" />
|
||||
<rect x="160.00" y="48.00" width="4.00" height="20.00" />
|
||||
<rect x="168.00" y="48.00" width="6.00" height="20.00" />
|
||||
<rect x="178.00" y="48.00" width="2.00" height="20.00" />
|
||||
<rect x="182.00" y="48.00" width="4.00" height="20.00" />
|
||||
<rect x="198.00" y="48.00" width="2.00" height="20.00" />
|
||||
<rect x="50.00" y="29.00" width="2.00" height="18.00" />
|
||||
<rect x="54.00" y="29.00" width="8.00" height="18.00" />
|
||||
<rect x="64.00" y="29.00" width="6.00" height="18.00" />
|
||||
<rect x="72.00" y="29.00" width="4.00" height="18.00" />
|
||||
<rect x="82.00" y="29.00" width="2.00" height="18.00" />
|
||||
<rect x="88.00" y="29.00" width="2.00" height="18.00" />
|
||||
<rect x="94.00" y="29.00" width="2.00" height="18.00" />
|
||||
<rect x="98.00" y="29.00" width="2.00" height="18.00" />
|
||||
<rect x="106.00" y="29.00" width="4.00" height="18.00" />
|
||||
<rect x="116.00" y="29.00" width="2.00" height="18.00" />
|
||||
<rect x="120.00" y="29.00" width="2.00" height="18.00" />
|
||||
<rect x="128.00" y="29.00" width="4.00" height="18.00" />
|
||||
<rect x="138.00" y="29.00" width="2.00" height="18.00" />
|
||||
<rect x="142.00" y="29.00" width="2.00" height="18.00" />
|
||||
<rect x="150.00" y="29.00" width="4.00" height="18.00" />
|
||||
<rect x="160.00" y="29.00" width="2.00" height="18.00" />
|
||||
<rect x="164.00" y="29.00" width="2.00" height="18.00" />
|
||||
<rect x="172.00" y="29.00" width="4.00" height="18.00" />
|
||||
<rect x="182.00" y="29.00" width="8.00" height="18.00" />
|
||||
<rect x="192.00" y="29.00" width="2.00" height="18.00" />
|
||||
<rect x="200.00" y="29.00" width="2.00" height="18.00" />
|
||||
<rect x="50.00" y="49.00" width="2.00" height="19.00" />
|
||||
<rect x="54.00" y="49.00" width="8.00" height="19.00" />
|
||||
<rect x="64.00" y="49.00" width="6.00" height="19.00" />
|
||||
<rect x="72.00" y="49.00" width="2.00" height="19.00" />
|
||||
<rect x="76.00" y="49.00" width="4.00" height="19.00" />
|
||||
<rect x="84.00" y="49.00" width="6.00" height="19.00" />
|
||||
<rect x="94.00" y="49.00" width="2.00" height="19.00" />
|
||||
<rect x="98.00" y="49.00" width="2.00" height="19.00" />
|
||||
<rect x="106.00" y="49.00" width="4.00" height="19.00" />
|
||||
<rect x="116.00" y="49.00" width="2.00" height="19.00" />
|
||||
<rect x="120.00" y="49.00" width="6.00" height="19.00" />
|
||||
<rect x="128.00" y="49.00" width="8.00" height="19.00" />
|
||||
<rect x="138.00" y="49.00" width="4.00" height="19.00" />
|
||||
<rect x="146.00" y="49.00" width="4.00" height="19.00" />
|
||||
<rect x="152.00" y="49.00" width="4.00" height="19.00" />
|
||||
<rect x="160.00" y="49.00" width="4.00" height="19.00" />
|
||||
<rect x="168.00" y="49.00" width="6.00" height="19.00" />
|
||||
<rect x="178.00" y="49.00" width="2.00" height="19.00" />
|
||||
<rect x="182.00" y="49.00" width="4.00" height="19.00" />
|
||||
<rect x="192.00" y="49.00" width="2.00" height="19.00" />
|
||||
<rect x="198.00" y="49.00" width="2.00" height="19.00" />
|
||||
<rect x="50.00" y="27.00" width="154.00" height="2.00" />
|
||||
<rect x="50.00" y="47.00" width="154.00" height="2.00" />
|
||||
<rect x="0.00" y="4.00" width="258.00" height="4.00" />
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 5.1 KiB |
51
backend/tests/data/svg/code49_comph_fgalpha.svg
Normal file
51
backend/tests/data/svg/code49_comph_fgalpha.svg
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
<?xml version="1.0" standalone="no"?>
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
|
||||
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg width="162" height="46" version="1.1"
|
||||
xmlns="http://www.w3.org/2000/svg">
|
||||
<desc>Zint Generated Symbol
|
||||
</desc>
|
||||
|
||||
<g id="barcode" fill="#FF1115">
|
||||
<rect x="0" y="0" width="162" height="46" fill="#FFFFFF" />
|
||||
<rect x="20.00" y="2.00" width="2.00" height="20.00" opacity="0.498" />
|
||||
<rect x="24.00" y="2.00" width="6.00" height="20.00" opacity="0.498" />
|
||||
<rect x="36.00" y="2.00" width="4.00" height="20.00" opacity="0.498" />
|
||||
<rect x="44.00" y="2.00" width="2.00" height="20.00" opacity="0.498" />
|
||||
<rect x="50.00" y="2.00" width="2.00" height="20.00" opacity="0.498" />
|
||||
<rect x="56.00" y="2.00" width="4.00" height="20.00" opacity="0.498" />
|
||||
<rect x="64.00" y="2.00" width="8.00" height="20.00" opacity="0.498" />
|
||||
<rect x="76.00" y="2.00" width="2.00" height="20.00" opacity="0.498" />
|
||||
<rect x="80.00" y="2.00" width="6.00" height="20.00" opacity="0.498" />
|
||||
<rect x="88.00" y="2.00" width="4.00" height="20.00" opacity="0.498" />
|
||||
<rect x="96.00" y="2.00" width="8.00" height="20.00" opacity="0.498" />
|
||||
<rect x="108.00" y="2.00" width="2.00" height="20.00" opacity="0.498" />
|
||||
<rect x="112.00" y="2.00" width="6.00" height="20.00" opacity="0.498" />
|
||||
<rect x="120.00" y="2.00" width="6.00" height="20.00" opacity="0.498" />
|
||||
<rect x="128.00" y="2.00" width="2.00" height="20.00" opacity="0.498" />
|
||||
<rect x="132.00" y="2.00" width="4.00" height="20.00" opacity="0.498" />
|
||||
<rect x="144.00" y="2.00" width="6.00" height="20.00" opacity="0.498" />
|
||||
<rect x="152.00" y="2.00" width="8.00" height="20.00" opacity="0.498" />
|
||||
<rect x="20.00" y="24.00" width="2.00" height="20.00" opacity="0.498" />
|
||||
<rect x="24.00" y="24.00" width="4.00" height="20.00" opacity="0.498" />
|
||||
<rect x="32.00" y="24.00" width="8.00" height="20.00" opacity="0.498" />
|
||||
<rect x="44.00" y="24.00" width="2.00" height="20.00" opacity="0.498" />
|
||||
<rect x="48.00" y="24.00" width="6.00" height="20.00" opacity="0.498" />
|
||||
<rect x="56.00" y="24.00" width="4.00" height="20.00" opacity="0.498" />
|
||||
<rect x="62.00" y="24.00" width="12.00" height="20.00" opacity="0.498" />
|
||||
<rect x="76.00" y="24.00" width="2.00" height="20.00" opacity="0.498" />
|
||||
<rect x="80.00" y="24.00" width="6.00" height="20.00" opacity="0.498" />
|
||||
<rect x="88.00" y="24.00" width="6.00" height="20.00" opacity="0.498" />
|
||||
<rect x="96.00" y="24.00" width="2.00" height="20.00" opacity="0.498" />
|
||||
<rect x="102.00" y="24.00" width="8.00" height="20.00" opacity="0.498" />
|
||||
<rect x="114.00" y="24.00" width="4.00" height="20.00" opacity="0.498" />
|
||||
<rect x="120.00" y="24.00" width="2.00" height="20.00" opacity="0.498" />
|
||||
<rect x="126.00" y="24.00" width="10.00" height="20.00" opacity="0.498" />
|
||||
<rect x="138.00" y="24.00" width="4.00" height="20.00" opacity="0.498" />
|
||||
<rect x="146.00" y="24.00" width="4.00" height="20.00" opacity="0.498" />
|
||||
<rect x="152.00" y="24.00" width="8.00" height="20.00" opacity="0.498" />
|
||||
<rect x="20.00" y="22.00" width="140.00" height="2.00" opacity="0.498" />
|
||||
<rect x="0.00" y="0.00" width="162.00" height="2.00" opacity="0.498" />
|
||||
<rect x="0.00" y="44.00" width="162.00" height="2.00" opacity="0.498" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 3.4 KiB |
File diff suppressed because it is too large
Load diff
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
libzint - the open source barcode library
|
||||
Copyright (C) 2020 - 2021 Robin Stuart <rstuart114@gmail.com>
|
||||
Copyright (C) 2020-2022 Robin Stuart <rstuart114@gmail.com>
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGE.
|
||||
*/
|
||||
/* vim: set ts=4 sw=4 et : */
|
||||
/* SPDX-License-Identifier: BSD-3-Clause */
|
||||
|
||||
#include "testcommon.h"
|
||||
#include <sys/stat.h>
|
||||
|
|
@ -44,6 +44,7 @@ static void test_print(int index, int generate, int debug) {
|
|||
int show_hrt;
|
||||
int option_1;
|
||||
int option_2;
|
||||
int option_3;
|
||||
float height;
|
||||
char *fgcolour;
|
||||
char *bgcolour;
|
||||
|
|
@ -54,56 +55,58 @@ static void test_print(int index, int generate, int debug) {
|
|||
char *expected_file;
|
||||
};
|
||||
struct item data[] = {
|
||||
/* 0*/ { BARCODE_CODE128, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "<>\"&'", "", 0, "code128_amperands.svg" },
|
||||
/* 1*/ { BARCODE_CODE128, UNICODE_MODE, -1, BOLD_TEXT, -1, -1, -1, -1, -1, 0, "", "", 0, "Égjpqy", "", 0, "code128_egrave_bold.svg" },
|
||||
/* 2*/ { BARCODE_CODE128, UNICODE_MODE, 3, BOLD_TEXT | BARCODE_BOX, -1, -1, -1, -1, -1, 0, "", "", 0, "Égjpqy", "", 0, "code128_egrave_bold_box3.svg" },
|
||||
/* 3*/ { BARCODE_CODE128, UNICODE_MODE, 2, BOLD_TEXT | BARCODE_BOX, 2, 2, -1, -1, -1, 0, "", "", 0, "Égjpqy", "", 0, "code128_egrave_bold_hvwsp2_box2.svg" },
|
||||
/* 4*/ { BARCODE_CODE128, UNICODE_MODE, -1, BOLD_TEXT, 3, 3, -1, -1, -1, 0, "", "", 0, "Égjpqy", "", 0, "code128_egrave_bold_hvwsp3.svg" },
|
||||
/* 5*/ { BARCODE_GS1_128_CC, -1, -1, -1, -1, -1, -1, 3, -1, 0, "", "", 0, "[00]030123456789012340", "[02]13012345678909[37]24[10]1234567ABCDEFG", 0, "gs1_128_cc_fig12.svg" },
|
||||
/* 6*/ { BARCODE_CODABLOCKF, -1, -1, -1, -1, -1, -1, 3, -1, 0, "", "", 0, "AAAAAAAAA", "", 0, "codablockf_3rows.svg" },
|
||||
/* 7*/ { BARCODE_CODABLOCKF, -1, -1, -1, 2, 2, -1, 3, -1, 0, "", "", 0, "AAAAAAAAA", "", 0, "codablockf_hvwsp2.svg" },
|
||||
/* 8*/ { BARCODE_CODABLOCKF, -1, 2, BARCODE_BOX, 2, 2, -1, -1, -1, 0, "", "", 0, "AAAAAAAAA", "", 0, "codablockf_hvwsp2_box2.svg" },
|
||||
/* 9*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "9771384524017+12", "", 0, "ean13_2addon_ggs_5.2.2.5.1-2.svg" },
|
||||
/* 10*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "9780877799306+54321", "", 0, "ean13_5addon_ggs_5.2.2.5.2-2.svg" },
|
||||
/* 11*/ { BARCODE_EANX_CC, -1, -1, -1, -1, -1, -1, 1, -1, 0, "", "", 0, "123456789012+12", "[91]123456789012345678901", 0, "ean13_cc_2addon_cca_4x4.svg" },
|
||||
/* 12*/ { BARCODE_EANX_CC, -1, -1, -1, -1, -1, -1, 2, -1, 0, "", "", 0, "123456789012+54321", "[91]1234567890", 0, "ean13_cc_5addon_ccb_3x4.svg" },
|
||||
/* 13*/ { BARCODE_EANX_CC, -1, -1, -1, -1, -1, 0, 2, -1, 0, "", "", 0, "123456789012+54321", "[91]1234567890", 0, "ean13_cc_5addon_ccb_3x4_notext.svg" },
|
||||
/* 14*/ { BARCODE_UPCA, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "012345678905+24", "", 0, "upca_2addon_ggs_5.2.6.6-5.svg" },
|
||||
/* 15*/ { BARCODE_UPCA, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "614141234417+12345", "", 0, "upca_5addon.svg" },
|
||||
/* 16*/ { BARCODE_UPCA, -1, 3, BARCODE_BIND, -1, -1, -1, -1, -1, 0, "", "", 0, "614141234417+12345", "", 0, "upca_5addon_bind3.svg" },
|
||||
/* 17*/ { BARCODE_UPCA, -1, -1, SMALL_TEXT | BOLD_TEXT, -1, -1, -1, -1, -1, 0, "", "", 0, "614141234417+12345", "", 0, "upca_5addon_small_bold.svg" },
|
||||
/* 18*/ { BARCODE_UPCA_CC, -1, -1, -1, -1, -1, -1, 1, -1, 0, "", "", 0, "12345678901+12", "[91]123456789", 0, "upca_cc_2addon_cca_3x4.svg" },
|
||||
/* 19*/ { BARCODE_UPCA_CC, -1, -1, -1, -1, -1, -1, 2, -1, 0, "", "", 0, "12345678901+12121", "[91]1234567890123", 0, "upca_cc_5addon_ccb_4x4.svg" },
|
||||
/* 20*/ { BARCODE_UPCA_CC, -1, -1, -1, -1, -1, 0, 2, -1, 0, "", "", 0, "12345678901+12121", "[91]1234567890123", 0, "upca_cc_5addon_ccb_4x4_notext.svg" },
|
||||
/* 21*/ { BARCODE_UPCA_CC, -1, 3, BARCODE_BIND, -1, -1, -1, 2, -1, 0, "", "", 0, "12345678901+12121", "[91]1234567890123", 0, "upca_cc_5addon_ccb_4x4_bind3.svg" },
|
||||
/* 22*/ { BARCODE_UPCE, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "1234567+12", "", 0, "upce_2addon.svg" },
|
||||
/* 23*/ { BARCODE_UPCE, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "1234567+12345", "", 0, "upce_5addon.svg" },
|
||||
/* 24*/ { BARCODE_UPCE, -1, -1, SMALL_TEXT, -1, -1, -1, -1, -1, 0, "", "", 0, "1234567+12345", "", 0, "upce_5addon_small.svg" },
|
||||
/* 25*/ { BARCODE_UPCE, -1, -1, -1, -1, -1, 0, -1, -1, 0, "", "", 0, "1234567+12345", "", 0, "upce_5addon_notext.svg" },
|
||||
/* 26*/ { BARCODE_UPCE_CC, -1, -1, -1, -1, -1, -1, 1, -1, 0, "", "", 0, "0654321+89", "[91]1", 0, "upce_cc_2addon_cca_5x2.svg" },
|
||||
/* 27*/ { BARCODE_UPCE_CC, -1, -1, -1, -1, -1, -1, 1, -1, 0, "FF0000EE", "0000FF11", 0, "0654321+89", "[91]1", 0, "upce_cc_2addon_cca_5x2_fgbgalpha.svg" },
|
||||
/* 28*/ { BARCODE_UPCE_CC, -1, -1, -1, -1, -1, -1, 1, -1, 0, "", "FFFFFF00", 0, "0654321+89", "[91]1", 0, "upce_cc_2addon_cca_5x2_nobg.svg" },
|
||||
/* 29*/ { BARCODE_UPCE_CC, -1, -1, -1, -1, -1, -1, 1, -1, 0, "", "", 270, "0654321+89", "[91]1", 0, "upce_cc_2addon_cca_5x2_rotate_270.svg" },
|
||||
/* 30*/ { BARCODE_UPCE_CC, -1, -1, -1, -1, -1, -1, 2, -1, 0, "", "", 0, "1876543+56789", "[91]12345", 0, "upce_cc_5addon_ccb_8x2.svg" },
|
||||
/* 31*/ { BARCODE_UPCE_CC, -1, -1, -1, -1, -1, 0, 2, -1, 0, "", "", 0, "1876543+56789", "[91]12345", 0, "upce_cc_5addon_ccb_8x2_notext.svg" },
|
||||
/* 32*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "1234567+12", "", 0, "ean8_2addon.svg" },
|
||||
/* 33*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "1234567+12345", "", 0, "ean8_5addon.svg" },
|
||||
/* 34*/ { BARCODE_EANX_CC, -1, -1, -1, -1, -1, -1, 1, -1, 0, "", "", 0, "9876543+65", "[91]1234567", 0, "ean8_cc_2addon_cca_4x3.svg" },
|
||||
/* 35*/ { BARCODE_EANX_CC, -1, -1, -1, -1, -1, -1, 2, -1, 0, "", "", 0, "9876543+74083", "[91]123456789012345678", 0, "ean8_cc_5addon_ccb_8x3.svg" },
|
||||
/* 36*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "12345", "", 0, "ean5.svg" },
|
||||
/* 37*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "12", "", 0, "ean2.svg" },
|
||||
/* 38*/ { BARCODE_CODE39, -1, -1, SMALL_TEXT, -1, -1, -1, -1, -1, 0, "", "", 0, "123", "", 0, "code39_small.svg" },
|
||||
/* 39*/ { BARCODE_POSTNET, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "12345", "", 0, "postnet_zip.svg" },
|
||||
/* 40*/ { BARCODE_MAXICODE, -1, 2, BARCODE_BOX, -1, -1, -1, -1, -1, 0, "", "", 0, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "maxicode_box2.svg" },
|
||||
/* 41*/ { BARCODE_MAXICODE, -1, 1, BARCODE_BIND, -1, 1, -1, -1, -1, 0, "", "", 0, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "maxicode_vwsp1_bind1.svg" },
|
||||
/* 42*/ { BARCODE_MAXICODE, -1, -1, -1, -1, -1, -1, -1, -1, 0, "121212DD", "EEEEEE22", 90, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "maxicode_fgbg_rotate_90.svg" },
|
||||
/* 43*/ { BARCODE_DATAMATRIX, -1, 1, BARCODE_BIND | BARCODE_DOTTY_MODE, -1, 1, -1, -1, -1, 0, "", "", 0, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "datamatrix_vwsp1_bind1_dotty.svg" },
|
||||
/* 44*/ { BARCODE_DATAMATRIX, -1, 1, BARCODE_BIND | BARCODE_DOTTY_MODE, 1, 1, -1, -1, -1, 0, "", "", 0, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "datamatrix_hvwsp1_bind1_dotty.svg" },
|
||||
/* 45*/ { BARCODE_DBAR_LTD, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "12345678909", "", 0, "dbar_ltd.svg" },
|
||||
/* 46*/ { BARCODE_PDF417, -1, -1, -1, -1, -1, -1, -1, -1, 5, "", "", 0, "Your Data Here!", "", ZINT_WARN_NONCOMPLIANT, "pdf417_height5.svg" },
|
||||
/* 47*/ { BARCODE_USPS_IMAIL, -1, -1, -1, -1, -1, -1, -1, -1, 7.75, "", "", 0, "12345678901234567890", "", 0, "imail_height7.75.svg" },
|
||||
/* 48*/ { BARCODE_ULTRA, -1, 3, BARCODE_BOX, 2, 2, -1, -1, -1, 0, "FF0000", "0000FF", 0, "12345678901234567890", "", 0, "ultra_fgbg_hvwsp2_box3.svg" },
|
||||
/* 49*/ { BARCODE_TELEPEN, -1, -1, -1, -1, -1, -1, -1, -1, 0.4, "", "", 180, "A", "", 0, "telepen_height0.4_rotate_180.svg" },
|
||||
/* 0*/ { BARCODE_CODE128, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "<>\"&'", "", 0, "code128_amperands.svg" },
|
||||
/* 1*/ { BARCODE_CODE128, UNICODE_MODE, -1, BOLD_TEXT, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "Égjpqy", "", 0, "code128_egrave_bold.svg" },
|
||||
/* 2*/ { BARCODE_CODE128, UNICODE_MODE, 3, BOLD_TEXT | BARCODE_BOX, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "Égjpqy", "", 0, "code128_egrave_bold_box3.svg" },
|
||||
/* 3*/ { BARCODE_CODE128, UNICODE_MODE, 2, BOLD_TEXT | BARCODE_BOX, 2, 2, -1, -1, -1, -1, 0, "", "", 0, "Égjpqy", "", 0, "code128_egrave_bold_hvwsp2_box2.svg" },
|
||||
/* 4*/ { BARCODE_CODE128, UNICODE_MODE, -1, BOLD_TEXT, 3, 3, -1, -1, -1, -1, 0, "", "", 0, "Égjpqy", "", 0, "code128_egrave_bold_hvwsp3.svg" },
|
||||
/* 5*/ { BARCODE_GS1_128_CC, -1, -1, -1, -1, -1, -1, 3, -1, -1, 0, "", "", 0, "[00]030123456789012340", "[02]13012345678909[37]24[10]1234567ABCDEFG", 0, "gs1_128_cc_fig12.svg" },
|
||||
/* 6*/ { BARCODE_CODABLOCKF, -1, -1, -1, -1, -1, -1, 3, -1, -1, 0, "", "", 0, "AAAAAAAAA", "", 0, "codablockf_3rows.svg" },
|
||||
/* 7*/ { BARCODE_CODABLOCKF, -1, -1, -1, 2, 2, -1, 3, -1, -1, 0, "", "", 0, "AAAAAAAAA", "", 0, "codablockf_hvwsp2.svg" },
|
||||
/* 8*/ { BARCODE_CODABLOCKF, -1, 2, BARCODE_BOX, 2, 2, -1, -1, -1, -1, 0, "", "", 0, "AAAAAAAAA", "", 0, "codablockf_hvwsp2_box2.svg" },
|
||||
/* 9*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "9771384524017+12", "", 0, "ean13_2addon_ggs_5.2.2.5.1-2.svg" },
|
||||
/* 10*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "9780877799306+54321", "", 0, "ean13_5addon_ggs_5.2.2.5.2-2.svg" },
|
||||
/* 11*/ { BARCODE_EANX_CC, -1, -1, -1, -1, -1, -1, 1, -1, -1, 0, "", "", 0, "123456789012+12", "[91]123456789012345678901", 0, "ean13_cc_2addon_cca_4x4.svg" },
|
||||
/* 12*/ { BARCODE_EANX_CC, -1, -1, -1, -1, -1, -1, 2, -1, -1, 0, "", "", 0, "123456789012+54321", "[91]1234567890", 0, "ean13_cc_5addon_ccb_3x4.svg" },
|
||||
/* 13*/ { BARCODE_EANX_CC, -1, -1, -1, -1, -1, 0, 2, -1, -1, 0, "", "", 0, "123456789012+54321", "[91]1234567890", 0, "ean13_cc_5addon_ccb_3x4_notext.svg" },
|
||||
/* 14*/ { BARCODE_UPCA, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "012345678905+24", "", 0, "upca_2addon_ggs_5.2.6.6-5.svg" },
|
||||
/* 15*/ { BARCODE_UPCA, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "614141234417+12345", "", 0, "upca_5addon.svg" },
|
||||
/* 16*/ { BARCODE_UPCA, -1, 3, BARCODE_BIND, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "614141234417+12345", "", 0, "upca_5addon_bind3.svg" },
|
||||
/* 17*/ { BARCODE_UPCA, -1, -1, SMALL_TEXT | BOLD_TEXT, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "614141234417+12345", "", 0, "upca_5addon_small_bold.svg" },
|
||||
/* 18*/ { BARCODE_UPCA_CC, -1, -1, -1, -1, -1, -1, 1, -1, -1, 0, "", "", 0, "12345678901+12", "[91]123456789", 0, "upca_cc_2addon_cca_3x4.svg" },
|
||||
/* 19*/ { BARCODE_UPCA_CC, -1, -1, -1, -1, -1, -1, 2, -1, -1, 0, "", "", 0, "12345678901+12121", "[91]1234567890123", 0, "upca_cc_5addon_ccb_4x4.svg" },
|
||||
/* 20*/ { BARCODE_UPCA_CC, -1, -1, -1, -1, -1, 0, 2, -1, -1, 0, "", "", 0, "12345678901+12121", "[91]1234567890123", 0, "upca_cc_5addon_ccb_4x4_notext.svg" },
|
||||
/* 21*/ { BARCODE_UPCA_CC, -1, 3, BARCODE_BIND, -1, -1, -1, 2, -1, -1, 0, "", "", 0, "12345678901+12121", "[91]1234567890123", 0, "upca_cc_5addon_ccb_4x4_bind3.svg" },
|
||||
/* 22*/ { BARCODE_UPCE, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "1234567+12", "", 0, "upce_2addon.svg" },
|
||||
/* 23*/ { BARCODE_UPCE, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "1234567+12345", "", 0, "upce_5addon.svg" },
|
||||
/* 24*/ { BARCODE_UPCE, -1, -1, SMALL_TEXT, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "1234567+12345", "", 0, "upce_5addon_small.svg" },
|
||||
/* 25*/ { BARCODE_UPCE, -1, -1, -1, -1, -1, 0, -1, -1, -1, 0, "", "", 0, "1234567+12345", "", 0, "upce_5addon_notext.svg" },
|
||||
/* 26*/ { BARCODE_UPCE_CC, -1, -1, -1, -1, -1, -1, 1, -1, -1, 0, "", "", 0, "0654321+89", "[91]1", 0, "upce_cc_2addon_cca_5x2.svg" },
|
||||
/* 27*/ { BARCODE_UPCE_CC, -1, -1, -1, -1, -1, -1, 1, -1, -1, 0, "FF0000EE", "0000FF11", 0, "0654321+89", "[91]1", 0, "upce_cc_2addon_cca_5x2_fgbgalpha.svg" },
|
||||
/* 28*/ { BARCODE_UPCE_CC, -1, -1, -1, -1, -1, -1, 1, -1, -1, 0, "", "FFFFFF00", 0, "0654321+89", "[91]1", 0, "upce_cc_2addon_cca_5x2_nobg.svg" },
|
||||
/* 29*/ { BARCODE_UPCE_CC, -1, -1, -1, -1, -1, -1, 1, -1, -1, 0, "", "", 270, "0654321+89", "[91]1", 0, "upce_cc_2addon_cca_5x2_rotate_270.svg" },
|
||||
/* 30*/ { BARCODE_UPCE_CC, -1, -1, -1, -1, -1, -1, 2, -1, -1, 0, "", "", 0, "1876543+56789", "[91]12345", 0, "upce_cc_5addon_ccb_8x2.svg" },
|
||||
/* 31*/ { BARCODE_UPCE_CC, -1, -1, -1, -1, -1, 0, 2, -1, -1, 0, "", "", 0, "1876543+56789", "[91]12345", 0, "upce_cc_5addon_ccb_8x2_notext.svg" },
|
||||
/* 32*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "1234567+12", "", 0, "ean8_2addon.svg" },
|
||||
/* 33*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "1234567+12345", "", 0, "ean8_5addon.svg" },
|
||||
/* 34*/ { BARCODE_EANX_CC, -1, -1, -1, -1, -1, -1, 1, -1, -1, 0, "", "", 0, "9876543+65", "[91]1234567", 0, "ean8_cc_2addon_cca_4x3.svg" },
|
||||
/* 35*/ { BARCODE_EANX_CC, -1, -1, -1, -1, -1, -1, 2, -1, -1, 0, "", "", 0, "9876543+74083", "[91]123456789012345678", 0, "ean8_cc_5addon_ccb_8x3.svg" },
|
||||
/* 36*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "12345", "", 0, "ean5.svg" },
|
||||
/* 37*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "12", "", 0, "ean2.svg" },
|
||||
/* 38*/ { BARCODE_CODE39, -1, -1, SMALL_TEXT, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "123", "", 0, "code39_small.svg" },
|
||||
/* 39*/ { BARCODE_POSTNET, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "12345", "", 0, "postnet_zip.svg" },
|
||||
/* 40*/ { BARCODE_MAXICODE, -1, 2, BARCODE_BOX, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "maxicode_box2.svg" },
|
||||
/* 41*/ { BARCODE_MAXICODE, -1, 1, BARCODE_BIND, -1, 1, -1, -1, -1, -1, 0, "", "", 0, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "maxicode_vwsp1_bind1.svg" },
|
||||
/* 42*/ { BARCODE_MAXICODE, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "121212DD", "EEEEEE22", 90, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "maxicode_fgbg_rotate_90.svg" },
|
||||
/* 43*/ { BARCODE_DATAMATRIX, -1, 1, BARCODE_BIND | BARCODE_DOTTY_MODE, -1, 1, -1, -1, -1, -1, 0, "", "", 0, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "datamatrix_vwsp1_bind1_dotty.svg" },
|
||||
/* 44*/ { BARCODE_DATAMATRIX, -1, 1, BARCODE_BIND | BARCODE_DOTTY_MODE, 1, 1, -1, -1, -1, -1, 0, "", "", 0, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "datamatrix_hvwsp1_bind1_dotty.svg" },
|
||||
/* 45*/ { BARCODE_DBAR_LTD, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "12345678909", "", 0, "dbar_ltd.svg" },
|
||||
/* 46*/ { BARCODE_PDF417, -1, -1, -1, -1, -1, -1, -1, -1, -1, 5, "", "", 0, "Your Data Here!", "", ZINT_WARN_NONCOMPLIANT, "pdf417_height5.svg" },
|
||||
/* 47*/ { BARCODE_USPS_IMAIL, -1, -1, -1, -1, -1, -1, -1, -1, -1, 7.75, "", "", 0, "12345678901234567890", "", 0, "imail_height7.75.svg" },
|
||||
/* 48*/ { BARCODE_ULTRA, -1, 3, BARCODE_BOX, 2, 2, -1, -1, -1, -1, 0, "FF0000", "0000FF", 0, "12345678901234567890", "", 0, "ultra_fgbg_hvwsp2_box3.svg" },
|
||||
/* 49*/ { BARCODE_TELEPEN, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0.4, "", "", 180, "A", "", 0, "telepen_height0.4_rotate_180.svg" },
|
||||
/* 50*/ { BARCODE_CODE49, -1, -1, COMPLIANT_HEIGHT, -1, -1, -1, -1, -1, -1, 0, "FF11157F", "", 0, "A", "", 0, "code49_comph_fgalpha.svg" },
|
||||
/* 51*/ { BARCODE_CODABLOCKF, -1, -1, COMPLIANT_HEIGHT, -1, -1, -1, -1, -1, 2, 0, "00000033", "FFFFFF66", 0, "1234567890123456789012345678901234", "", 0, "codablockf_comph_sep2_fgbgalpha.svg" },
|
||||
};
|
||||
int data_size = ARRAY_SIZE(data);
|
||||
int i, length, ret;
|
||||
|
|
@ -138,12 +141,12 @@ static void test_print(int index, int generate, int debug) {
|
|||
int text_length;
|
||||
|
||||
if (index != -1 && i != index) continue;
|
||||
if ((debug & ZINT_DEBUG_TEST_PRINT) && !(debug & ZINT_DEBUG_TEST_LESS_NOISY)) printf("i:%d\n", i); // ZINT_DEBUG_TEST_PRINT 16
|
||||
if ((debug & ZINT_DEBUG_TEST_PRINT) && !(debug & ZINT_DEBUG_TEST_LESS_NOISY)) printf("i:%d\n", i); /* ZINT_DEBUG_TEST_PRINT 16 */
|
||||
|
||||
symbol = ZBarcode_Create();
|
||||
assert_nonnull(symbol, "Symbol not created\n");
|
||||
|
||||
length = testUtilSetSymbol(symbol, data[i].symbology, data[i].input_mode, -1 /*eci*/, data[i].option_1, data[i].option_2, -1, data[i].output_options, data[i].data, -1, debug);
|
||||
length = testUtilSetSymbol(symbol, data[i].symbology, data[i].input_mode, -1 /*eci*/, data[i].option_1, data[i].option_2, data[i].option_3, data[i].output_options, data[i].data, -1, debug);
|
||||
if (data[i].show_hrt != -1) {
|
||||
symbol->show_hrt = data[i].show_hrt;
|
||||
}
|
||||
|
|
@ -184,10 +187,10 @@ static void test_print(int index, int generate, int debug) {
|
|||
assert_nonzero(testUtilDataPath(expected_file, sizeof(expected_file), data_dir, data[i].expected_file), "i:%d testUtilDataPath == 0\n", i);
|
||||
|
||||
if (generate) {
|
||||
printf(" /*%3d*/ { %s, %s, %d, %s, %d, %d, %d, %d, %d, %.8g, \"%s\", \"%s\", %d, \"%s\", \"%s\", \"%s\" },\n",
|
||||
printf(" /*%3d*/ { %s, %s, %d, %s, %d, %d, %d, %d, %d, %d, %.8g, \"%s\", \"%s\", %d, \"%s\", \"%s\", \"%s\" },\n",
|
||||
i, testUtilBarcodeName(data[i].symbology), testUtilInputModeName(data[i].input_mode), data[i].border_width,
|
||||
testUtilOutputOptionsName(data[i].output_options), data[i].whitespace_width, data[i].whitespace_height, data[i].show_hrt,
|
||||
data[i].option_1, data[i].option_2, data[i].height, data[i].fgcolour, data[i].bgcolour, data[i].rotate_angle,
|
||||
data[i].option_1, data[i].option_2, data[i].option_3, data[i].height, data[i].fgcolour, data[i].bgcolour, data[i].rotate_angle,
|
||||
testUtilEscape(data[i].data, length, escaped, escaped_size), data[i].composite, data[i].expected_file);
|
||||
ret = testUtilRename(symbol->outfile, expected_file);
|
||||
assert_zero(ret, "i:%d testUtilRename(%s, %s) ret %d != 0\n", i, symbol->outfile, expected_file, ret);
|
||||
|
|
@ -196,7 +199,7 @@ static void test_print(int index, int generate, int debug) {
|
|||
assert_zero(ret, "i:%d %s libreoffice %s ret %d != 0\n", i, testUtilBarcodeName(data[i].symbology), expected_file, ret);
|
||||
}
|
||||
if (have_vnu) {
|
||||
ret = testUtilVerifyVnu(expected_file, debug); // Very slow
|
||||
ret = testUtilVerifyVnu(expected_file, debug); /* Very slow */
|
||||
assert_zero(ret, "i:%d %s vnu libreoffice %s ret %d != 0\n", i, testUtilBarcodeName(data[i].symbology), expected_file, ret);
|
||||
}
|
||||
} else {
|
||||
|
|
@ -257,3 +260,5 @@ int main(int argc, char *argv[]) {
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* vim: set ts=4 sw=4 et : */
|
||||
|
|
|
|||
|
|
@ -1167,12 +1167,12 @@ static void test_quiet_zones(int index, int debug) {
|
|||
/* 48*/ { BARCODE_DPLEIT, BARCODE_QUIET_ZONES, -1, -1, "1234", 0, 50, 1, 135, 310, 118.9, 20, 0, 2, 100 },
|
||||
/* 49*/ { BARCODE_DPIDENT, -1, -1, -1, "1234", 0, 50, 1, 117, 234, 118.9, 0, 0, 2, 100 },
|
||||
/* 50*/ { BARCODE_DPIDENT, BARCODE_QUIET_ZONES, -1, -1, "1234", 0, 50, 1, 117, 274, 118.9, 20, 0, 2, 100 },
|
||||
/* 51*/ { BARCODE_CODE16K, -1, -1, -1, "1234", 0, 20, 2, 70, 162, 44, 20, 2, 6, 20 },
|
||||
/* 52*/ { BARCODE_CODE16K, BARCODE_QUIET_ZONES, -1, -1, "1234", 0, 20, 2, 70, 162, 44, 20, 2, 6, 20 },
|
||||
/* 53*/ { BARCODE_CODE16K, BARCODE_NO_QUIET_ZONES, -1, -1, "1234", 0, 20, 2, 70, 140, 44, 0, 2, 6, 20 },
|
||||
/* 54*/ { BARCODE_CODE49, -1, -1, -1, "1234", 0, 20, 2, 70, 162, 44, 20, 2, 2, 40 },
|
||||
/* 55*/ { BARCODE_CODE49, BARCODE_QUIET_ZONES, -1, -1, "1234", 0, 20, 2, 70, 162, 44, 20, 2, 2, 40 },
|
||||
/* 56*/ { BARCODE_CODE49, BARCODE_NO_QUIET_ZONES, -1, -1, "1234", 0, 20, 2, 70, 140, 44, 0, 2, 2, 40 },
|
||||
/* 51*/ { BARCODE_CODE16K, -1, -1, -1, "1234", 0, 20, 2, 70, 162, 44, 20, 2, 6, 19 },
|
||||
/* 52*/ { BARCODE_CODE16K, BARCODE_QUIET_ZONES, -1, -1, "1234", 0, 20, 2, 70, 162, 44, 20, 2, 6, 19 },
|
||||
/* 53*/ { BARCODE_CODE16K, BARCODE_NO_QUIET_ZONES, -1, -1, "1234", 0, 20, 2, 70, 140, 44, 0, 2, 6, 19 },
|
||||
/* 54*/ { BARCODE_CODE49, -1, -1, -1, "1234", 0, 20, 2, 70, 162, 44, 20, 2, 2, 19 },
|
||||
/* 55*/ { BARCODE_CODE49, BARCODE_QUIET_ZONES, -1, -1, "1234", 0, 20, 2, 70, 162, 44, 20, 2, 2, 19 },
|
||||
/* 56*/ { BARCODE_CODE49, BARCODE_NO_QUIET_ZONES, -1, -1, "1234", 0, 20, 2, 70, 140, 44, 0, 2, 2, 19 },
|
||||
/* 57*/ { BARCODE_CODE93, -1, -1, -1, "1234", 0, 50, 1, 73, 146, 118.9, 0, 0, 2, 100 },
|
||||
/* 58*/ { BARCODE_CODE93, BARCODE_QUIET_ZONES, -1, -1, "1234", 0, 50, 1, 73, 186, 118.9, 20, 0, 2, 100 },
|
||||
/* 59*/ { BARCODE_FLAT, -1, -1, -1, "1234", 0, 50, 1, 36, 72, 100, 0, 0, 2, 100 },
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- /home/mburke/code/gitlost/postscriptbarcode/build/monolithic/barcode.ps 2022-07-25 02:58:57.291864362 +0100
|
||||
+++ backend/tests/tools/bwipp_dump.ps 2022-07-25 03:00:12.937844813 +0100
|
||||
@@ -16909,8 +16909,8 @@
|
||||
--- /home/mburke/code/gitlost/postscriptbarcode/build/monolithic/barcode.ps 2022-08-07 21:25:25.243853138 +0100
|
||||
+++ backend/tests/tools/bwipp_dump.ps 2022-08-07 21:28:28.580645899 +0100
|
||||
@@ -16846,8 +16846,8 @@
|
||||
} bind
|
||||
/fime {
|
||||
/sbs [2.25 6.75 2.25 15.75 2.25 6.75 2.25] def
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
} bind
|
||||
>> def
|
||||
|
||||
@@ -28403,7 +28403,7 @@
|
||||
@@ -28303,7 +28303,7 @@
|
||||
pop
|
||||
} ifelse
|
||||
|
||||
|
|
@ -20,8 +20,8 @@
|
|||
|
||||
options (lintype) (ean13) put
|
||||
options (inkspread) (0) put
|
||||
@@ -28443,27 +28443,73 @@
|
||||
} if
|
||||
@@ -28317,27 +28317,73 @@
|
||||
/ai //gs1process exec pop pop pop
|
||||
|
||||
% Plot the linear part
|
||||
- linear options //ean13 exec //renlinear exec
|
||||
|
|
@ -112,7 +112,7 @@
|
|||
|
||||
end
|
||||
|
||||
@@ -28528,7 +28574,7 @@
|
||||
@@ -28401,7 +28447,7 @@
|
||||
pop
|
||||
} ifelse
|
||||
|
||||
|
|
@ -121,8 +121,8 @@
|
|||
|
||||
% Get the result of encoding with ean8 and gs1-cc
|
||||
options (lintype) (ean8) put
|
||||
@@ -28569,29 +28615,75 @@
|
||||
} if
|
||||
@@ -28416,29 +28462,75 @@
|
||||
/ai //gs1process exec pop pop pop
|
||||
|
||||
% Plot the linear part
|
||||
- linear options //ean8 exec //renlinear exec
|
||||
|
|
@ -217,7 +217,7 @@
|
|||
|
||||
end
|
||||
|
||||
@@ -28656,7 +28748,7 @@
|
||||
@@ -28502,7 +28594,7 @@
|
||||
pop
|
||||
} ifelse
|
||||
|
||||
|
|
@ -226,8 +226,8 @@
|
|||
|
||||
options (lintype) (ean13) put
|
||||
options (inkspread) (0) put
|
||||
@@ -28696,27 +28788,73 @@
|
||||
} if
|
||||
@@ -28516,27 +28608,73 @@
|
||||
/ai //gs1process exec pop pop pop
|
||||
|
||||
% Plot the linear part
|
||||
- linear options //upca exec //renlinear exec
|
||||
|
|
@ -318,7 +318,7 @@
|
|||
|
||||
end
|
||||
|
||||
@@ -28796,7 +28934,7 @@
|
||||
@@ -28615,7 +28753,7 @@
|
||||
/opt options
|
||||
>> def
|
||||
|
||||
|
|
@ -327,8 +327,8 @@
|
|||
|
||||
options (lintype) (upce) put
|
||||
options (inkspread) (0) put
|
||||
@@ -28836,27 +28974,73 @@
|
||||
} if
|
||||
@@ -28629,27 +28767,73 @@
|
||||
/ai //gs1process exec pop pop pop
|
||||
|
||||
% Plot the linear part
|
||||
- linear options //upce exec //renlinear exec
|
||||
|
|
@ -419,7 +419,7 @@
|
|||
|
||||
end
|
||||
|
||||
@@ -28921,7 +29105,7 @@
|
||||
@@ -28713,7 +28897,7 @@
|
||||
pop
|
||||
} ifelse
|
||||
|
||||
|
|
@ -428,7 +428,7 @@
|
|||
|
||||
options (lintype) (databaromni) put
|
||||
options (linkage) true put
|
||||
@@ -28965,7 +29149,7 @@
|
||||
@@ -28731,7 +28915,7 @@
|
||||
linear options //databaromni exec
|
||||
dup (sbs) get /linsbs exch def
|
||||
dup (bhs) get 0 get 72 mul /linheight exch def
|
||||
|
|
@ -437,7 +437,7 @@
|
|||
|
||||
% Plot the separator
|
||||
/sepfinder {
|
||||
@@ -28996,20 +29180,66 @@
|
||||
@@ -28762,20 +28946,66 @@
|
||||
sep 0 [0 0 0] putinterval
|
||||
sep sep length 4 sub [0 0 0 0] putinterval
|
||||
18 sepfinder 64 sepfinder
|
||||
|
|
@ -516,7 +516,7 @@
|
|||
|
||||
end
|
||||
|
||||
@@ -29073,7 +29303,7 @@
|
||||
@@ -28838,7 +29068,7 @@
|
||||
pop
|
||||
} ifelse
|
||||
|
||||
|
|
@ -525,7 +525,7 @@
|
|||
|
||||
options (lintype) (databarstacked) put
|
||||
options (linkage) true put
|
||||
@@ -29117,7 +29347,7 @@
|
||||
@@ -28856,7 +29086,7 @@
|
||||
linear options //databarstacked exec
|
||||
dup (pixs) get 0 2 index (pixx) get getinterval /bot exch def
|
||||
dup (pixy) get /linheight exch def
|
||||
|
|
@ -534,7 +534,7 @@
|
|||
|
||||
% Plot the separator
|
||||
/sepfinder {
|
||||
@@ -29145,20 +29375,52 @@
|
||||
@@ -28884,20 +29114,52 @@
|
||||
sep 0 [ 0 0 0 0 ] putinterval
|
||||
sep sep length 4 sub [ 0 0 0 0 ] putinterval
|
||||
18 sepfinder
|
||||
|
|
@ -599,7 +599,7 @@
|
|||
|
||||
end
|
||||
|
||||
@@ -29222,7 +29484,7 @@
|
||||
@@ -28960,7 +29222,7 @@
|
||||
pop
|
||||
} ifelse
|
||||
|
||||
|
|
@ -608,7 +608,7 @@
|
|||
|
||||
options (lintype) (databarstackedomni) put
|
||||
options (linkage) true put
|
||||
@@ -29266,7 +29528,7 @@
|
||||
@@ -28978,7 +29240,7 @@
|
||||
linear options //databarstackedomni exec
|
||||
dup (pixs) get 0 2 index (pixx) get getinterval /bot exch def
|
||||
dup (pixy) get /linheight exch def
|
||||
|
|
@ -617,7 +617,7 @@
|
|||
|
||||
% Plot the separator
|
||||
/sepfinder {
|
||||
@@ -29294,20 +29556,52 @@
|
||||
@@ -29006,20 +29268,52 @@
|
||||
sep 0 [ 0 0 0 0 ] putinterval
|
||||
sep sep length 4 sub [ 0 0 0 0 ] putinterval
|
||||
18 sepfinder
|
||||
|
|
@ -682,7 +682,7 @@
|
|||
|
||||
end
|
||||
|
||||
@@ -29525,7 +29819,7 @@
|
||||
@@ -29209,7 +29503,7 @@
|
||||
pop
|
||||
} ifelse
|
||||
|
||||
|
|
@ -691,7 +691,7 @@
|
|||
|
||||
options (lintype) (databarlimited) put
|
||||
options (linkage) true put
|
||||
@@ -29569,7 +29863,7 @@
|
||||
@@ -29227,7 +29521,7 @@
|
||||
linear options //databarlimited exec
|
||||
dup (sbs) get /linsbs exch def
|
||||
dup (bhs) get 0 get 72 mul /linheight exch def
|
||||
|
|
@ -700,7 +700,7 @@
|
|||
|
||||
% Plot the separator
|
||||
mark
|
||||
@@ -29577,22 +29871,68 @@
|
||||
@@ -29235,22 +29529,68 @@
|
||||
counttomark 1 sub array astore /sep exch def pop pop
|
||||
sep 0 [0 0 0] putinterval
|
||||
sep sep length 9 sub [0 0 0 0 0 0 0 0 0] putinterval % 4 + 5 right guard spaces
|
||||
|
|
@ -783,7 +783,7 @@
|
|||
|
||||
end
|
||||
|
||||
@@ -29657,7 +29997,7 @@
|
||||
@@ -29314,7 +29654,7 @@
|
||||
pop
|
||||
} ifelse
|
||||
|
||||
|
|
@ -792,7 +792,7 @@
|
|||
|
||||
options (lintype) (databarexpanded) put
|
||||
options (linkage) true put
|
||||
@@ -29701,7 +30041,7 @@
|
||||
@@ -29332,7 +29672,7 @@
|
||||
linear options //databarexpanded exec
|
||||
dup (sbs) get /linsbs exch def
|
||||
dup (bhs) get 0 get 72 mul /linheight exch def
|
||||
|
|
@ -801,7 +801,7 @@
|
|||
|
||||
% Plot the separator
|
||||
/sepfinder {
|
||||
@@ -29730,20 +30070,60 @@
|
||||
@@ -29361,20 +29701,60 @@
|
||||
18 98 bot length 13 sub {} for
|
||||
69 98 bot length 13 sub {} for
|
||||
] {sepfinder} forall
|
||||
|
|
@ -874,7 +874,7 @@
|
|||
|
||||
end
|
||||
|
||||
@@ -29807,7 +30187,7 @@
|
||||
@@ -29437,7 +29817,7 @@
|
||||
pop
|
||||
} ifelse
|
||||
|
||||
|
|
@ -883,7 +883,7 @@
|
|||
|
||||
options (lintype) (databarexpandedstacked) put
|
||||
options (linkage) true put
|
||||
@@ -29851,7 +30231,7 @@
|
||||
@@ -29455,7 +29835,7 @@
|
||||
linear options //databarexpandedstacked exec
|
||||
dup (pixs) get 0 2 index (pixx) get getinterval /bot exch def
|
||||
dup (pixy) get /linheight exch def
|
||||
|
|
@ -892,7 +892,7 @@
|
|||
|
||||
% Plot the separator
|
||||
/sepfinder {
|
||||
@@ -29877,21 +30257,49 @@
|
||||
@@ -29481,21 +29861,49 @@
|
||||
19 98 bot length 13 sub {} for
|
||||
70 98 bot length 13 sub {} for
|
||||
] {sepfinder} forall
|
||||
|
|
@ -955,7 +955,7 @@
|
|||
|
||||
end
|
||||
|
||||
@@ -29956,7 +30364,7 @@
|
||||
@@ -29559,7 +29967,7 @@
|
||||
pop
|
||||
} ifelse
|
||||
|
||||
|
|
@ -964,7 +964,7 @@
|
|||
|
||||
options (inkspread) (0) put
|
||||
options (dontdraw) true put
|
||||
@@ -30016,35 +30424,87 @@
|
||||
@@ -29593,35 +30001,87 @@
|
||||
linear << options {} forall >> //gs1-128 exec
|
||||
dup (sbs) get /linsbs exch def
|
||||
dup (bhs) get 0 get 72 mul /linheight exch def
|
||||
|
|
@ -1066,7 +1066,7 @@
|
|||
|
||||
end
|
||||
|
||||
@@ -31752,3 +32212,189 @@
|
||||
@@ -31105,3 +31565,189 @@
|
||||
% --END ENCODER hibcazteccode--
|
||||
|
||||
% --END TEMPLATE--
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -405,8 +405,9 @@ INTERNAL int plot_vector(struct zint_symbol *symbol, int rotate_angle, int file_
|
|||
int text_height; /* Font pixel size (so whole integers) */
|
||||
float text_gap; /* Gap between barcode and text */
|
||||
float guard_descent;
|
||||
float addon_row_height;
|
||||
const int is_codablockf = symbol->symbology == BARCODE_CODABLOCKF || symbol->symbology == BARCODE_HIBC_BLOCKF;
|
||||
|
||||
float addon_row_height;
|
||||
float large_bar_height;
|
||||
int upcae_outside_text_height = 0; /* UPC-A/E outside digits font size */
|
||||
float digit_ascent_factor = 0.25f; /* Assuming digit ascent roughly 25% less than font size */
|
||||
|
|
@ -420,6 +421,9 @@ INTERNAL int plot_vector(struct zint_symbol *symbol, int rotate_angle, int file_
|
|||
struct zint_vector_hexagon *hexagon, *last_hexagon = NULL;
|
||||
struct zint_vector_string *last_string = NULL;
|
||||
struct zint_vector_circle *circle, *last_circle = NULL;
|
||||
struct zint_vector_rect **first_row_rects = z_alloca(sizeof(struct zint_vector_rect *) * (symbol->rows + 1));
|
||||
|
||||
memset(first_row_rects, 0, sizeof(struct zint_vector_rect *) * (symbol->rows + 1));
|
||||
|
||||
/* Free any previous rendering structures */
|
||||
vector_free(symbol);
|
||||
|
|
@ -638,6 +642,9 @@ INTERNAL int plot_vector(struct zint_symbol *symbol, int rotate_angle, int file_
|
|||
rect = vector_plot_create_rect(symbol, i + xoffset, yposn, block_width, row_height);
|
||||
if (!rect) return ZINT_ERROR_MEMORY;
|
||||
vector_plot_add_rect(symbol, rect, &last_rectangle);
|
||||
if (i == 0) {
|
||||
first_row_rects[r] = rect;
|
||||
}
|
||||
}
|
||||
}
|
||||
yposn += row_height;
|
||||
|
|
@ -854,16 +861,40 @@ INTERNAL int plot_vector(struct zint_symbol *symbol, int rotate_angle, int file_
|
|||
if ((symbol->output_options & BARCODE_BIND) && (symbol->rows > 1) && is_stackable(symbol->symbology)) {
|
||||
float sep_xoffset = xoffset;
|
||||
float sep_width = symbol->width;
|
||||
float sep_height = 1.0f, sep_yoffset;
|
||||
float sep_height = 1.0f, sep_yoffset, sep_half_height;
|
||||
if (symbol->option_3 > 0 && symbol->option_3 <= 4) {
|
||||
sep_height = symbol->option_3;
|
||||
}
|
||||
sep_yoffset = yoffset - sep_height / 2;
|
||||
if (symbol->symbology == BARCODE_CODABLOCKF || symbol->symbology == BARCODE_HIBC_BLOCKF) {
|
||||
sep_half_height = sep_height / 2.0f;
|
||||
sep_yoffset = yoffset - sep_half_height;
|
||||
if (is_codablockf) {
|
||||
/* Avoid 11-module start and 13-module stop chars */
|
||||
sep_xoffset += 11;
|
||||
sep_width -= 11 + 13;
|
||||
}
|
||||
/* Adjust original rectangles so don't overlap with separator(s) (important for RGBA) */
|
||||
for (r = 0; r < symbol->rows; r++) {
|
||||
for (rect = first_row_rects[r], i = 0; rect && rect != first_row_rects[r + 1]; rect = rect->next, i++) {
|
||||
if (is_codablockf) { /* Skip start and stop chars */
|
||||
if (i < 3) {
|
||||
continue;
|
||||
}
|
||||
if ((i / 3) * 11 + 13 >= symbol->width) { /* 3 bars and 11 modules per char */
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (r != 0) {
|
||||
rect->y += sep_height - sep_half_height;
|
||||
rect->height -= r + 1 == symbol->rows ? sep_half_height : sep_height;
|
||||
} else {
|
||||
rect->height -= sep_half_height;
|
||||
}
|
||||
if (rect->height < 0) {
|
||||
rect->height = 0.0f;
|
||||
/* TODO: warn? */
|
||||
}
|
||||
}
|
||||
}
|
||||
for (r = 1; r < symbol->rows; r++) {
|
||||
const float row_height = symbol->row_height[r - 1] ? symbol->row_height[r - 1] : large_bar_height;
|
||||
rect = vector_plot_create_rect(symbol, sep_xoffset, (r * row_height) + sep_yoffset,
|
||||
|
|
@ -886,8 +917,7 @@ INTERNAL int plot_vector(struct zint_symbol *symbol, int rotate_angle, int file_
|
|||
/* Top */
|
||||
rect = vector_plot_create_rect(symbol, 0.0f, ybind_top, vector->width, symbol->border_width);
|
||||
if (!rect) return ZINT_ERROR_MEMORY;
|
||||
if (!(symbol->output_options & BARCODE_BOX)
|
||||
&& (symbol->symbology == BARCODE_CODABLOCKF || symbol->symbology == BARCODE_HIBC_BLOCKF)) {
|
||||
if (!(symbol->output_options & BARCODE_BOX) && is_codablockf) {
|
||||
/* CodaBlockF bind - does not extend over horizontal whitespace */
|
||||
rect->x = xoffset;
|
||||
rect->width -= xoffset + roffset;
|
||||
|
|
@ -896,8 +926,7 @@ INTERNAL int plot_vector(struct zint_symbol *symbol, int rotate_angle, int file_
|
|||
/* Bottom */
|
||||
rect = vector_plot_create_rect(symbol, 0.0f, ybind_bot, vector->width, symbol->border_width);
|
||||
if (!rect) return ZINT_ERROR_MEMORY;
|
||||
if (!(symbol->output_options & BARCODE_BOX)
|
||||
&& (symbol->symbology == BARCODE_CODABLOCKF || symbol->symbology == BARCODE_HIBC_BLOCKF)) {
|
||||
if (!(symbol->output_options & BARCODE_BOX) && is_codablockf) {
|
||||
/* CodaBlockF bind - does not extend over horizontal whitespace */
|
||||
rect->x = xoffset;
|
||||
rect->width -= xoffset + roffset;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue