mirror of
https://git.code.sf.net/p/zint/code
synced 2025-05-23 03:26:56 -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
|
|
@ -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.
Loading…
Add table
Add a link
Reference in a new issue