projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
df5fdd2
)
Merge "Remove Assert when NativeImageSource is reset" into devel/master
author
Seungho BAEK
<sbsh.baek@samsung.com>
Tue, 26 May 2020 23:28:36 +0000
(23:28 +0000)
committer
Gerrit Code Review
<gerrit@review>
Tue, 26 May 2020 23:28:36 +0000
(23:28 +0000)
dali/internal/system/common/capture-impl.cpp
patch
|
blob
|
history
diff --git
a/dali/internal/system/common/capture-impl.cpp
b/dali/internal/system/common/capture-impl.cpp
index
253a3fd
..
2836fb3
100644
(file)
--- a/
dali/internal/system/common/capture-impl.cpp
+++ b/
dali/internal/system/common/capture-impl.cpp
@@
-109,8
+109,6
@@
void Capture::Start( Dali::Actor source, const Dali::Vector2& size, const std::s
Dali::NativeImageSourcePtr Capture::GetNativeImageSource() const
{
- DALI_ASSERT_ALWAYS( mNativeImageSourcePtr && "mNativeImageSourcePtr is NULL.");
-
return mNativeImageSourcePtr;
}
@@
-133,8
+131,6
@@
void Capture::CreateNativeImageSource( const Vector2& size )
void Capture::DeleteNativeImageSource()
{
- DALI_ASSERT_ALWAYS(mNativeImageSourcePtr && "mNativeImageSource is NULL.");
-
mNativeImageSourcePtr.Reset();
}