diff options
| author | Andrew Haines <andrewd207@aol.com> | 2010-08-15 09:22:59 -0400 |
|---|---|---|
| committer | Andrew Haines <andrewd207@aol.com> | 2010-08-15 09:22:59 -0400 |
| commit | 917a2daf4ff769ad27631e6c71a7b919c47e4ecb (patch) | |
| tree | c524983404bd70c97c17395995f962cdf41899cc /src/corelib/fpg_wuline.pas | |
| parent | 77245bbf79e8568ba143cd7654e8aba352253a81 (diff) | |
| parent | 59df247d7a5ff46cc8ac697526510b2ff6cbe5d2 (diff) | |
| download | fpGUI-917a2daf4ff769ad27631e6c71a7b919c47e4ecb.tar.xz | |
Merge branch 'master' of ssh://fpgui.git.sourceforge.net/gitroot/fpgui/fpgui
Diffstat (limited to 'src/corelib/fpg_wuline.pas')
| -rw-r--r-- | src/corelib/fpg_wuline.pas | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/fpg_wuline.pas b/src/corelib/fpg_wuline.pas index 1f159d08..cfed0a73 100644 --- a/src/corelib/fpg_wuline.pas +++ b/src/corelib/fpg_wuline.pas @@ -1,7 +1,7 @@ { - fpGUI - Free Pascal GUI Library + fpGUI - Free Pascal GUI Toolkit - Copyright (C) 2006 - 2008 See the file AUTHORS.txt, included in this + Copyright (C) 2006 - 2010 See the file AUTHORS.txt, included in this distribution, for details of the copyright. See the file COPYING.modifiedLGPL, included in this distribution, @@ -44,7 +44,7 @@ type // Blend a pixel with the current colour procedure AlphaBlendPixel(ACanvas: TfpgCanvas; X, Y: integer; R, G, B: word; ARatio: Double); var - LBack, LNew: TRGBTriple; + LBack, LNew: TFPColor; LMinusRatio: Double; begin if (X < 0) or (X > TCanvasHack(ACanvas).FWindow.Width - 1) or (Y < 0) or @@ -52,11 +52,11 @@ begin Exit; // clipping LMinusRatio := 1 - ARatio; - LBack := fpgColorToRGBTriple(ACanvas.Pixels[X, Y]); + LBack := fpgColorToFPColor(ACanvas.Pixels[X, Y]); LNew.Blue := round(B*ARatio + LBack.Blue*LMinusRatio); LNew.Green := round(G*ARatio + LBack.Green*LMinusRatio); LNew.Red := round(R*ARatio + LBack.Red*LMinusRatio); - ACanvas.Pixels[X, Y] := RGBTripleTofpgColor(LNew); + ACanvas.Pixels[X, Y] := FPColorTofpgColor(LNew); end; // Draw a anti-aliased line |