Remove the evas_object_image_data_set() in Canvas
authorhoonik.lee <hoonik.lee@samsung.com>
Tue, 21 May 2013 02:33:10 +0000 (11:33 +0900)
committerhoonik.lee <hoonik.lee@samsung.com>
Tue, 21 May 2013 02:33:10 +0000 (11:33 +0900)
Change-Id: I9a8beecf37baec79c717e76f245f9858c3fbad63
Signed-off-by: hoonik.lee <hoonik.lee@samsung.com>
src/graphics/FGrp_Canvas.cpp

index e6e49e2..86f8c17 100644 (file)
@@ -1615,16 +1615,8 @@ _Canvas::DrawBitmap(const _Util::Rectangle<double>& destRectD, const _Bitmap& sr
                {
                        if (!this->__useStableRenderer && srcBufferInfo.bitsPerPixel == 32 && (GetCompositeMode() != COMPOSITE_MODE_SRC_OVER || srcBitmap.__isPremultiplied))
                        {
-                               _Util::Rectangle<int> 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