Method to check Bitmap boundary is modified by using the user specified bounds

Change-Id: I2990712af14d760418dade18330ec47d1b691bb7
Signed-off-by: Youngki Ahn <ykahn@samsung.com>

diff --git a/src/graphics/FGrp_BitmapImpl.cpp b/src/graphics/FGrp_BitmapImpl.cpp
index 996a93b..02c3826 100755 (executable)
--- a/src/graphics/FGrp_BitmapImpl.cpp
+++ b/src/graphics/FGrp_BitmapImpl.cpp
@@ -962,13 +962,13 @@ _BitmapImpl::Construct(const _CanvasImpl& canvas, const FloatRectangle& vcRectF)
        SysTryReturnResult(NID_GRP, &canvas, E_INVALID_ARG, "A canvas is invalid.");
        SysTryReturnResult(NID_GRP, canvas._pNativeCanvas && canvas._pNativeCanvas->IsValid(), E_INVALID_ARG, "A canvas is invalid.");
 
-       FloatRectangle rtCanvas = canvas.GetBoundsF();
+       FloatRectangle rtCanvasF = canvas.GetBoundsF();
 
-       SysTryReturnResult(NID_GRP, !rtCanvas.IsEmpty(), E_INVALID_ARG, "A canvas is empty.");
+       SysTryReturnResult(NID_GRP, !rtCanvasF.IsEmpty(), E_INVALID_ARG, "A canvas is empty.");
 
        SysTryReturnResult(NID_GRP, vcRectF.width > 0.0f && vcRectF.height > 0.0f, E_INVALID_ARG, "Both of width(%f) and height(%f) of a rectangle MUST be greater than 0.", vcRectF.width, vcRectF.height);
 
-       SysTryReturnResult(NID_GRP, _CheckValidity(vcRectF, rtCanvas), E_OUT_OF_RANGE, "The argument is out of range. (rect(x:%f,y:%f,w:%f,h:%f)).", vcRectF.x, vcRectF.y, vcRectF.width, vcRectF.height);
+       SysTryReturnResult(NID_GRP, _CheckValidity(vcRectF, rtCanvasF), E_OUT_OF_RANGE, "The argument is out of range. (rect(x:%f,y:%f,w:%f,h:%f)).", vcRectF.x, vcRectF.y, vcRectF.width, vcRectF.height);
 
        Tizen::Graphics::_Canvas* pCanvasEx = canvas._pNativeCanvas;
 
@@ -1000,9 +1000,9 @@ _BitmapImpl::Construct(const _BitmapImpl& bitmap, const FloatRectangle& vcRectF)
 
        SysTryReturnResult(NID_GRP, vcRectF.width > 0.0f && vcRectF.height > 0.0f, E_INVALID_ARG, "Both of width(%f) and height(%f) of a rectangle MUST be greater than 0.", vcRectF.width, vcRectF.height);
 
-       FloatRectangle rtBitmap(0, 0, bitmap.GetWidthF(), bitmap.GetHeightF());
+       FloatRectangle rtBitmapF(0, 0, bitmap.GetWidthF(), bitmap.GetHeightF());
 
-       SysTryReturnResult(NID_GRP, _CheckValidity(vcRectF, rtBitmap), E_OUT_OF_RANGE, "The argument is out of range. (rect(x:%f,y:%f,w:%f,h:%f)).", vcRectF.x, vcRectF.y, vcRectF.width, vcRectF.height);
+       SysTryReturnResult(NID_GRP, _CheckValidity(vcRectF, rtBitmapF), E_OUT_OF_RANGE, "The argument is out of range. (rect(x:%f,y:%f,w:%f,h:%f)).", vcRectF.x, vcRectF.y, vcRectF.width, vcRectF.height);
 
        _Bitmap* pSrcBitmapEx = Tizen::Graphics::_GetBitmapEx(bitmap);
 
@@ -1311,8 +1311,8 @@ _BitmapImpl::Merge(const FloatPoint& destVcPosF, const _BitmapImpl& srcBitmap, c
 
        _UpdateBitmapTimeStamp(*this);
 
-       FloatRectangle rtBitmap(0, 0, srcBitmap.GetActualWidth(), srcBitmap.GetActualHeight());
-       SysTryReturnResult(NID_GRP, _CheckValidity(srcVcRectF, rtBitmap), E_OUT_OF_RANGE, "The argument is out of range. (srcRect(x:%f,y:%f,w:%f,h:%f)).", srcVcRectF.x, srcVcRectF.y, srcVcRectF.width, srcVcRectF.height);
+       FloatRectangle rtBitmapF(0, 0, srcBitmap.GetWidthF(), srcBitmap.GetHeightF());
+       SysTryReturnResult(NID_GRP, _CheckValidity(srcVcRectF, rtBitmapF), E_OUT_OF_RANGE, "The argument is out of range. (srcRect(x:%f,y:%f,w:%f,h:%f)).", srcVcRectF.x, srcVcRectF.y, srcVcRectF.width, srcVcRectF.height);
 
        _Bitmap* pSrcBitmapEx = Tizen::Graphics::_GetBitmapEx(srcBitmap);
        _Bitmap* pDstBitmapEx = this->_sharedItem->nativeBitmap.get();

diff --git a/src/graphics/FGrp_CanvasImpl.cpp b/src/graphics/FGrp_CanvasImpl.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 169289e..b05fdd0
--- a/src/graphics/FGrp_CanvasImpl.cpp
+++ b/src/graphics/FGrp_CanvasImpl.cpp
@@ -1350,7 +1350,7 @@ _CanvasImpl::DrawBitmap(const FloatRectangle& vcDestRectF, const _BitmapImpl& sr
                return E_SUCCESS;
        }
 
-       if ((vcSrcRectF.x < 0.0f) || (vcSrcRectF.y < 0.0f) || (vcSrcRectF.x + vcSrcRectF.width > srcBitmap.GetActualWidth()) || (vcSrcRectF.y + vcSrcRectF.height > srcBitmap.GetActualHeight()))
+       if ((vcSrcRectF.x < 0.0f) || (vcSrcRectF.y < 0.0f) || (vcSrcRectF.x + vcSrcRectF.width > srcBitmap.GetWidthF()) || (vcSrcRectF.y + vcSrcRectF.height > srcBitmap.GetHeightF()))
        {
                SysTryReturnResult(NID_GRP, 0, E_OUT_OF_RANGE, "The specified region of source bitmap is out of range.");
        }