From f356add031ddafbaacad9328a374f841974d4699 Mon Sep 17 00:00:00 2001 From: nickysn Date: Mon, 21 Jan 2019 15:46:34 +0000 Subject: [PATCH] * moved the s1,s2,s3 scanline memory allocation in FloodFill before changing CurrentColor, so it doesn't get changed if the function exits prematurely due to out of memory git-svn-id: trunk@40971 - --- packages/graph/src/inc/fills.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/graph/src/inc/fills.inc b/packages/graph/src/inc/fills.inc index 5a22eb1141..5c39405f1d 100644 --- a/packages/graph/src/inc/fills.inc +++ b/packages/graph/src/inc/fills.inc @@ -443,11 +443,6 @@ var exit; end; FillChar(DrawnList^,sizeof(PFloodLine)*((ViewHeight div YResDiv) + 1),0); - { init prevy } - prevy := 32767; - { Save current drawing color } - BackupColor := CurrentColor; - CurrentColor := FillSettings.Color; { MaxX is based on zero index } {$ifdef FPC_GRAPH_SUPPORTS_TRUECOLOR} if MaxColor > 65536 then @@ -468,6 +463,11 @@ var _GraphResult := grNoFloodMem; exit; end; + { init prevy } + prevy := 32767; + { Save current drawing color } + BackupColor := CurrentColor; + CurrentColor := FillSettings.Color; { Index of points to check } Buffer.WordIndex:=0; PushPoint (x,y);