Fixed bug 2758 - Android issues with NDK r10c and API-21

libsdl-org · Jun 17, 2015 · 58396c8 · 58396c8
1 parent 6e53615
commit 58396c8
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/external/libpng-1.6.2/pngget.c b/external/libpng-1.6.2/pngget.c
@@ -858,8 +858,9 @@ 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),
+      /* https://bugzilla.libsdl.org/show_bug.cgi?id=2758 : atof->strtod */
+      *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);
    }
@@ -877,8 +878,9 @@ png_get_sCAL(png_const_structrp png_ptr, png_const_inforp info_ptr,
        (info_ptr->valid & PNG_INFO_sCAL))
    {
       *unit = info_ptr->scal_unit;
-      *width = atof(info_ptr->scal_s_width);
-      *height = atof(info_ptr->scal_s_height);
+      /* https://bugzilla.libsdl.org/show_bug.cgi?id=2758 : atof->strtod */
+      *width = strtod(info_ptr->scal_s_width, NULL);
+      *height = strtod(info_ptr->scal_s_height, NULL);
       return (PNG_INFO_sCAL);
    }