[drape] rebase fixes

laralem · Nov 30, 2015 · 6bb2c18 · 6bb2c18
1 parent 5a2338b
commit 6bb2c18
Show file tree

Hide file tree

Showing 205 changed files with 785 additions and 22,002 deletions.
diff --git a/.gitignore b/.gitignore
@@ -77,6 +77,7 @@ bada/Maps/*.zip
 # data
 data/intermediate_data
 data/**/*.mwm
+data/**/*.offsets
 !data/World.mwm
 !data/WorldCoasts.mwm
 # temporary files for downloader

diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp
@@ -1321,8 +1321,7 @@ extern "C"
   JNIEXPORT void JNICALL
   Java_com_mapswithme_maps_Framework_nativeSetRouter(JNIEnv * env, jclass thiz, jint routerType)
   {
-    routing::RouterType const val = static_cast<routing::RouterType>(routerType);
-    android::Platform::RunOnGuiThreadImpl(bind(&android::Framework::SetRouter, g_framework, val));
+    g_framework->SetRouter(static_cast<routing::RouterType>(routerType));
   }
 
   JNIEXPORT jint JNICALL
@@ -1358,10 +1357,11 @@ extern "C"
   JNIEXPORT void JNICALL
   Java_com_mapswithme_maps_Framework_setWidgetPivot(JNIEnv * env, jclass thiz, jint widget, jint pivotX, jint pivotY)
   {
-    using WidgetType = InformationDisplay::WidgetType;
-    WidgetType const widgetType = static_cast<WidgetType>(widget);
-    m2::PointD const pivot = m2::PointD(pivotX, pivotY);
-    android::Platform::RunOnGuiThreadImpl(bind(&Framework::SetWidgetPivot, frm(), widgetType, pivot));
+//TODO (UVR)
+//    using WidgetType = InformationDisplay::WidgetType;
+//    WidgetType const widgetType = static_cast<WidgetType>(widget);
+//    m2::PointD const pivot = m2::PointD(pivotX, pivotY);
+//    android::Platform::RunOnGuiThreadImpl(bind(&Framework::SetWidgetPivot, frm(), widgetType, pivot));
   }
 
   JNIEXPORT void JNICALL

diff --git a/anim/angle_interpolation.cpp b/anim/angle_interpolation.cpp
diff --git a/anim/angle_interpolation.hpp b/anim/angle_interpolation.hpp
diff --git a/anim/anim.pro b/anim/anim.pro
diff --git a/anim/anyrect_interpolation.cpp b/anim/anyrect_interpolation.cpp
diff --git a/anim/anyrect_interpolation.hpp b/anim/anyrect_interpolation.hpp