[DEV] change the android directory

This commit is contained in:
Edouard DUPIN 2012-11-12 01:40:30 +01:00
parent 63b742b737
commit 141e3b98b0
10 changed files with 5 additions and 6 deletions

2
.gitmodules vendored
View File

@ -25,7 +25,7 @@
url = https://github.com/HeeroYui/libfreetype.git
[submodule "external/z/zlib"]
path = external/z/zlib
url = https://github.com/HeeroYui/glew.git
url = https://github.com/madler/zlib.git
[submodule "external/zip"]
path = external/zip
url = https://github.com/HeeroYui/libzip.git

2
build

@ -1 +1 @@
Subproject commit 858172d2c00fe72b1ec4c7ee458c07243d97eb0f
Subproject commit 606c90b3685e5be82c055e337f11f764f6be7d55

2
external/etk vendored

@ -1 +1 @@
Subproject commit c920396923f600e6f9b61780a00a0a18a69a7277
Subproject commit 381dad6f1acd5d420982dc50ab5f725d3c53472f

1
external/z/zlib vendored

@ -1 +0,0 @@
Subproject commit 471ea3cba3bf82e9b9351ea18b6744b06558082d

View File

@ -74,7 +74,7 @@ bool ewol::imagePNG::GenerateImage(etk::UString & inputFile, draw::Image & ouput
if (png_sig_cmp(header, 0, 8))
{
EWOL_ERROR("Invalid file :" << fileName);
return;
return false;
}
// PNG read setup
@ -118,7 +118,7 @@ bool ewol::imagePNG::GenerateImage(etk::UString & inputFile, draw::Image & ouput
png_set_strip_16(png_ptr);
if (png_get_color_type(png_ptr, info_ptr) != PNG_COLOR_TYPE_RGBA) {
EWOL_ERROR("Must be RGBA");
return;
return false;
}
draw::Color tmpColor(0,0,0,0);