From 1abb5d4c836ecf088b41bcf2b4b728625c80c6ce Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Thu, 23 Dec 2004 11:19:52 +0000
Subject: [PATCH] + Pmand->Pmmask, pmOr ->pmMerge

---
 fcl/image/ellipses.pp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/fcl/image/ellipses.pp b/fcl/image/ellipses.pp
index 51e8cb17ae..dcf3922f7a 100644
--- a/fcl/image/ellipses.pp
+++ b/fcl/image/ellipses.pp
@@ -366,8 +366,8 @@ var info : TEllipseInfo;
 begin
   with canv.pen do
     case mode of
-      pmAnd : MyPutPix := @PutPixelAnd;
-      pmOr : MyPutPix := @PutPixelOr;
+      pmMask : MyPutPix := @PutPixelAnd;
+      pmMerge : MyPutPix := @PutPixelOr;
       pmXor : MyPutPix := @PutPixelXor;
       else MyPutPix := @PutPixelCopy;
     end;
@@ -396,8 +396,8 @@ var infoOut, infoIn : TEllipseInfo;
 begin
   with canv.pen do
     case mode of
-      pmAnd : MyPutPix := @PutPixelAnd;
-      pmOr : MyPutPix := @PutPixelOr;
+      pmMask : MyPutPix := @PutPixelAnd;
+      pmMerge : MyPutPix := @PutPixelOr;
       pmXor : MyPutPix := @PutPixelXor;
       else MyPutPix := @PutPixelCopy;
     end;
@@ -441,8 +441,8 @@ var info : TEllipseInfo;
 begin
   with canv.pen do
     case mode of
-      pmAnd : MyPutPix := @PutPixelAnd;
-      pmOr : MyPutPix := @PutPixelOr;
+      pmMask : MyPutPix := @PutPixelAnd;
+      pmMerge : MyPutPix := @PutPixelOr;
       pmXor : MyPutPix := @PutPixelXor;
       else MyPutPix := @PutPixelCopy;
     end;