From 334e7114d8a84a0b2317e902a74ae2ca1f7d23df Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Mon, 29 Jan 2018 20:42:49 +0200 Subject: [PATCH] libpng: fixed linker error with atof(), which is inlined before Android-21 but is a proper function in later API --- project/jni/application/openttd/AndroidAppSettings.cfg | 4 ++-- project/jni/application/openttd/src | 2 +- project/jni/png/pngget.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index be5e2719a..50a74549c 100644 --- a/project/jni/application/openttd/AndroidAppSettings.cfg +++ b/project/jni/application/openttd/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="OpenTTD" AppFullName=org.openttd.sdl # Application version code (integer) -AppVersionCode=17274 +AppVersionCode=17275 # 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^...' # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src index bbeaad03e..71bc6bcc1 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit bbeaad03e4b470d0f114b252374c82942a1f1d07 +Subproject commit 71bc6bcc172abc83bfd53fcfc4f0e4052681f6b8 diff --git a/project/jni/png/pngget.c b/project/jni/png/pngget.c index 26e9fb1c3..85deb54c8 100644 --- a/project/jni/png/pngget.c +++ b/project/jni/png/pngget.c @@ -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 * are enabled. */ - *width = png_fixed(png_ptr, atof(info_ptr->scal_s_width), "sCAL width"); - *height = png_fixed(png_ptr, atof(info_ptr->scal_s_height), + *width = png_fixed(png_ptr, strtod(info_ptr->scal_s_width, NULL), "sCAL width"); + *height = png_fixed(png_ptr, strtod(info_ptr->scal_s_height, NULL), "sCAL height"); 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) { *unit = info_ptr->scal_unit; - *width = atof(info_ptr->scal_s_width); - *height = atof(info_ptr->scal_s_height); + *width = strtod(info_ptr->scal_s_width, NULL); + *height = strtod(info_ptr->scal_s_height, NULL); return (PNG_INFO_sCAL); }