From d3699d38ad310cd3d068ce86fa16046c63a05b41 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Thu, 29 Jul 2010 13:37:31 +0000
Subject: [PATCH] .Draw: CreateImage variant with RGBA

git-svn-id: svn://ultimatepp.org/upp/trunk@2578 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlLib/ArrayCtrl.cpp |  1 -
 uppsrc/Draw/ImageOp.cpp      | 10 +++++++---
 uppsrc/Draw/ImageOp.h        |  1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/uppsrc/CtrlLib/ArrayCtrl.cpp b/uppsrc/CtrlLib/ArrayCtrl.cpp
index 55af5b5ff..89eb16f5a 100644
--- a/uppsrc/CtrlLib/ArrayCtrl.cpp
+++ b/uppsrc/CtrlLib/ArrayCtrl.cpp
@@ -1272,7 +1272,6 @@ bool ArrayCtrl::SetCursor(int i)
 	return SetCursor0(i);
 }
 
-
 void ArrayCtrl::ShowAppendLine() {
 	sb.ScrollInto(GetTotalCy(), GetLineCy());
 }
diff --git a/uppsrc/Draw/ImageOp.cpp b/uppsrc/Draw/ImageOp.cpp
index 5c274487b..594f04d9d 100644
--- a/uppsrc/Draw/ImageOp.cpp
+++ b/uppsrc/Draw/ImageOp.cpp
@@ -19,14 +19,18 @@ Image WithHotSpot(const Image& m, int x1, int y1)
 	return b;
 }
 
-Image CreateImage(Size sz, Color color)
+Image CreateImage(Size sz, const RGBA& rgba)
 {
 	ImageBuffer ib(sz);
-	RGBA rgba = color;
-	memsetex(ib, &rgba, sizeof(RGBA), ib.GetLength());
+	Fill(~ib, rgba, ib.GetLength());
 	return ib;
 }
 
+Image CreateImage(Size sz, Color color)
+{
+	return CreateImage(sz, (RGBA)color);
+}
+
 Size DstSrc(ImageBuffer& dest, Point& p, const Image& src, Rect& sr)
 {
 	if(p.x < 0) {
diff --git a/uppsrc/Draw/ImageOp.h b/uppsrc/Draw/ImageOp.h
index 1b772c520..e099a5c68 100644
--- a/uppsrc/Draw/ImageOp.h
+++ b/uppsrc/Draw/ImageOp.h
@@ -1,3 +1,4 @@
+Image CreateImage(Size sz, const RGBA& rgba);
 Image CreateImage(Size sz, Color color);
 Image SetColorKeepAlpha(const Image& img, Color c);