projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "[4.0] When native image is destroyed, It call TriggerEventInterface callback."
[platform/core/uifw/dali-adaptor.git]
/
adaptors
/
tizen
/
native-image-source-impl-tizen.cpp
diff --git
a/adaptors/tizen/native-image-source-impl-tizen.cpp
b/adaptors/tizen/native-image-source-impl-tizen.cpp
index
e83af6c
..
3afb87b
100755
(executable)
--- a/
adaptors/tizen/native-image-source-impl-tizen.cpp
+++ b/
adaptors/tizen/native-image-source-impl-tizen.cpp
@@
-31,7
+31,6
@@
#include <render-surface.h>
// Allow this to be encoded and saved:
#include <render-surface.h>
// Allow this to be encoded and saved:
-#include <platform-abstractions/tizen/resource-loader/resource-loader.h>
#include <bitmap-saver.h>
namespace Dali
#include <bitmap-saver.h>
namespace Dali
@@
-248,7
+247,7
@@
bool NativeImageSource::GetPixels(std::vector<unsigned char>& pixbuf, unsigned&
{
cOffset = c*3;
offset = cOffset + r*stride;
{
cOffset = c*3;
offset = cOffset + r*stride;
- *(bufptr) = ptr[offset+2];
+ *(bufptr
+cOffset
) = ptr[offset+2];
*(bufptr+cOffset+1) = ptr[offset+1];
*(bufptr+cOffset+2) = ptr[offset];
}
*(bufptr+cOffset+1) = ptr[offset+1];
*(bufptr+cOffset+2) = ptr[offset];
}
@@
-268,7
+267,7
@@
bool NativeImageSource::GetPixels(std::vector<unsigned char>& pixbuf, unsigned&
{
cOffset = c*4;
offset = cOffset + r*stride;
{
cOffset = c*4;
offset = cOffset + r*stride;
- *(bufptr) = ptr[offset+3];
+ *(bufptr
+cOffset
) = ptr[offset+3];
*(bufptr+cOffset+1) = ptr[offset+2];
*(bufptr+cOffset+2) = ptr[offset+1];
*(bufptr+cOffset+3) = ptr[offset];
*(bufptr+cOffset+1) = ptr[offset+2];
*(bufptr+cOffset+2) = ptr[offset+1];
*(bufptr+cOffset+3) = ptr[offset];
@@
-278,11
+277,7
@@
bool NativeImageSource::GetPixels(std::vector<unsigned char>& pixbuf, unsigned&
}
default:
{
}
default:
{
- DALI_LOG_WARNING( "Tbm surface has unsupported pixel format.\n" );
-
- pixbuf.resize( 0 );
- width = 0;
- height = 0;
+ DALI_ASSERT_ALWAYS( 0 && "Tbm surface has unsupported pixel format.\n" );
return false;
}
return false;
}