From 1cd273551b5a3247a2a1d6f5d9b195f2bcd1dbba Mon Sep 17 00:00:00 2001 From: Joogab Yun Date: Mon, 2 Sep 2019 15:55:59 +0900 Subject: [PATCH] Revert "[Tizen] Temporarily revert CameraActor behavior on zero size initialization" This reverts commit 3a93cf20e3de5969dd1b2af1fa254347b8d8e476. --- dali/internal/event/actors/camera-actor-impl.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dali/internal/event/actors/camera-actor-impl.cpp b/dali/internal/event/actors/camera-actor-impl.cpp index 2afd2eb..715781e 100644 --- a/dali/internal/event/actors/camera-actor-impl.cpp +++ b/dali/internal/event/actors/camera-actor-impl.cpp @@ -372,16 +372,16 @@ bool CameraActor::GetInvertYAxis() const void CameraActor::SetPerspectiveProjection( const Size& size ) { - float width = size.width; - float height = size.height; - if( ( size.width < Math::MACHINE_EPSILON_1000 ) || ( size.height < Math::MACHINE_EPSILON_1000 ) ) { - Size stageSize = Dali::Stage::GetCurrent().GetSize(); - width = stageSize.width; - height = stageSize.height; + // Not allowed to set the canvas size to be 0. + DALI_LOG_ERROR( "Canvas size can not be 0\n" ); + return; } + float width = size.width; + float height = size.height; + float nearClippingPlane; float farClippingPlane; float cameraZ; -- 2.7.4