From: Matt Blair Date: Tue, 16 May 2017 23:16:13 +0000 (-0400) Subject: Update Tangram ES to 0.6.3 compiled for Tizen 4.0 with GCC 6.2 X-Git-Tag: submit/tizen/20170519.020232~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=35a8bb0b49ef54055cdec134202bb593551a564a;p=platform%2Fcore%2Flocation%2Fmaps-plugin-mapzen.git Update Tangram ES to 0.6.3 compiled for Tizen 4.0 with GCC 6.2 Tangram ES built from commit 2cacd0c6ec10e5e6c0b7d0147cdf5d3853e166d6 Change-Id: I6703f3602e5abe114c2486d4fe33cdd469bfb760 --- diff --git a/lib/aarch64/libtangram.so b/lib/aarch64/libtangram.so index edfa8fc..0a0559c 100755 Binary files a/lib/aarch64/libtangram.so and b/lib/aarch64/libtangram.so differ diff --git a/lib/arm/libtangram.so b/lib/arm/libtangram.so index 3673727..c81a33f 100755 Binary files a/lib/arm/libtangram.so and b/lib/arm/libtangram.so differ diff --git a/lib/i586/libtangram.so b/lib/i586/libtangram.so index 30fef8b..128dd35 100755 Binary files a/lib/i586/libtangram.so and b/lib/i586/libtangram.so differ diff --git a/lib/x86_64/libtangram.so b/lib/x86_64/libtangram.so index 6fcfdb1..93efedb 100755 Binary files a/lib/x86_64/libtangram.so and b/lib/x86_64/libtangram.so differ diff --git a/src/mapzen/tangram/platform.h b/src/mapzen/tangram/platform.h index 4f2c91b..6c8ccc8 100644 --- a/src/mapzen/tangram/platform.h +++ b/src/mapzen/tangram/platform.h @@ -6,8 +6,6 @@ namespace Tangram { -// Function type for a mapReady callback -using MapReady = std::function; // Function type for receiving data from a successful network request using UrlCallback = std::function&&)>; diff --git a/src/mapzen/tangram/platform_tizen.h b/src/mapzen/tangram/platform_tizen.h index 1b6fb14..b8a9b59 100644 --- a/src/mapzen/tangram/platform_tizen.h +++ b/src/mapzen/tangram/platform_tizen.h @@ -1,15 +1,3 @@ -#if 0 -#pragma once - -#include "platform.h" - -bool shouldRender(); - -void initUrlRequests(const char* proxyAddress); -void stopUrlRequests(); - -#endif - #pragma once #include "platform.h" @@ -18,8 +6,6 @@ void stopUrlRequests(); #include #include -typedef struct _FcConfig FcConfig; - namespace Tangram { void setEvasGlAPI(Evas_GL_API *glApi); @@ -56,10 +42,6 @@ protected: std::function m_renderCallbackFunction = nullptr; mutable bool m_update = false; - - mutable std::vector m_fallbackFonts; - mutable FcConfig* m_fcConfig = nullptr; - }; } // namespace Tangram diff --git a/src/mapzen/tangram/urlClient.h b/src/mapzen/tangram/urlClient.h index 1b48c47..0eb6cb3 100644 --- a/src/mapzen/tangram/urlClient.h +++ b/src/mapzen/tangram/urlClient.h @@ -27,7 +27,7 @@ public: bool canceled = false; }; - UrlClient(Options options); + UrlClient(const Options& options); ~UrlClient(); bool addRequest(const std::string& url, UrlCallback onComplete);