From 77380837cf465ad0a3e312b90145fae185f42d0e Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Fri, 8 Apr 2022 20:55:27 +0000
Subject: [PATCH] Lazbarcodes: Refinements of TBarcodePDF417 and
 TBarcodeDataMatrix palette icons.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8248 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/lazbarcodes/demo/main.lfm          |  12 ++++++------
 .../lazbarcodes/images/tbarcodedatamatrix.png | Bin 973 -> 344 bytes
 .../lazbarcodes/images/tbarcodepdf417_150.png | Bin 490 -> 324 bytes
 .../lazbarcodes/src/lazbarcodes_icons.res     | Bin 49613 -> 48813 bytes
 components/lazbarcodes/src/ubarcodes.pas      |  15 ++++++++++-----
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/components/lazbarcodes/demo/main.lfm b/components/lazbarcodes/demo/main.lfm
index e7d0afd9a..db83e33c1 100644
--- a/components/lazbarcodes/demo/main.lfm
+++ b/components/lazbarcodes/demo/main.lfm
@@ -436,12 +436,14 @@ object MainForm: TMainForm
         end
       end
       object btnSaveToFile: TBitBtn
+        AnchorSideLeft.Control = gbChecksum
         AnchorSideTop.Control = gbColors
+        AnchorSideRight.Control = btnCopyToClipboard
         AnchorSideRight.Side = asrBottom
         Left = 205
         Height = 25
         Top = 233
-        Width = 128
+        Width = 121
         Anchors = [akTop, akLeft, akRight]
         AutoSize = True
         BorderSpacing.Top = 9
@@ -450,16 +452,14 @@ object MainForm: TMainForm
         TabOrder = 4
       end
       object btnCopyToClipboard: TBitBtn
-        AnchorSideLeft.Control = btnSaveToFile
+        AnchorSideLeft.Control = gbChecksum
         AnchorSideTop.Control = btnSaveToFile
         AnchorSideTop.Side = asrBottom
-        AnchorSideRight.Control = btnSaveToFile
         AnchorSideRight.Side = asrBottom
         Left = 205
         Height = 25
         Top = 264
-        Width = 128
-        Anchors = [akTop, akLeft, akRight]
+        Width = 121
         AutoSize = True
         BorderSpacing.Top = 6
         Caption = 'Copy to clipboard'
@@ -488,7 +488,7 @@ object MainForm: TMainForm
         Height = 293
         Top = 35
         Width = 152
-        PageIndex = 2
+        PageIndex = 0
         BorderSpacing.Left = 16
         TabOrder = 7
         object pgOptions_QR: TPage
diff --git a/components/lazbarcodes/images/tbarcodedatamatrix.png b/components/lazbarcodes/images/tbarcodedatamatrix.png
index 691147887127474a182b04b2fed1b6e9a8ee8db7..5286c684120fb4d906937193908401100d20a9e2 100644
GIT binary patch
delta 259
zcmV+e0sQ{W2iO9TU4H=ONkl<ZNQuo<(GG+l4BH6*|Gh?Ky%*<Q1{E-xT;E{Rw%eG<
z%TN&!0Oc)$bTX+XRi)>gbILg<5s`IWyZPsLqe@EonglTHpdxS;W@f+l0IU^fXV0e&
zRP|C>jI;cTAS#XbEY6${_h1y!2_=Y1V{Kh&O6gt?W|a>2fP5i3icTDl_n_y5z5`bn
z!D`K>ZrVXqxNX~Y{=rsyilVX@kF|FpkG%snMNO4005AaNThq*J-}kCd9$%Jaj-aLZ
zYG3)r?UpD`6PvEaRvjalMfENYRfSE>UAWUnf7-%XB39eK#|PmurURf*kr4m@002ov
JPDHLkV1lh!cvJuY

delta 893
zcmV-@1A_e60?h}IU4H{wNkl<ZNQu3bO-t)c6vzK(5?hs`6w!q)w7zUzidt=(ic3F;
zD_@|rv`KEGr3l^maRfKM;CB!Nwc<uxSV61F%()Al(5AijKJYxxJ@AKQI5U~^oBx>*
zGfVtWK}3d8tyX^!k??&V8yg!iO;ZRVu(-I0p`jtc%&;sArhjP)09amL#=yXUP)fnF
zED%voPBxnb0C=8vAfjKDQbH+(!NEZki$%_4GU2$C5=4ac^>uDGo2b=lR4$iUFSxtA
z%ZWq+^?IGc1-}t-xm;HI+4DTb%(7De*mYg?@$n&Ju^4N$+ij`E%<}N?Pz?_cbBJC~
zCL$I>a1aDiDSs6%Tr3uqVHiE*+uPd;0C%d-reNwy(&;oT%VNVY!s<NFql=3Rl2XDj
z44j;t(ACuy0N~~21=(ztqlnMW&TxKyPL)c9`yz^B>D=AU&Q8y+qdBhYD#I{-ji^&^
zZ*OvMZ%^sTzVFNT_xDgwPfs#B$8}w$&!Y<wGlRLi;(vHNj;*aNjE|2q0GOr;B7$w(
zq@A_0vJ&Q7mc_|r5{*WKY}@We)K5}M8O7Faw||=-Mby&=(eONv#CLd}7y8?A9B#E*
ziin`4n=}XlrSpiHB@v0WwKe2&IR=2cyF1+9-@~#jjE;`t`S}?Dkk99lPN#Wub5l%C
zPV&UW1b;?GMsRz3i)OP407#`$n46n}ZQD#lMu@0XDyh%UPsz;Ew(Za@j^n7`A!24(
zDwVq2)fdsx(GkUBF#!Mv2L~*rQ~*HqMJ0;Jw(XuA-}jZ2Qu)6BYec3Q8Vf-XU~Fs*
ztyT-Z?<1ejBa_K+wOXZoK9AMaRo>s<r-z3JdVhR;#M06d1At)|I6gk^M$~y1A<{Vd
zIjUBx)z?w~*hNGngb-k6MMOeNyK8D{N+_k2>$?11u~JH@P8XTcMGJ*OSGUFEaa1Z5
zs?};;<4P$oGl&SuWD?nI7LMbDXH>7(|9lrQvn&(}eG$2?s}hMs7se>wE=2WuopkxY
z*LH15M557XkjAB5q|v>;zAE7B3en*>4)-)#E|&{S(|@NR2yl6M*@bU<dKxn`GdMjx
z#q8`XQmGUG;O6EA*VoqofQ5wx%+Jrm^E@UZBeZGsEdFhL8^bX5%YXfWzZO3Mpa%8J
TJK7Q_00000NkvXXu0mjfW6rVw

diff --git a/components/lazbarcodes/images/tbarcodepdf417_150.png b/components/lazbarcodes/images/tbarcodepdf417_150.png
index 5e27b707e4886642bb15c8ab063274f6dd1b6ade..a4670f62e3b465bb3b64c74bb909127f199117b3 100644
GIT binary patch
delta 254
zcmV<a00IB%1H=N5D+><8000id0mpBsWRW%}e*n=*L_t(oh3%G64#OY_hJW17?BzUx
zhjQ$pHDL^;*^4gaOB#`){D}kwf*`mV1OUw3mJ1<z06-FsL`13ESI3c0epU`^{vl`=
zLXgK)5Hr8@T%Ni7uVXbtl)M;M&<aA3$I}bYeL~hzuZuqKHIj4YS}Uw|avUZ-J2fBX
zXkjyR(|+mG<H)D?nydq`;gS89Abr+WJ!xCk$ZYLTf>scMJX}Hg?y}xJS8An{!g8Ns
zzB8c7=B68-+{8*~36k-atz*AljJvR%pzR*{K@i-IH|d(x`gY(z6aWAK07*qoM6N<$
Ef-hfq2LJ#7

delta 422
zcmV;X0a^aU0_p>hD+?AS000&x0ZCFM@R2qre*t$%L_t(oh3%Iyj)O1|MgK%;Q*eMZ
zTp~q?=2i}s5p;7akdh+TNRtDk4ztB#WSnf+>}Ca8`AJCD@NIqB!<PXfk;vads(PE+
zL`OwL<q`l6hXansBLTp6yVWeqAR@F{t@L`m4(g%)ktUq$*zfo1=7!^5q^dV-Z3{pF
zf2g&#?RHI>`K})7A8Eq6d;GcKSXB!ESiFDde@8Sl##2Mg3{`CbplKQq(Lk@NEi?Dy
zvMlw%GCgj-Tk~Z@QxFY}vHY%Zy<Wo@Gw2Z!p(IIQjL|R*o&Iz>_4>_bgCt2HBEvBJ
ziJ>%25jJg}=VYx_5m6#qFf*E_Az$x*e+YG5w?$D<RaIXan%$8_Lt{McAwLY=*blWZ
z;FuY8UEhVCwN_m}G4s>#oZSvZLu0%gj3Pqk^BKTrFuM1~7~So5eciud`kKq-@*YEe
z(7DFU^Sn3YH+UDA$g(U<b}foxaIFoQ-H}B@W6biuteV<MM?JNH$p7F2T<Hj-5XE#G
QNB{r;07*qoM6N<$f=lSdKmY&$

diff --git a/components/lazbarcodes/src/lazbarcodes_icons.res b/components/lazbarcodes/src/lazbarcodes_icons.res
index b1c1eb40ed00d200e41084506e20e47d32d03d47..45c3b6a0466c6828aa92bca0c0a7275bdaaeac5f 100644
GIT binary patch
delta 525
zcmV+o0`mRMg9EMo0<ipx0$2f){)?Y~0Od(UK~zYI%~a72gdhyt2><`RMrFMh=UoOB
zFq&N7VAHnSn8?de5fK38ErN71sU}sW=bUrOIVTa3bzQsp=Xaw@O8J@uFzlcra1~}|
zzxM#F6=!G9rw&y0Qdx|%{E8qdjrT0hoDcV46wwJKh)QE^U1>_`UJquK4)=h6Av%gq
z9FO;)=Y+lkR~W%+&8BYJK~%VH+jaiIR(gt}vKWuGcOj3x12#oXl`Q};0OniM%xvHH
zs!twYmSv8hrTA)J`Nr**C{7cbuEtg!BbY_?E)G?NP0d}n(?@^W!dW6#+rP&L;WDNJ
zpiq$!00000NkvXXu0mjfKn4J_6Od^P0YsC1oNkj(b25Jb(Md!>R9J=WmQfDFAP9zk
z+|KOfJb{OD?4dPb45itNF6B!ak)r&G1O<X1xETZh%-og>A$kBn5{^VfsoPh_kxzbB
z4r~4)Xct0|$5aqAzw}(5x%{tVHAIxW7+25=LXgMP3($Q+)={sEKJPV>bLLtrtaWl6
zCOtbfALeLbGjr2^>C@xLr}vty1F+$d{g)tp)>b`fTh_>I?N5SM5Q02hLHh2p-aS`p
zrIf;QpJBc;pvmT@8=l<6N@xj^@s_P)zg~>Hu$`do9{E8K+>STtn$-Gs;6M}r0000<
PMNUMnLSTZkteznw&ad|R

delta 1343
zcmV-F1;F~P{Q}K{1F-yy0?h-H{)?Y~16oN$K~zYIy_HQ%>r52K|7Q|gm7)~Ug)X$d
zY+Z_4ZJUZqKZq+|ptQ6}Zlk3L-T83@H@@I^5Cpa2MqF4ytI5o{3!TuWz4t!wJkLGw
zhh#W2ne&_fnGiEe{7*qdhEc6ne-M%IeIFYe8!$~%2qCbzxQL;lA;HYBEDNT8X$k;X
zUS7t)z<^Ln!Llq6QBO`bn*{)Po_8RkUzJiqDTTqoK@^Kc&SWy-xReq^g!T1xZZ?~!
z)oN5Omsu~kySvMYL<04Cox%mb5plU(R{GiVJjKkiQvld?UG?$tA!D%^Yqi^Lsm09l
z@bFL#4-a#QUQZ?>7D8|k1X3w~6)s#X7L{QbJ>%Qk+X?`8s?Vli>Pph-G%U+v!!W|?
zJkO(xiwlxc!Y~Y+oSe|r)fE8X<>dw0Y?h;l&(6+petu4sN`?C(iel;9-OkQV&#t36
zuInnpFn*1wQ*Uo?a&K=>>B+wD%lG&9P)|=!GCId~U8T>X3lTGexx3<jcs!1+tu2g?
zk23(6rU@c~ZQG=swX(7j=3AD<$z&3ZMuTkI?ncy4Qc4-c)^4|dn;%8g(+AP;Jdeb8
zc%B#f+i@IjwOWdZprxBM2m+<^h?yl3iM6#g<Z?L%fV;ap+~42BvMh{_j^g?G832&a
z=aEjQd2@49OioVn#KZ)DMn*<(dwYv!vk3r5rBaxin}coJOhiVAs8lMc&(BZE%+j{)
z&@GPRsNW%CW?3qgy4=+l(b3Tn#bPl500##LETvQcK=ef=ipaL@o*duzm6THXzW-}P
zrWqOwK@ebUYz(bd3%>6opU)$c$#At=rF=e*)zwwr-`}T)hX;Cpe0;>x(h>uJVHh|*
zKJG@;c^4tlIQluNR;$(5QUBOQL?na|U}i-`LQA`AYHCU-rIhQs{9Un9N~um4nbAcH
zg+f=i#p7{QDix~LYF*<>DKImL2+3p;*=!b$<Ai5auh;*47csLe6bgM2xvr}ci9{F1
zDBdna^?IFj`M}qIZAnC;(P)syrCp@ay}rIG;Oh#};W!TWG+Hi~3ro{~ryvM$d3o7|
zZ+dzfGcz+dJw3(j>?~5L6ae7n<_6c-*8qTpg$2yd&%^UPCL$xWY4j}qZG0QUF!jrS
z{eiz0KLMZy^~*cj5+?uv002ovPDHLkV1fVu06+!+089Xr0*orN$c;P<0qT>Dn<<kn
znnjZzE;4@scS%G+R9J=WmobimFc3xmL}^oSfHYhpMTq8B4wVsfb1RUNBG*Wh1EdbK
z#bRWfY}o8(1zPz@NY?Oeec8j80V0ve-$JT-o7zN2MMUKi01k%(j>jVbz;?UUEXyDw
zv|6q7dc6+nq5hF3oa@-{_v+?`<6fkyH*0MRKmmWKwYKecO_}+w9_k-y!n%9>x#3t<
z3jkQWf9HQkG&IIjL(B|SZ2_QZ8W7Pyuc|FG_v5lG^}#YdZoXUdWkXXC4UMt<u5i6x
z!x%H@5fPyzNnni8FbtjkbUO9=&1QonNgyJ_F#L(3G))mUZJy_3tyK|GB3dvrnx-LN
z?|**?bzQebQBYM?UmBX-kwrseJnbPr4BgldwJ_kA8FgLXg`TxmT|Y7N)9{?#4n;#_
zyc~=oLg(`tz-KVJ_r@6A?RI_LzhU~C%jNPOLw?Y?#?14)H{>^X7nsPhEKGJSiehlB
z4Vm4MMMGoE^1rN_+DS(}wSmb0-~(Lg2%{3kbQ?$j0000<MNUMnLSTXb0JDsnAtN>d
BgTMd)

diff --git a/components/lazbarcodes/src/ubarcodes.pas b/components/lazbarcodes/src/ubarcodes.pas
index 30eb7f5ba..0e8a25e90 100644
--- a/components/lazbarcodes/src/ubarcodes.pas
+++ b/components/lazbarcodes/src/ubarcodes.pas
@@ -3027,12 +3027,17 @@ end;
   pixels}
 function TBarcodeSquare.CalcFactor(AWidth, AHeight: Integer): Integer;
 begin
-  if AWidth > AHeight then
-    Result := AHeight div FSymbol^.Width
+  if FSymbol^.Width = 0 then
+    Result := 1
   else
-    Result := AWidth div FSymbol^.Width;
-  if Result = 0 then
-    Result := 1;
+  begin
+    if AWidth > AHeight then
+      Result := AHeight div FSymbol^.Width
+    else
+      Result := AWidth div FSymbol^.Width;
+    if Result = 0 then
+      Result := 1;
+  end;
 end;
 
 { Calculates scaled size parameters for the barcode. }