From 3bcd5f0f65593e8ff8d55777adc2e4b3864b411f Mon Sep 17 00:00:00 2001 From: "hoonik.lee" Date: Tue, 21 May 2013 11:33:10 +0900 Subject: [PATCH] Remove the evas_object_image_data_set() in Canvas Change-Id: I9a8beecf37baec79c717e76f245f9858c3fbad63 Signed-off-by: hoonik.lee --- src/graphics/FGrp_Canvas.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/graphics/FGrp_Canvas.cpp b/src/graphics/FGrp_Canvas.cpp index e6e49e2..86f8c17 100644 --- a/src/graphics/FGrp_Canvas.cpp +++ b/src/graphics/FGrp_Canvas.cpp @@ -1615,16 +1615,8 @@ _Canvas::DrawBitmap(const _Util::Rectangle& destRectD, const _Bitmap& sr { if (!this->__useStableRenderer && srcBufferInfo.bitsPerPixel == 32 && (GetCompositeMode() != COMPOSITE_MODE_SRC_OVER || srcBitmap.__isPremultiplied)) { - _Util::Rectangle srcBounds = - { - int(Math::Floor(srcRectD.x)), - int(Math::Floor(srcRectD.y)), - int(Math::Ceiling(srcRectD.x + srcRectD.w) - Math::Floor(srcRectD.x)), - int(Math::Ceiling(srcRectD.y + srcRectD.h) - Math::Floor(srcRectD.y)) - }; - _Util::Pixmap srcImageUnclipped(srcBufferInfo.width, srcBufferInfo.height, srcBufferInfo.bitsPerPixel, srcBufferInfo.pPixels, srcBufferInfo.pitch); - _Util::Pixmap srcImage = srcImageUnclipped.GetSubBitmap(srcBounds.x, srcBounds.y, srcBounds.w, srcBounds.h); + _Util::Pixmap srcImage = srcImageUnclipped.GetSubBitmap(srcRect.x, srcRect.y, srcRect.w, srcRect.h); _ApplySrcBitmapAttrib(srcImage, srcBitmap, srcBitmap.__isOpaqueAllOver); _Util::Pixmap dstImageUnclipped(dstBufferInfo.width, dstBufferInfo.height, dstBufferInfo.bitsPerPixel, dstBufferInfo.pPixels, dstBufferInfo.pitch); @@ -3794,7 +3786,6 @@ _Canvas::Show() evas_object_image_pixels_dirty_set((Evas_Object*) this->__windowHandle, true); #else Evas_Object* pSourceObject = _GetWindowSourceObject(this->__windowHandle); - evas_object_image_data_set(pSourceObject, evas_object_image_data_get(pSourceObject, EINA_TRUE)); evas_object_image_data_update_add(pSourceObject, 0, 0, bufferWidth, bufferHeight); #endif @@ -3853,7 +3844,6 @@ _Canvas::Show(const Rectangle& rect) evas_object_image_data_update_add((Evas_Object*) this->__windowHandle, x1, y1, x2 - x1, y2 - y1); #else Evas_Object* pSourceObject = _GetWindowSourceObject(this->__windowHandle); - evas_object_image_data_set(pSourceObject, evas_object_image_data_get(pSourceObject, EINA_TRUE)); evas_object_image_data_update_add(pSourceObject, x1, y1, x2 - x1, y2 - y1); #endif -- 2.7.4