miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpng: fixed linker error with atof(), which is inlined before Android-21 but is a proper function in later API

Browse Source
This commit is contained in:
Sergii Pylypenko
2018-01-29 20:42:49 +02:00
parent 49c47093c0
commit 334e7114d8
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
project/jni/application/openttd/AndroidAppSettings.cfg
View File

@@ -7,10 +7,10 @@ AppName="OpenTTD"
AppFullName=org.openttd.sdl AppFullName=org.openttd.sdl
# Application version code (integer) # Application version code (integer)
AppVersionCode=17274 AppVersionCode=17275
# Application user-visible version name (string) # Application user-visible version name (string)
AppVersionName="1.7.2.74" AppVersionName="1.7.2.75"
# Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...' # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...'
# If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu

2
project/jni/application/openttd/src

Submodule project/jni/application/openttd/src updated: bbeaad03e4...71bc6bcc17

8
project/jni/png/pngget.c
View File

@@ -928,8 +928,8 @@ png_get_sCAL_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
* if neither floating point APIs nor internal floating point arithmetic * if neither floating point APIs nor internal floating point arithmetic
* are enabled. * are enabled.
*/ */
*width = png_fixed(png_ptr, atof(info_ptr->scal_s_width), "sCAL width"); *width = png_fixed(png_ptr, strtod(info_ptr->scal_s_width, NULL), "sCAL width");
*height = png_fixed(png_ptr, atof(info_ptr->scal_s_height), *height = png_fixed(png_ptr, strtod(info_ptr->scal_s_height, NULL),
"sCAL height"); "sCAL height");
return (PNG_INFO_sCAL); return (PNG_INFO_sCAL);
} }
@@ -947,8 +947,8 @@ png_get_sCAL(png_const_structrp png_ptr, png_const_inforp info_ptr,
(info_ptr->valid & PNG_INFO_sCAL) != 0) (info_ptr->valid & PNG_INFO_sCAL) != 0)
{ {
*unit = info_ptr->scal_unit; *unit = info_ptr->scal_unit;
*width = atof(info_ptr->scal_s_width); *width = strtod(info_ptr->scal_s_width, NULL);
*height = atof(info_ptr->scal_s_height); *height = strtod(info_ptr->scal_s_height, NULL);
return (PNG_INFO_sCAL); return (PNG_INFO_sCAL);
} }