projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "[Tizen] Restore Uploaded signal for BufferImage and ResourceImage"
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
event
/
images
/
buffer-image-impl.cpp
diff --git
a/dali/internal/event/images/buffer-image-impl.cpp
b/dali/internal/event/images/buffer-image-impl.cpp
index
a689537
..
68c0027
100644
(file)
--- a/
dali/internal/event/images/buffer-image-impl.cpp
+++ b/
dali/internal/event/images/buffer-image-impl.cpp
@@
-127,7
+127,7
@@
void BufferImage::Update( const RectArea& updateArea )
{
if ( !mTexture )
{
{
if ( !mTexture )
{
- mTexture =
New
Texture::New( Dali::TextureType::TEXTURE_2D, mPixelFormat, mWidth, mHeight );
+ mTexture = Texture::New( Dali::TextureType::TEXTURE_2D, mPixelFormat, mWidth, mHeight );
}
DALI_ASSERT_DEBUG( updateArea.x + updateArea.width <= mWidth && updateArea.y + updateArea.height <= mHeight );
UploadArea( updateArea );
}
DALI_ASSERT_DEBUG( updateArea.x + updateArea.width <= mWidth && updateArea.y + updateArea.height <= mHeight );
UploadArea( updateArea );
@@
-139,8
+139,8
@@
void BufferImage::UploadArea( const RectArea& area )
mBufferWidth = area.width ? area.width : mWidth;
uint32_t bufferHeight = area.height ? area.height : mHeight;
mBufferWidth = area.width ? area.width : mWidth;
uint32_t bufferHeight = area.height ? area.height : mHeight;
-
size
_t bufferSize = mBytesPerPixel * mBufferWidth * bufferHeight;
-
unsigned cha
r* buffer = reinterpret_cast< Dali::Integration::PixelBuffer* >( malloc( bufferSize ) );
+
uint32
_t bufferSize = mBytesPerPixel * mBufferWidth * bufferHeight;
+
Dali::Integration::PixelBuffe
r* buffer = reinterpret_cast< Dali::Integration::PixelBuffer* >( malloc( bufferSize ) );
DALI_ASSERT_DEBUG(buffer != 0);
// Are we uploading from an external or internal buffer ?
DALI_ASSERT_DEBUG(buffer != 0);
// Are we uploading from an external or internal buffer ?