From 6be6080d1c48668340e125184aafd9394ee2215b Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Tue, 8 Mar 2016 11:17:16 +0100 Subject: Konturbug bei gezoomten Bildern entfernt --- epostunit.pas | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/epostunit.pas b/epostunit.pas index 1c446c5..9ffa44a 100644 --- a/epostunit.pas +++ b/epostunit.pas @@ -3215,6 +3215,7 @@ var s,datei: string; i,j,k,schriftgroesze: longint; xzoom,yzoom,wert,schritt,miw,maw,Zeit: extended; + xpe,tpe: extended; xmin,xmax,tmin,tmax,xp,tp: longint; breite,hoehe,lof,rof,oof,uof: longint; Paletten: pTPalettenArray; @@ -3548,13 +3549,13 @@ begin gibAus('Alle Threads beendet, Konturen einfügen ...',1); for i:=0 to length(verwKonturen)-1 do for j:=0 to length(konturen^[verwKonturen[i]].orte)-1 do begin - xp:=kont2disk('x',konturen^[verwKonturen[i]].orte[j]['x']); - tp:=kont2disk('t',konturen^[verwKonturen[i]].orte[j]['y']); + xpe:=kont2diskFak('x',konturen^[verwKonturen[i]].orte[j]['x']); + tpe:=kont2diskFak('t',konturen^[verwKonturen[i]].orte[j]['y']); - if (xmin<=xp) and (xp<=xmax) and (tmin<=tp) and (tp<=tmax) then begin + if (xmin<=xpe) and (xpe<=xmax) and (tmin<=tpe) and (tpe<=tmax) then begin k:=0; - xp:=xp-xmin; - tp:=tp-tmin; + xp:=round((xpe-xmin)*xzoom); + tp:=round((tpe-tmin)*yzoom); while (k=Bilderthreads[k+1].xpmi) do inc(k); Bilderthreads[k].farben[(tp+oof)*Bilderthreads[k].Breite + xp - Bilderthreads[k].xpmi]:= -- cgit v1.2.3-70-g09d2