From ff8ac4e9a88ca67e8a34249fdfedfd08bd1f437c Mon Sep 17 00:00:00 2001 From: cxl Date: Mon, 13 May 2013 09:26:42 +0000 Subject: [PATCH] Draw: Fixed minor DrawImage issue git-svn-id: svn://ultimatepp.org/upp/trunk@6064 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Draw/Draw.cpp | 2 +- uppsrc/Draw/MakeCache.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/uppsrc/Draw/Draw.cpp b/uppsrc/Draw/Draw.cpp index a3feee101..d03f1efee 100644 --- a/uppsrc/Draw/Draw.cpp +++ b/uppsrc/Draw/Draw.cpp @@ -238,7 +238,7 @@ void Draw::DrawImage(int x, int y, const Image& img, const Rect& src, Color colo { if(IsNull(color)) return; Size sz = img.GetSize(); - DrawImageOp(x, y, sz.cx, sz.cy, img, src, color); + DrawImageOp(x, y, src.Width(), src.Height(), img, src, color); } void Draw::DrawImage(int x, int y, const Image& img, Color color) diff --git a/uppsrc/Draw/MakeCache.cpp b/uppsrc/Draw/MakeCache.cpp index 217b9b232..9744c323f 100644 --- a/uppsrc/Draw/MakeCache.cpp +++ b/uppsrc/Draw/MakeCache.cpp @@ -192,7 +192,6 @@ struct sCachedRescale : public ImageMaker virtual Image Make() const { return IsNull(filter) ? Rescale(img, sz, src) : RescaleFilter(img, sz, src, filter); } - }; Image CachedRescale(const Image& m, Size sz, const Rect& src, int filter)