diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2014-10-30 12:40:16 -0700 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2014-10-30 12:40:16 -0700 |
commit | 592ed57d09f8f0913dae195e6e867884d11a2327 (patch) | |
tree | 6dd3a1d4a027a40e525484de68a34c6754f291b3 /platform | |
parent | 3d6a87ab1b43e4f4712e5456ccf91bdcbc15bb7e (diff) | |
download | qtlocation-mapboxgl-592ed57d09f8f0913dae195e6e867884d11a2327.tar.gz |
use more modern libpng version instead of the system-provided one and fix compile errors
Diffstat (limited to 'platform')
-rw-r--r-- | platform/default/image.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/default/image.cpp b/platform/default/image.cpp index 5b1afec7aa..68d1786913 100644 --- a/platform/default/image.cpp +++ b/platform/default/image.cpp @@ -5,6 +5,7 @@ #include <cassert> #include <cstdlib> #include <stdexcept> +#include <cstring> namespace mbgl { @@ -73,7 +74,7 @@ void readCallback(png_structp png, png_bytep data, png_size_t length) { if (reader->pos + length > reader->length) { png_error(png, "Read Error"); } else { - memcpy(data, reader->data + reader->pos, length); + std::memcpy(data, reader->data + reader->pos, length); reader->pos += length; } } |