atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] android remove warning

Browse Source
This commit is contained in:
Edouard DUPIN 2014-06-01 18:21:46 +02:00
parent 8b4ea6f0cf
commit 7a1293c541
5 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sources/ewol/Dimension.h
View File

@ -65,7 +65,7 @@ namespace ewol {
/**
* @brief Destructor
*/
virtual ~Dimension();
~Dimension();
/**
* @brief string cast :

15
sources/ewol/compositing/Image.cpp
View File

@ -41,6 +41,7 @@ ewol::compositing::Image::~Image() {
void ewol::compositing::Image::loadProgram() {
// get the shader resource :
m_GLPosition = 0;
m_GLprogram.reset();
if (m_distanceFieldMode == true) {
m_GLprogram = ewol::resource::Program::keep("DATA:texturedDF.prog");
} else {
@ -246,24 +247,24 @@ void ewol::compositing::Image::printPart(const vec2& _size,
void ewol::compositing::Image::setSource(const std::string& _newFile, const vec2& _size) {
clear();
ewol::object::Shared<ewol::resource::TextureFile> resource = m_resource;
ewol::object::Shared<ewol::resource::ImageDF> resourceDF = m_resourceDF;
ewol::object::Shared<ewol::resource::TextureFile> resource(m_resource);
ewol::object::Shared<ewol::resource::ImageDF> resourceDF(m_resourceDF);
m_filename = _newFile;
m_requestSize = _size;
m_resource = nullptr;
m_resourceDF = nullptr;
m_resource.reset();
m_resourceDF.reset();
ivec2 tmpSize(_size.x(),_size.y());
// note that no image can be loaded...
if (_newFile != "") {
// link to new one
if (m_distanceFieldMode == false) {
m_resource = ewol::resource::TextureFile::keep(m_filename, tmpSize);
if (nullptr == m_resource) {
if (m_resource == nullptr) {
EWOL_ERROR("Can not get Image resource");
}
} else {
m_resourceDF = ewol::resource::ImageDF::keep(m_filename, tmpSize);
if (nullptr == m_resourceDF) {
if (m_resourceDF == nullptr) {
EWOL_ERROR("Can not get Image resource DF");
}
}
@ -282,7 +283,7 @@ void ewol::compositing::Image::setSource(const std::string& _newFile, const vec2
}
bool ewol::compositing::Image::hasSources() {
return (m_resource != nullptr || m_resourceDF != NULL);
return (m_resource != nullptr || m_resourceDF != nullptr);
}

4
sources/ewol/compositing/Shaper.cpp
View File

@ -57,6 +57,10 @@ ewol::compositing::Shaper::~Shaper() {
}
void ewol::compositing::Shaper::unLoadProgram() {
m_GLprogram.reset();
m_resourceTexture.reset();
m_config.reset();
m_colorProperty.reset();
for (size_t iii=0; iii<shaperPosCount; ++iii) {
m_confIdPaddingOut[iii] = -1;
m_confIdBorder[iii] = -1;

46
sources/ewol/context/Android/Context.cpp
View File

@ -665,7 +665,7 @@ extern "C" {
jint _mode,
jstring _myString) {
etk::AutoLockMutex myLock(g_interfaceMutex);
if( _id >= s_listInstance.size()
if( _id >= (int32_t)s_listInstance.size()
|| _id<0
|| nullptr == s_listInstance[_id] ) {
EWOL_ERROR("Call C With an incorrect instance _id=" << (int32_t)_id);
@ -716,7 +716,7 @@ extern "C" {
EWOL_DEBUG("*******************************************");
EWOL_DEBUG("** remove JVM Pointer **");
EWOL_DEBUG("*******************************************");
if( _id >= s_listInstance.size()
if( _id >= (int32_t)s_listInstance.size()
|| _id<0) {
EWOL_ERROR("Call C With an incorrect instance _id=" << (int32_t)_id);
return;
@ -732,7 +732,7 @@ extern "C" {
void Java_org_ewol_Ewol_EWtouchEvent(JNIEnv* _env, jobject _thiz, jint _id) {
etk::AutoLockMutex myLock(g_interfaceMutex);
EWOL_DEBUG(" == > Touch Event");
if( _id >= s_listInstance.size()
if( _id >= (int32_t)s_listInstance.size()
|| _id<0
|| nullptr == s_listInstance[_id] ) {
EWOL_ERROR("Call C With an incorrect instance _id=" << (int32_t)_id);
@ -747,7 +747,7 @@ extern "C" {
EWOL_DEBUG("*******************************************");
EWOL_DEBUG("** Activity on Create **");
EWOL_DEBUG("*******************************************");
if( _id >= s_listInstance.size()
if( _id >= (int32_t)s_listInstance.size()
|| _id<0
|| nullptr == s_listInstance[_id] ) {
EWOL_ERROR("Call C With an incorrect instance _id=" << (int32_t)_id);
@ -762,7 +762,7 @@ extern "C" {
EWOL_DEBUG("*******************************************");
EWOL_DEBUG("** Activity on Start **");
EWOL_DEBUG("*******************************************");
if( _id >= s_listInstance.size()
if( _id >= (int32_t)s_listInstance.size()
|| _id<0
|| nullptr == s_listInstance[_id] ) {
EWOL_ERROR("Call C With an incorrect instance _id=" << (int32_t)_id);
@ -776,7 +776,7 @@ extern "C" {
EWOL_DEBUG("*******************************************");
EWOL_DEBUG("** Activity on Re-Start **");
EWOL_DEBUG("*******************************************");
if( _id >= s_listInstance.size()
if( _id >= (int32_t)s_listInstance.size()
|| _id<0
|| nullptr == s_listInstance[_id] ) {
EWOL_ERROR("Call C With an incorrect instance _id=" << (int32_t)_id);
@ -789,7 +789,7 @@ extern "C" {
EWOL_DEBUG("*******************************************");
EWOL_DEBUG("** Activity on resume **");
EWOL_DEBUG("*******************************************");
if( _id >= s_listInstance.size()
if( _id >= (int32_t)s_listInstance.size()
|| _id<0
|| nullptr == s_listInstance[_id] ) {
EWOL_ERROR("Call C With an incorrect instance _id=" << (int32_t)_id);
@ -803,7 +803,7 @@ extern "C" {
EWOL_DEBUG("*******************************************");
EWOL_DEBUG("** Activity on pause **");
EWOL_DEBUG("*******************************************");
if( _id >= s_listInstance.size()
if( _id >= (int32_t)s_listInstance.size()
|| _id<0
|| nullptr == s_listInstance[_id] ) {
EWOL_ERROR("Call C With an incorrect instance _id=" << (int32_t)_id);
@ -819,7 +819,7 @@ extern "C" {
EWOL_DEBUG("*******************************************");
EWOL_DEBUG("** Activity on Stop **");
EWOL_DEBUG("*******************************************");
if( _id >= s_listInstance.size()
if( _id >= (int32_t)s_listInstance.size()
|| _id<0
|| nullptr == s_listInstance[_id] ) {
EWOL_ERROR("Call C With an incorrect instance _id=" << (int32_t)_id);
@ -833,7 +833,7 @@ extern "C" {
EWOL_DEBUG("*******************************************");
EWOL_DEBUG("** Activity on Destroy **");
EWOL_DEBUG("*******************************************");
if( _id >= s_listInstance.size()
if( _id >= (int32_t)s_listInstance.size()
|| _id<0
|| nullptr == s_listInstance[_id] ) {
EWOL_ERROR("Call C With an incorrect instance _id=" << (int32_t)_id);
@ -855,7 +855,7 @@ extern "C" {
jfloat _x,
jfloat _y) {
etk::AutoLockMutex myLock(g_interfaceMutex);
if( _id >= s_listInstance.size()
if( _id >= (int32_t)s_listInstance.size()
|| _id<0
|| nullptr == s_listInstance[_id] ) {
EWOL_ERROR("Call C With an incorrect instance _id=" << (int32_t)_id);
@ -873,7 +873,7 @@ extern "C" {
jfloat _x,
jfloat _y) {
etk::AutoLockMutex myLock(g_interfaceMutex);
if( _id >= s_listInstance.size()
if( _id >= (int32_t)s_listInstance.size()
|| _id<0
|| nullptr == s_listInstance[_id] ) {
EWOL_ERROR("Call C With an incorrect instance _id=" << (int32_t)_id);
@ -890,7 +890,7 @@ extern "C" {
jfloat _x,
jfloat _y) {
etk::AutoLockMutex myLock(g_interfaceMutex);
if( _id >= s_listInstance.size()
if( _id >= (int32_t)s_listInstance.size()
|| _id<0
|| nullptr == s_listInstance[_id] ) {
EWOL_ERROR("Call C With an incorrect instance _id=" << (int32_t)_id);
@ -908,7 +908,7 @@ extern "C" {
jfloat _x,
jfloat _y) {
etk::AutoLockMutex myLock(g_interfaceMutex);
if( _id >= s_listInstance.size()
if( _id >= (int32_t)s_listInstance.size()
|| _id<0
|| nullptr == s_listInstance[_id] ) {
EWOL_ERROR("Call C With an incorrect instance _id=" << (int32_t)_id);
@ -923,7 +923,7 @@ extern "C" {
jint _id,
jint _pointerID) {
etk::AutoLockMutex myLock(g_interfaceMutex);
if( _id >= s_listInstance.size()
if( _id >= (int32_t)s_listInstance.size()
|| _id<0
|| nullptr == s_listInstance[_id] ) {
EWOL_ERROR("Call C With an incorrect instance _id=" << (int32_t)_id);
@ -939,7 +939,7 @@ extern "C" {
jint _type,
jboolean _isdown) {
etk::AutoLockMutex myLock(g_interfaceMutex);
if( _id >= s_listInstance.size()
if( _id >= (int32_t)s_listInstance.size()
|| _id<0
|| nullptr == s_listInstance[_id] ) {
EWOL_ERROR("Call C With an incorrect instance _id=" << (int32_t)_id);
@ -956,7 +956,7 @@ extern "C" {
jint _uniChar,
jboolean _isdown) {
etk::AutoLockMutex myLock(g_interfaceMutex);
if( _id >= s_listInstance.size()
if( _id >= (int32_t)s_listInstance.size()
|| _id<0
|| nullptr == s_listInstance[_id] ) {
EWOL_ERROR("Call C With an incorrect instance _id=" << (int32_t)_id);
@ -973,7 +973,7 @@ extern "C" {
jfloat _ratioX,
jfloat _ratioY) {
etk::AutoLockMutex myLock(g_interfaceMutex);
if( _id >= s_listInstance.size()
if( _id >= (int32_t)s_listInstance.size()
|| _id<0
|| nullptr == s_listInstance[_id] ) {
EWOL_ERROR("Call C With an incorrect instance _id=" << (int32_t)_id);
@ -991,7 +991,7 @@ extern "C" {
jint _keyVal,
jboolean _isdown) {
etk::AutoLockMutex myLock(g_interfaceMutex);
if( _id >= s_listInstance.size()
if( _id >= (int32_t)s_listInstance.size()
|| _id<0
|| nullptr == s_listInstance[_id] ) {
EWOL_ERROR("Call C With an incorrect instance _id=" << (int32_t)_id);
@ -1035,7 +1035,7 @@ extern "C" {
jobject _thiz,
jint _id) {
etk::AutoLockMutex myLock(g_interfaceMutex);
if( _id >= s_listInstance.size()
if( _id >= (int32_t)s_listInstance.size()
|| _id<0
|| nullptr == s_listInstance[_id] ) {
EWOL_ERROR("Call C With an incorrect instance _id=" << (int32_t)_id);
@ -1050,7 +1050,7 @@ extern "C" {
jint _w,
jint _h) {
etk::AutoLockMutex myLock(g_interfaceMutex);
if( _id >= s_listInstance.size()
if( _id >= (int32_t)s_listInstance.size()
|| _id<0
|| nullptr == s_listInstance[_id] ) {
EWOL_ERROR("Call C With an incorrect instance _id=" << (int32_t)_id);
@ -1065,7 +1065,7 @@ extern "C" {
jobject _thiz,
jint _id) {
etk::AutoLockMutex myLock(g_interfaceMutex);
if( _id >= s_listInstance.size()
if( _id >= (int32_t)s_listInstance.size()
|| _id<0
|| nullptr == s_listInstance[_id] ) {
EWOL_ERROR("Call C With an incorrect instance _id=" << (int32_t)_id);
@ -1082,7 +1082,7 @@ extern "C" {
jint _frameRate,
jint _nbChannels) {
etk::AutoLockMutex myLock(g_interfaceAudioMutex);
if( _id >= s_listInstance.size()
if( _id >= (int32_t)s_listInstance.size()
|| _id<0
|| nullptr == s_listInstance[_id] ) {
EWOL_ERROR("Call C With an incorrect instance _id=" << (int32_t)_id);

1
sources/ewol/object/Manager.cpp
View File

@ -52,7 +52,6 @@ void ewol::object::Manager::unInit() {
}
removeAllRemovedObject();
EWOL_INFO(" remove missing user object");
size_t iii=0;
if (m_eObjectListActive.size() != 0) {
EWOL_ERROR("Have " << m_eObjectListActive.size() << " active Object");
}