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 "Revert "[4.0] Exposing Exif Image metadata""
[platform/core/uifw/dali-adaptor.git]
/
platform-abstractions
/
tizen
/
image-loaders
/
loader-ico.cpp
diff --git
a/platform-abstractions/tizen/image-loaders/loader-ico.cpp
b/platform-abstractions/tizen/image-loaders/loader-ico.cpp
index
4a46931
..
5078e8c
100644
(file)
--- a/
platform-abstractions/tizen/image-loaders/loader-ico.cpp
+++ b/
platform-abstractions/tizen/image-loaders/loader-ico.cpp
@@
-56,12
+56,10
@@
// INTERNAL INCLUDES
#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
#include <dali/integration-api/debug.h>
-#include <
dali/integration-api/bitmap
.h>
+#include <
adaptors/devel-api/adaptor-framework/pixel-buffer
.h>
namespace Dali
{
namespace Dali
{
-using Integration::Bitmap;
-using Dali::Integration::PixelBuffer;
namespace TizenPlatform
{
namespace TizenPlatform
{
@@
-357,7
+355,7
@@
bool LoadIcoHeader( const ImageLoader::Input& input, unsigned int& width, unsign
return true;
}
return true;
}
-bool LoadBitmapFromIco( const ImageLoader::Input& input,
Integration::Bitmap
& bitmap )
+bool LoadBitmapFromIco( const ImageLoader::Input& input,
Dali::Devel::PixelBuffer
& bitmap )
{
IcoData chosen;
Dali::Vector<unsigned char> map;
{
IcoData chosen;
Dali::Vector<unsigned char> map;
@@
-380,7
+378,6
@@
bool LoadBitmapFromIco( const ImageLoader::Input& input, Integration::Bitmap& bi
int diff_size = 0;
unsigned int* pix;
int diff_size = 0;
unsigned int* pix;
- PixelBuffer* pixels = NULL;
size_t position = chosen.bmoffset;//22 == position
size_t position = chosen.bmoffset;//22 == position
@@
-664,7
+661,8
@@
bool LoadBitmapFromIco( const ImageLoader::Input& input, Integration::Bitmap& bi
}
}
}
}
- pixels = bitmap.GetPackedPixelsProfile()->ReserveBuffer( Pixel::RGBA8888, w, h );
+ bitmap = Dali::Devel::PixelBuffer::New(w, h, Pixel::Format::RGBA8888);
+ auto pixels = bitmap.GetBuffer();
memcpy( pixels, &surface[0], w * h * 4 );
return true;
memcpy( pixels, &surface[0], w * h * 4 );
return true;