From f0a2aff207e0917547d2a13803b601c02331a261 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Mon, 7 Aug 2017 11:12:08 +0200
Subject: bugfixes to previous commit

---
 epost.lps     | 88 +++++++++++++++++++++++++++++------------------------------
 epostunit.pas | 12 ++++++--
 werteunit.pas |  6 ++--
 3 files changed, 56 insertions(+), 50 deletions(-)

diff --git a/epost.lps b/epost.lps
index 46be1fc..fb7c59a 100644
--- a/epost.lps
+++ b/epost.lps
@@ -7,7 +7,7 @@
       <Unit0>
         <Filename Value="epost.lpr"/>
         <IsPartOfProject Value="True"/>
-        <TopLine Value="173"/>
+        <TopLine Value="158"/>
         <CursorPos X="60" Y="173"/>
         <UsageCount Value="202"/>
         <Loaded Value="True"/>
@@ -24,8 +24,8 @@
         <IsPartOfProject Value="True"/>
         <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
-        <TopLine Value="5828"/>
-        <CursorPos X="80" Y="5848"/>
+        <TopLine Value="5854"/>
+        <CursorPos X="92" Y="5878"/>
         <UsageCount Value="201"/>
         <Loaded Value="True"/>
       </Unit2>
@@ -40,8 +40,8 @@
         <Filename Value="werteunit.pas"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="6"/>
-        <TopLine Value="1431"/>
-        <CursorPos X="111" Y="1439"/>
+        <TopLine Value="1424"/>
+        <CursorPos X="21" Y="1439"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
       </Unit4>
@@ -59,7 +59,7 @@
         <EditorIndex Value="2"/>
         <TopLine Value="214"/>
         <CursorPos Y="187"/>
-        <UsageCount Value="197"/>
+        <UsageCount Value="199"/>
         <Loaded Value="True"/>
       </Unit6>
       <Unit7>
@@ -68,7 +68,7 @@
         <EditorIndex Value="3"/>
         <TopLine Value="162"/>
         <CursorPos X="12" Y="191"/>
-        <UsageCount Value="194"/>
+        <UsageCount Value="196"/>
         <Loaded Value="True"/>
       </Unit7>
       <Unit8>
@@ -76,7 +76,7 @@
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="7"/>
         <CursorPos X="35" Y="10"/>
-        <UsageCount Value="100"/>
+        <UsageCount Value="102"/>
         <Loaded Value="True"/>
       </Unit8>
       <Unit9>
@@ -97,7 +97,7 @@
         <Filename Value="../units/lowlevelunit.pas"/>
         <EditorIndex Value="5"/>
         <TopLine Value="10"/>
-        <UsageCount Value="80"/>
+        <UsageCount Value="81"/>
         <Loaded Value="True"/>
       </Unit11>
       <Unit12>
@@ -110,7 +110,7 @@
         <EditorIndex Value="4"/>
         <TopLine Value="789"/>
         <CursorPos Y="800"/>
-        <UsageCount Value="54"/>
+        <UsageCount Value="55"/>
         <Loaded Value="True"/>
       </Unit13>
       <Unit14>
@@ -201,121 +201,121 @@
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="4017" Column="86" TopLine="4009"/>
+        <Caret Line="260" Column="117" TopLine="251"/>
       </Position1>
       <Position2>
         <Filename Value="epostunit.pas"/>
+        <Caret Line="4689" Column="125" TopLine="4672"/>
       </Position2>
       <Position3>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="121" Column="18" TopLine="93"/>
+        <Caret Line="5773" Column="127" TopLine="5756"/>
       </Position3>
       <Position4>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="251" Column="37" TopLine="222"/>
+        <Caret Line="5799" TopLine="5782"/>
       </Position4>
       <Position5>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="7248" Column="171" TopLine="7219"/>
+        <Caret Line="5818" Column="54" TopLine="5789"/>
       </Position5>
       <Position6>
         <Filename Value="epostunit.pas"/>
+        <Caret Line="5866" Column="31" TopLine="5789"/>
       </Position6>
       <Position7>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="251" Column="38" TopLine="240"/>
+        <Caret Line="255" Column="5" TopLine="237"/>
       </Position7>
       <Position8>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="2905" Column="65" TopLine="2876"/>
+        <Caret Line="5866" Column="40" TopLine="5849"/>
       </Position8>
       <Position9>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="3979" Column="58" TopLine="3950"/>
       </Position9>
       <Position10>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="5773" Column="23" TopLine="5770"/>
+        <Caret Line="5866" Column="27" TopLine="5849"/>
       </Position10>
       <Position11>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="247" Column="16" TopLine="229"/>
+        <Caret Line="247" Column="16" TopLine="238"/>
       </Position11>
       <Position12>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="4336" Column="64" TopLine="4307"/>
+        <Caret Line="4337" Column="64" TopLine="4308"/>
       </Position12>
       <Position13>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="4689" Column="101" TopLine="4661"/>
+        <Caret Line="4690" Column="36" TopLine="4662"/>
       </Position13>
       <Position14>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="5779" Column="28" TopLine="5766"/>
+        <Caret Line="5819" Column="37" TopLine="5798"/>
       </Position14>
       <Position15>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="251" Column="38" TopLine="233"/>
+        <Caret Line="5815" Column="23" TopLine="5798"/>
       </Position15>
       <Position16>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="2905" Column="65" TopLine="2876"/>
+        <Caret Line="5819" Column="15" TopLine="5802"/>
       </Position16>
       <Position17>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="3979" Column="58" TopLine="3950"/>
+        <Caret Line="5870" Column="40" TopLine="5847"/>
       </Position17>
       <Position18>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="5799" Column="10" TopLine="5792"/>
+        <Caret Line="5864" Column="66" TopLine="5855"/>
       </Position18>
       <Position19>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="5810" Column="86" TopLine="5786"/>
+        <Caret Line="3866" Column="77" TopLine="3854"/>
       </Position19>
       <Position20>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="5816" Column="41" TopLine="5788"/>
       </Position20>
       <Position21>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="5846" Column="87" TopLine="5817"/>
+        <Caret Line="6067" Column="16" TopLine="6038"/>
       </Position21>
       <Position22>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="5847" Column="87" TopLine="5818"/>
+        <Filename Value="epost.lpr"/>
+        <Caret Line="173" Column="60" TopLine="266"/>
       </Position22>
       <Position23>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="5848" Column="87" TopLine="5819"/>
+        <Caret Line="167" Column="27" TopLine="151"/>
       </Position23>
       <Position24>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="5864" Column="34" TopLine="5835"/>
+        <Caret Line="4263" Column="78" TopLine="4252"/>
       </Position24>
       <Position25>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="5865" Column="61" TopLine="5836"/>
+        <Filename Value="epost.lpr"/>
+        <Caret Line="173" Column="60" TopLine="158"/>
       </Position25>
       <Position26>
-        <Filename Value="werteunit.pas"/>
-        <Caret Line="66" Column="63" TopLine="50"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="164" Column="26" TopLine="148"/>
       </Position26>
       <Position27>
-        <Filename Value="werteunit.pas"/>
-        <Caret Line="1419" Column="68" TopLine="1411"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="4013" Column="20" TopLine="3989"/>
       </Position27>
       <Position28>
-        <Filename Value="werteunit.pas"/>
-        <Caret Line="66" Column="55" TopLine="50"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="4019" Column="70" TopLine="3999"/>
       </Position28>
       <Position29>
-        <Filename Value="werteunit.pas"/>
-        <Caret Line="1437" Column="58" TopLine="1408"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="4708" TopLine="4691"/>
       </Position29>
       <Position30>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="5865" Column="61" TopLine="5836"/>
+        <Caret Line="5333" TopLine="5316"/>
       </Position30>
     </JumpHistory>
   </ProjectSession>
diff --git a/epostunit.pas b/epostunit.pas
index c393734..6b4a0f8 100644
--- a/epostunit.pas
+++ b/epostunit.pas
@@ -4010,6 +4010,14 @@ begin
   until false;
 
   _tSiz:=_tSiz*2;
+  case genauigkeit of
+    gSingle:
+      sWerte.params.istKomplex:=true;
+    gDouble:
+      dWerte.params.istKomplex:=true;
+    gExtended:
+      eWerte.params.istKomplex:=true;
+  end{of case};
   if sT then begin
     result:=true;
     exit;
@@ -5841,7 +5849,6 @@ end;
 procedure tBilderThread.stExecute;
 var
   i,j,k:   longint;
-  hLen:    int64;
   wert:    extended;
   b:       boolean;
   frb:     tRGB;
@@ -5867,9 +5874,8 @@ begin
         farben[i-xPMi+(j+oOf)*breite].rgbGreen:=0;
         farben[i-xPMi+(j+oOf)*breite].rgbBlue:=0;
         for k:=0 to length(wertes)-1 do begin
-          hLen:=length(wertes[k]) div 2;
           for b:=false to istKomplex[k] do begin
-            wert:=(wertes[k,i-max(0,xPMi)+(j+byte(b and istKomplex[k])*hLen)*wBreite]/anzahlens[k,i-max(0,xPMi)+j*wBreite]-ws[k]._minW)/(ws[k]._maxW-ws[k]._minW);
+            wert:=(wertes[k,i-max(0,xPMi)+(j+byte(b and istKomplex[k])*(ws[k]._tSiz div 2))*wBreite]/anzahlens[k,i-max(0,xPMi)+j*wBreite]-ws[k]._minW)/(ws[k]._maxW-ws[k]._minW);
             wert:=max(0,min(wert,1));
             wert:=nbs[k].transformiereWert(wert);
             frb:=pals[k].wertZuFarbe(wert,b);
diff --git a/werteunit.pas b/werteunit.pas
index 81d016d..dd9c137 100644
--- a/werteunit.pas
+++ b/werteunit.pas
@@ -1429,14 +1429,14 @@ begin
   for i:=0 to length(pPAnzahlen^)-1 do
     pPAnzahlen^[i]:=0;
   b:=false;
-  hLen:=length(werte) div 2;
+  hLen:=params.tSiz div (1+byte(params.istKomplex));
   for imPart:=false to params.istKomplex do
     for j:=0 to wHoehe-1 do
       for i:=0 to wBreite-1 do begin
         xV:=min(params.xSteps-1,max(0,ceil((i+max(0,xPMi)-1/2)/xZ+xMi)));
         xB:=min(params.xSteps-1,max(0,ceil((i+max(0,xPMi)+1/2)/xZ+xMi-1)));
-        tV:=min(params.tSiz div (1+byte(params.istKomplex))-1,max(0,ceil((j-1/2)/yZ+tMi)))+byte(imPart)*hLen;
-        tB:=min(params.tSiz div (1+byte(params.istKomplex))-1,max(0,ceil((j+1/2)/yZ+tMi-1)))+byte(imPart)*hLen;
+        tV:=min(hLen-1,max(0,ceil((j-1/2)/yZ+tMi)))+byte(imPart)*hLen;
+        tB:=min(hLen-1,max(0,ceil((j+1/2)/yZ+tMi-1)))+byte(imPart)*hLen;
         if xV>xB then begin
           if (i>0) or (xPMi>0) then
             dec(xV)
-- 
cgit v1.2.3-70-g09d2