Skip to content

Commit 85f295c

Browse files
committed
Avoid internal rowmult clashing with the user option of the same name
1 parent ec081ba commit 85f295c

24 files changed

Lines changed: 132 additions & 131 deletions

CHANGES

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ XXXX-XX-XX
22

33
* The QR Code, Aztec Code, Ultracode, PDF417, MicroPDF417, MaxiCode, Data Matrix, Han Xin Code, Code One and Codablock F encoders were amended to bound their parsed message length.
44
* The DotCode encoder was amedned to cap the rows and columns options at 200.
5+
* The renmatrix intermediate dictionary key for per-row module heights was renamed from rowmult (a per-row array) to rowheights, eliminating a collision with the public scalar rowmult option of the PDF417 and MicroPDF417 encoders.
56

67

78
2026-05-06

src/codablockf.ps.src

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -655,40 +655,40 @@ begin
655655
1 1 0 0 0 1 1 1 0 1 0 1 1
656656
] def
657657

658-
/rowmult numcomprows array def
658+
/rowheights numcomprows array def
659659
/pos 0 def /ri 0 def
660660

661661
% Top separator
662662
pixs pos allone putinterval
663663
/pos pos symwid add def
664-
rowmult ri sepheight put /ri ri 1 add def
664+
rowheights ri sepheight put /ri ri 1 add def
665665

666666
% Data rows with separators
667667
0 1 r 2 sub {
668668
/i exch def
669669
pixs pos rowbits i get putinterval
670670
/pos pos symwid add def
671-
rowmult ri rowheight put /ri ri 1 add def
671+
rowheights ri rowheight put /ri ri 1 add def
672672
pixs pos seprow putinterval
673673
/pos pos symwid add def
674-
rowmult ri sepheight put /ri ri 1 add def
674+
rowheights ri sepheight put /ri ri 1 add def
675675
} for
676676

677677
% Last data row
678678
pixs pos rowbits r 1 sub get putinterval
679679
/pos pos symwid add def
680-
rowmult ri rowheight put /ri ri 1 add def
680+
rowheights ri rowheight put /ri ri 1 add def
681681

682682
% Bottom separator
683683
pixs pos allone putinterval
684-
rowmult ri sepheight put
684+
rowheights ri sepheight put
685685

686686
<<
687687
/ren /renmatrix
688688
/pixs pixs
689689
/pixx symwid
690690
/pixy symhgt
691-
/rowmult rowmult
691+
/rowheights rowheights
692692
/height symhgt 72 div
693693
/width symwid 72 div
694694
/strictspec strictspec

src/code16k.ps.src

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -852,40 +852,40 @@ begin
852852
/allone [ 81 {1} repeat ] def
853853
/seprow [ 10 {0} repeat 70 {1} repeat 0 ] def
854854

855-
/rowmult numcomprows array def
855+
/rowheights numcomprows array def
856856
/pos 0 def /ri 0 def
857857

858858
% Top separator
859859
pixs pos allone putinterval
860860
/pos pos 81 add def
861-
rowmult ri sepheight put /ri ri 1 add def
861+
rowheights ri sepheight put /ri ri 1 add def
862862

863863
% Data rows with separators
864864
0 1 r 2 sub {
865865
/i exch def
866866
pixs pos rowbits i get putinterval
867867
/pos pos 81 add def
868-
rowmult ri rowheight put /ri ri 1 add def
868+
rowheights ri rowheight put /ri ri 1 add def
869869
pixs pos seprow putinterval
870870
/pos pos 81 add def
871-
rowmult ri sepheight put /ri ri 1 add def
871+
rowheights ri sepheight put /ri ri 1 add def
872872
} for
873873

874874
% Last data row
875875
pixs pos rowbits r 1 sub get putinterval
876876
/pos pos 81 add def
877-
rowmult ri rowheight put /ri ri 1 add def
877+
rowheights ri rowheight put /ri ri 1 add def
878878

879879
% Bottom separator
880880
pixs pos allone putinterval
881-
rowmult ri sepheight put
881+
rowheights ri sepheight put
882882

883883
<<
884884
/ren /renmatrix
885885
/pixs pixs
886886
/pixx 81
887887
/pixy symhgt
888-
/rowmult rowmult
888+
/rowheights rowheights
889889
/height symhgt 72 div
890890
/width 81 72 div
891891
/strictspec strictspec

src/code49.ps.src

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1202,7 +1202,7 @@ dup [ exch 16 exch 1 32 getinterval aload pop ] /code49.weighty exch readonly de
12021202
] def
12031203
/symhgt sepheight r 1 add mul r rowheight mul add def
12041204

1205-
/rowmult [
1205+
/rowheights [
12061206
sepheight
12071207
0 1 r 2 sub { pop rowheight sepheight } for
12081208
rowheight
@@ -1214,7 +1214,7 @@ dup [ exch 16 exch 1 32 getinterval aload pop ] /code49.weighty exch readonly de
12141214
/pixs pixs
12151215
/pixx 81
12161216
/pixy symhgt
1217-
/rowmult rowmult
1217+
/rowheights rowheights
12181218
/height symhgt 72 div
12191219
/width 81 72 div
12201220
/strictspec strictspec

src/databarexpanded.ps.src

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -972,22 +972,22 @@ begin
972972
} if
973973
} for
974974
] def
975-
/rowmult [
975+
/rowheights [
976976
0 1 numrows 1 sub {
977977
/r exch def
978978
r 0 ne { 1 } if
979979
barxmult
980980
r numrows 1 sub ne { 1 1 } if
981981
} for
982982
] def
983-
/pixy 0 rowmult {add} forall def
983+
/pixy 0 rowheights {add} forall def
984984

985985
<<
986986
/ren /renmatrix
987987
/pixs pixs
988988
/pixx pixx
989989
/pixy pixy
990-
/rowmult rowmult
990+
/rowheights rowheights
991991
/height pixy 72 div
992992
/width pixx 72 div
993993
/borderleft 0.0

src/databarexpandedcomposite.ps.src

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ begin
173173
options (propspec) undef
174174
comp options //gs1-cc exec /compsym exch def
175175
/ccpixs compsym /pixs get def
176-
/ccrowmult compsym /rowmult get def
176+
/ccrowheights compsym /rowheights get def
177177
/ccpixx compsym /pixx get def
178178

179179
/linpixs [
@@ -184,7 +184,7 @@ begin
184184
] def
185185

186186
/linheight linheight cvi def
187-
/ccrows ccrowmult length def
187+
/ccrows ccrowheights length def
188188
/diff linpixs length ccpixx sub def % Minimum linpixs length is 102, ccpixx is 99
189189
/ccrpad [ diff 2 sub {0} repeat ] def
190190
/pixs [
@@ -194,7 +194,7 @@ begin
194194
} for
195195
sep aload pop linpixs aload pop
196196
] def
197-
/rowmult [ ccrowmult aload pop 1 linheight ] def
197+
/rowheights [ ccrowheights aload pop 1 linheight ] def
198198

199199
/pixx linpixs length def
200200

@@ -206,7 +206,7 @@ begin
206206
/text1xalign linsym /text1xalign 2 copy known { get } { pop pop (unset) } ifelse def
207207
/text1yalign linsym /text1yalign 2 copy known { get } { pop pop (unset) } ifelse def
208208

209-
/pixy 0 rowmult {add} forall def
209+
/pixy 0 rowheights {add} forall def
210210

211211
/borderleft
212212
linsym /borderleft 2 copy known { get } { pop pop 10 } ifelse pixx linpixs length sub 1 add sub
@@ -229,7 +229,7 @@ begin
229229
/pixs pixs
230230
/pixx pixx
231231
/pixy pixy
232-
/rowmult rowmult
232+
/rowheights rowheights
233233
/height pixy 72 div
234234
/width pixx 72 div
235235
/borderleft borderleft

src/databarexpandedstackedcomposite.ps.src

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ begin
135135
dup (pixy) get /linheight exch def
136136
/linsym exch def
137137
/linpixs linsym /pixs get def
138-
/linrowmult linsym /rowmult get def
138+
/linrowheights linsym /rowheights get def
139139

140140
%
141141
% Plot the separator
@@ -172,21 +172,21 @@ begin
172172
options (propspec) undef
173173
comp options //gs1-cc exec /compsym exch def
174174
/ccpixs compsym /pixs get def
175-
/ccrowmult compsym /rowmult get def
175+
/ccrowheights compsym /rowheights get def
176176
/ccpixx compsym /pixx get def
177177

178178
/pixx sep length def
179179
/cclpad [ pixx ccpixx sub 1 add 2 idiv {0} repeat ] def % Add 1 to allow for odd difference
180180
/ccrpad [ pixx ccpixx sub 2 idiv {0} repeat ] def
181-
/ccrows ccrowmult length def
181+
/ccrows ccrowheights length def
182182
/pixs [
183183
0 ccpixx ccpixs length 1 sub { % Centre align composite
184184
/i exch def
185185
cclpad aload pop ccpixs i ccpixx getinterval aload pop ccrpad aload pop
186186
} for
187187
sep aload pop linpixs aload pop
188188
] def
189-
/rowmult [ ccrowmult aload pop 1 linrowmult aload pop ] def
189+
/rowheights [ ccrowheights aload pop 1 linrowheights aload pop ] def
190190

191191
/txt [
192192
linsym /txt 2 copy known { get {
@@ -196,7 +196,7 @@ begin
196196
/text1xalign linsym /text1xalign 2 copy known { get } { pop pop (unset) } ifelse def
197197
/text1yalign linsym /text1yalign 2 copy known { get } { pop pop (unset) } ifelse def
198198

199-
/pixy 0 rowmult {add} forall def
199+
/pixy 0 rowheights {add} forall def
200200

201201
% Quiet zone borders: T=2D, L/R=max(1D,2D), B=1D
202202
/borderleft
@@ -220,7 +220,7 @@ begin
220220
/pixs pixs
221221
/pixx pixx
222222
/pixy pixy
223-
/rowmult rowmult
223+
/rowheights rowheights
224224
/height pixy 72 div
225225
/width pixx 72 div
226226
/borderleft borderleft

src/databarlimitedcomposite.ps.src

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,11 @@ begin
157157
options (propspec) undef
158158
comp options //gs1-cc exec /compsym exch def
159159
/ccpixs compsym /pixs get def
160-
/ccrowmult compsym /rowmult get def
160+
/ccrowheights compsym /rowheights get def
161161
/ccpixx compsym /pixx get def
162162

163163
/linheight linheight cvi def
164-
/ccrows ccrowmult length def
164+
/ccrows ccrowheights length def
165165
% ccpixx is 72 for CC-A and 82 for CC-B; linpixs length is 79
166166
ccpixx 72 eq { % 3-col CC-A
167167
/pixs [
@@ -182,7 +182,7 @@ begin
182182
] def
183183
/pixx ccpixx 6 add def % 88
184184
} ifelse
185-
/rowmult [ ccrowmult aload pop 1 linheight ] def
185+
/rowheights [ ccrowheights aload pop 1 linheight ] def
186186

187187
/txt [
188188
linsym /txt 2 copy known { get {
@@ -192,7 +192,7 @@ begin
192192
/text1xalign linsym /text1xalign 2 copy known { get } { pop pop (unset) } ifelse def
193193
/text1yalign linsym /text1yalign 2 copy known { get } { pop pop (unset) } ifelse def
194194

195-
/pixy 0 rowmult {add} forall def
195+
/pixy 0 rowheights {add} forall def
196196

197197
/borderleft
198198
linsym /borderleft 2 copy known { get } { pop pop 10 } ifelse pixx linpixs length sub 1 add sub
@@ -215,7 +215,7 @@ begin
215215
/pixs pixs
216216
/pixx pixx
217217
/pixy pixy
218-
/rowmult rowmult
218+
/rowheights rowheights
219219
/height pixy 72 div
220220
/width pixx 72 div
221221
/borderleft borderleft

src/databaromni.ps.src

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ begin
452452
sep aload pop
453453
bot aload pop
454454
] def
455-
/rowmult [5 1 7] def
455+
/rowheights [5 1 7] def
456456
/pixy 13 def
457457
} if
458458

@@ -504,7 +504,7 @@ begin
504504
sep3 aload pop
505505
bot aload pop
506506
] def
507-
/rowmult [barxmult 1 1 1 barxmult] def
507+
/rowheights [barxmult 1 1 1 barxmult] def
508508
/pixy barxmult 2 mul 3 add def
509509
} if
510510

@@ -513,7 +513,7 @@ begin
513513
/pixs pixs
514514
/pixx 50
515515
/pixy pixy
516-
/rowmult rowmult
516+
/rowheights rowheights
517517
/height pixy 72 div
518518
/width 50 72 div
519519
/borderleft 0.0

src/databaromnicomposite.ps.src

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ begin
179179
options (propspec) undef
180180
comp options //gs1-cc exec /compsym exch def
181181
/ccpixs compsym /pixs get def
182-
/ccrowmult compsym /rowmult get def
182+
/ccrowheights compsym /rowheights get def
183183
/ccpixx compsym /pixx get def
184184

185185
/linpixs [
@@ -190,7 +190,7 @@ begin
190190
] def
191191

192192
/linheight linheight cvi def
193-
/ccrows ccrowmult length def
193+
/ccrows ccrowheights length def
194194
% ccpixx is 99 for both 4-col CC-A and 4-col CC-B; linpixs length is 96
195195
/pixs [
196196
0 ccpixx ccpixs length 1 sub { % Right pad composite with 1 space
@@ -199,7 +199,7 @@ begin
199199
} for
200200
0 0 0 0 sep aload pop 0 0 0 0 linpixs aload pop % Left pad with 4 spaces
201201
] def
202-
/rowmult [ ccrowmult aload pop 1 linheight ] def
202+
/rowheights [ ccrowheights aload pop 1 linheight ] def
203203
/pixx ccpixx 1 add def % 100
204204

205205
/txt [
@@ -210,7 +210,7 @@ begin
210210
/text1xalign linsym /text1xalign 2 copy known { get } { pop pop (unset) } ifelse def
211211
/text1yalign linsym /text1yalign 2 copy known { get } { pop pop (unset) } ifelse def
212212

213-
/pixy 0 rowmult {add} forall def
213+
/pixy 0 rowheights {add} forall def
214214

215215
/borderleft
216216
linsym /borderleft 2 copy known { get } { pop pop 10 } ifelse pixx linpixs length sub 1 add sub
@@ -233,7 +233,7 @@ begin
233233
/pixs pixs
234234
/pixx pixx
235235
/pixy pixy
236-
/rowmult rowmult
236+
/rowheights rowheights
237237
/height pixy 72 div
238238
/width pixx 72 div
239239
/borderleft borderleft

0 commit comments

Comments
 (0)