Revert "[4.0] Fix SVACE issues"

This reverts commit 20f3e124e28f6d61ad514ef1b40a335944f3d755.

Change-Id: I386c16a0aaf141835f82f6a24ab23a61b0c995d3

diff --git a/adaptors/common/video-player-impl.cpp b/adaptors/common/video-player-impl.cpp
index 50e3e6b..feab793 100644 (file)
--- a/adaptors/common/video-player-impl.cpp
+++ b/adaptors/common/video-player-impl.cpp
@@ -133,7 +133,7 @@ std::string VideoPlayer::GetUrl()
     return mPlugin->GetUrl();
   }
 
-  return std::string();
+  return std::string( NULL );
 }
 
 void VideoPlayer::SetLooping(bool looping)

diff --git a/adaptors/ecore/wayland/window-impl-ecore-wl.cpp b/adaptors/ecore/wayland/window-impl-ecore-wl.cpp
index 971be10..6f785d0 100644 (file)
--- a/adaptors/ecore/wayland/window-impl-ecore-wl.cpp
+++ b/adaptors/ecore/wayland/window-impl-ecore-wl.cpp
@@ -877,10 +877,7 @@ bool Window::IsVisible() const
 void Window::RotationDone( int orientation, int width, int height )
 {
   ECore::WindowRenderSurface* wlSurface( dynamic_cast< ECore::WindowRenderSurface * >( mSurface ) );
-  if( wlSurface )
-  {
-    wlSurface->RequestRotation( orientation, width, height );
-  }
+  wlSurface->RequestRotation( orientation, width, height );
 
   mAdaptor->SurfaceResizePrepare( Dali::Adaptor::SurfaceSize( width, height ) );
 
@@ -1464,10 +1461,7 @@ Dali::DevelWindow::WindowPosition Window::GetPosition()
 void Window::SetTransparency( bool transparent )
 {
   ECore::WindowRenderSurface* wlSurface( dynamic_cast< ECore::WindowRenderSurface * >( mSurface ) );
-  if( wlSurface )
-  {
-    wlSurface->SetTransparency( transparent );
-  }
+  wlSurface->SetTransparency( transparent );
 }
 
 } // Adaptor

diff --git a/platform-abstractions/portable/image-operations.cpp b/platform-abstractions/portable/image-operations.cpp
index e9a94cc..2c5da3b 100644 (file)
--- a/platform-abstractions/portable/image-operations.cpp
+++ b/platform-abstractions/portable/image-operations.cpp
@@ -475,7 +475,7 @@ ImageDimensions CalculateDesiredDimensions( unsigned int bitmapWidth, unsigned i
   // If both dimensions have values requested, use them both:
   if( requestedWidth != 0 && requestedHeight != 0 )
   {
-    if( requestedWidth <= maxSize && requestedHeight <= maxSize )
+    if( requestedWidth <= maxSize && requestedWidth <= maxSize )
     {
       return ImageDimensions( requestedWidth, requestedHeight );
     }

diff --git a/plugins/video-player/tizen-video-player.cpp b/plugins/video-player/tizen-video-player.cpp
index e11736e..f7baa50 100644 (file)
--- a/plugins/video-player/tizen-video-player.cpp
+++ b/plugins/video-player/tizen-video-player.cpp
@@ -209,18 +209,11 @@ void LogPlayerError( int error )
 } // unnamed namespace
 
 TizenVideoPlayer::TizenVideoPlayer()
-: mUrl(),
-  mPlayer( NULL ),
+: mPlayer( NULL ),
   mPlayerState( PLAYER_STATE_NONE ),
   mTbmSurface( NULL ),
   mPacket( NULL ),
-  mNativeImageSourcePtr( NULL ),
-  mTimer( NULL ),
-  mBackgroundColor( Vector4( 1.0f, 1.0f, 1.0f, 0.0f ) ),
   mTargetType( NativeImage ),
-  mPacketMutex(),
-  mPacketVector(),
-  mEcoreWlWindow( NULL ),
   mAlphaBitChanged( false )
 {
 }