projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(V8 Plugin) Use new Touch API
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-bitmap-loader.cpp
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-bitmap-loader.cpp
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-bitmap-loader.cpp
index
3acafbd
..
61cbe4d
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-bitmap-loader.cpp
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-bitmap-loader.cpp
@@
-68,12
+68,12
@@
public:
unsigned char* buffer = static_cast<unsigned char*>(malloc(bufferSize));
memset(buffer, 0, bufferSize);
unsigned char* buffer = static_cast<unsigned char*>(malloc(bufferSize));
memset(buffer, 0, bufferSize);
- mPixelData =
PixelData::New( buffer, mSize.GetWidth(), mSize.GetHeight(), Pixel::RGBA8888,
PixelData::FREE);
+ mPixelData =
Dali::PixelData::New( buffer, bufferSize, mSize.GetWidth(), mSize.GetHeight(), Pixel::RGBA8888, Dali::
PixelData::FREE);
sem_post( &mySemaphore );
}
sem_post( &mySemaphore );
}
-
PixelDataPtr
GetPixelData() const
+
Dali::PixelData
GetPixelData() const
{
return mPixelData;
}
{
return mPixelData;
}
@@
-98,7
+98,7
@@
public:
}
ImageDimensions mSize;
}
ImageDimensions mSize;
-
PixelDataPtr
mPixelData;
+
Dali::PixelData
mPixelData;
const std::string mUrl;
sem_t mySemaphore;
};
const std::string mUrl;
sem_t mySemaphore;
};
@@
-150,7
+150,7
@@
void Dali::BitmapLoader::Load()
{
GetImplementation(*this).Load();
}
{
GetImplementation(*this).Load();
}
-PixelData
Ptr
Dali::BitmapLoader::GetPixelData() const
+PixelData Dali::BitmapLoader::GetPixelData() const
{
return GetImplementation(*this).GetPixelData();
}
{
return GetImplementation(*this).GetPixelData();
}