From a820f8ee99544f01d5ceee6545493a0b467ecdcd Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Sun, 22 Mar 2020 15:53:21 +0000 Subject: [PATCH] LazMapViewer: Add icon for TMvBGRADrawingengine. Less hints. Preparing for release. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7336 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/lazmapviewer/example/main.lfm | 1 - .../lazmapviewer/images/tmvbgradrawingengine.png | Bin 0 -> 997 bytes .../images/tmvbgradrawingengine_150.png | Bin 0 -> 1373 bytes .../images/tmvbgradrawingengine_200.png | Bin 0 -> 2265 bytes .../lazmapviewer/source/mvde_intfgraphics.pas | 4 ++-- components/lazmapviewer/source/mvdlefpc.pas | 1 + 6 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 components/lazmapviewer/images/tmvbgradrawingengine.png create mode 100644 components/lazmapviewer/images/tmvbgradrawingengine_150.png create mode 100644 components/lazmapviewer/images/tmvbgradrawingengine_200.png diff --git a/components/lazmapviewer/example/main.lfm b/components/lazmapviewer/example/main.lfm index 3ef9ba3ca..6b193f7c5 100644 --- a/components/lazmapviewer/example/main.lfm +++ b/components/lazmapviewer/example/main.lfm @@ -21,7 +21,6 @@ object MainForm: TMainForm CachePath = '../../../../example_cache/' DefaultTrackColor = clBlue DefaultTrackWidth = 3 - DownloadEngine = MapView.BuiltInDLE DrawingEngine = MapView.BuiltInDE Font.Color = clBlack MapProvider = 'OpenStreetMap Mapnik' diff --git a/components/lazmapviewer/images/tmvbgradrawingengine.png b/components/lazmapviewer/images/tmvbgradrawingengine.png new file mode 100644 index 0000000000000000000000000000000000000000..7c67af500f017d45703f67fd31ae5425499d4508 GIT binary patch literal 997 zcmV8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H117b-;K~zYIwU%FKTV))EpCl(ICrR5ROV=fBY&ToGj%v4&)Uh;G z)alJcrtU_D6hSWv)4_JL!9WUg7sFc_A_{AZC|0Edks*k7_F{J6$}Za4RJ&!_pKdkH zk~Zl%C*SAASVCF?=g>Iup)(9ra*WOU`i)O>Qjt{k1<*{0I*j#0+8rGM*jL3ppeha zBb~buHQ#|Fys-p&a;S-FRI2MN+ z?;EF=m_N>1Hi2eNw4e0>L`$c9l#fO=YEr@mct4^f3T~KYoqZ=O;b) zA2l^W^7$M$64Q8nenL-erN8$qCr+N>RL?O^oIC^g0B8zcrnP>E!AnO0c6smTKhR5KQwyO`1BzlN8he>+Hbbm)AD2gl zxgkW+Bz~)%J| zQ=z3O6zofMmW}>ZxV1Tiv?7HK#ipa18csD!dSUa@1nXV%d2i{$a08&5&f?Mkq?bFe T@!OI;00000NkvXXu0mjfm+QnK literal 0 HcmV?d00001 diff --git a/components/lazmapviewer/images/tmvbgradrawingengine_150.png b/components/lazmapviewer/images/tmvbgradrawingengine_150.png new file mode 100644 index 0000000000000000000000000000000000000000..cccb3d6c4432da833e3ab133aa778e6b05ececc3 GIT binary patch literal 1373 zcmV-j1)}V(MsD zxzTqYK$=xx%go_#h`!zqf`Bw>B6?jd9w~!H?L}hbcp??6&)iMN6e?O&Uw}u7ff}MV zM`hFlHHHl!3KFBj z6R|`t#biuD#*E?}MRI2%l`WeInRl4_ax3D{4?lbWQIIfbZ=w-J#JC;wYo{S&8N6(A zEI;fx%l^E6W{w?U0L9&buH!r*1`~>+Aj=X`_RC=%UBr?Y@T8)<|cI3)7Sg5Q6)lJruyepVf4i zZASIQ!d-s|)AV%!=##Pr z+m8jn(|R5T+z1Hhp|ICJ_0$;sofM#lzad^ddd^i*{P%U7(W(OE}J%O!SxvWeMq^2nJ! zi_&j*alGm%udG@}R?ZA|f3+Qe%8DcW^78>d;i5&WSdqKMXYB3#0+!}{G&F$6b3EX$U! zp`yGDr?U=w?J2Haarr?wFF#MlxWfRFMdBug?vD!4OJS|IymDIat`OWc3 z!a4KuX{fhjvt^K#GlQ(`85}7)h^ne=e0M7s8qWhT;h8i#I@$;gH3E<@CW$Fiv$5YN z-sO%(KqWin5KXPw$g2Mr(gz?TGnb6a+Hge+aWn$UF(K@k7~mI`S5t(_j(k0S^=Ny&}eZ`(+j zqY}X`FyinyMoAOn9{Yj=s3A8(?G0EB-y$u@rs zY>8a`3oFm zWE$iCu7szMfQnIU#%L6=o5L8o^6Wqh;eFyfx(n zG#k3ENB%4ZKcZs{N4XJIk2bGiMpIjmP1|U`V>O}&wD{6Lu>h@ZCvsyYp27l-9W28e zG)6&~L?5DKD9ubj)uYX8{`XMZ-ota#0gk>*rz$gXDI}a2%2Qatu|rOLVRICO5ig=W zmlk1E`%Iiz;Wl$sEgV~Eyl+Tv)sYzUaGq05JSESf_n(2%YsiWA zZv9D{`e4G%#iLFEcn|DB2YStX6vxCx04UaUy3byQY&!Rw(fO!TDHLv~!sxH3cJmYH zo_cg!50Yj-g(aouh4Ob+bqYWUhfu9)(CEULIfCR_k7KeWT_|sHNr>8Bzern)cWu_F zYK(v9p+kKiw%22(P-SHW;ZO*(*+OPke+-5bVJ_DJ4j!oFngN69*|QG-`@i~vK%o7e zklv#gX=x{F!tZaRuI>n#nO9vrfP3%0g#iNw6AA^Xt2;vB+wWtw+W6DTXDQiH#C6w= zWchQCv0&lvm@;iP4=lKy+-rwKU`CIf%)&*#2cYPk^}MuVDerw)h15Z6UfJ_A(vw{5 zt)7ZM=s4~8u&Xu^RIE6wC&venl+=}%R{aftr=NP5fA9U2tgQZ&yt|3NzO@rcl9=yl z<=6N9j49J*BS{99E^A-RsjABC8N(s~r6rrW@kjZ5x_cL+$4rU|Fg6?Se$7W8BqwJe&piJZ z0N&qK%=P1@GGO2jDR=%0MNy*a>16$EAyF@`)Z`^y6kPV_|iDscy)*U z&UzUQ_}h>qiSZL|py-|TG&O!pT3S!Cvie7^Jjd0odm4A$vyf#^E+!lf;i}$GacMb4 z+dktDE7q}f^O@7Aqc|QS|EFkD8i8+;z_bm`u^XW!;>A2WwU@XWiPD89Hoiq zYx?%hjO6p1g(Z;~Ns`!Dv>QbUN5L5kGFys2M-80g&GGWkbB-`pJtDZtjTk09( zV*=Ri9j|XpCi7`GC0iGJ)Mtyu8nf?-IIY9+cka85pNv_8-O|WgA3xGz+;LrYONka= zIu-5-q$j!AduZBO-1Q&I9}x+HZ5^uJ+YB00000NkvXXu0mjfrN~J! literal 0 HcmV?d00001 diff --git a/components/lazmapviewer/source/mvde_intfgraphics.pas b/components/lazmapviewer/source/mvde_intfgraphics.pas index 98326203b..b8875fe57 100644 --- a/components/lazmapviewer/source/mvde_intfgraphics.pas +++ b/components/lazmapviewer/source/mvde_intfgraphics.pas @@ -414,7 +414,7 @@ begin img := bmp.CreateIntfImage; try fc := TColorToFPColor(bmp.Canvas.Font.Color); - intens0 := (fc.Red + fc.Green + fc.Blue); + intens0 := Int64(fc.Red) + fc.Green + fc.Blue; for j := 0 to img.Height - 1 do for i := 0 to img.Width - 1 do begin c := bmp.Canvas.Pixels[i, j]; @@ -424,7 +424,7 @@ begin else if c = FFontColor then tc.Alpha := alphaOpaque else begin - intens := tc.Red + tc.Green + tc.Blue; + intens := Int64(tc.Red) + tc.Green + tc.Blue; if intens0 = 0 then alpha := (3 * alphaopaque - intens) / (3 * alphaOpaque - intens0) else diff --git a/components/lazmapviewer/source/mvdlefpc.pas b/components/lazmapviewer/source/mvdlefpc.pas index 4eb94c20c..2b1df5205 100644 --- a/components/lazmapviewer/source/mvdlefpc.pas +++ b/components/lazmapviewer/source/mvdlefpc.pas @@ -94,6 +94,7 @@ begin try http.Get(Url, AStream); except + // Eat the exception because we don't know on which server the map is found. end; AStream.Position := 0; finally