summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorasanoaozora <fifitaneki@hotmail.com>2018-05-10 18:26:41 +0200
committerasanoaozora <fifitaneki@hotmail.com>2018-05-10 18:26:41 +0200
commit95468b727e3f6c2f5ddfed7e682a2e3e5edc81f4 (patch)
treebe9d17eb45366b4750149bda3dfe9f89f791f669
parentad9e3401bd6413f18b4d33f9f96d05c4c15f8ea3 (diff)
downloadpoi-service-95468b727e3f6c2f5ddfed7e682a2e3e5edc81f4.tar.gz
update navit version and fix issue on patch
-rw-r--r--src/navigation/patches/fsa_issue_padding.diff12
-rwxr-xr-xsrc/navigation/update_third_party.sh2
2 files changed, 8 insertions, 6 deletions
diff --git a/src/navigation/patches/fsa_issue_padding.diff b/src/navigation/patches/fsa_issue_padding.diff
index 666928c..a28345b 100644
--- a/src/navigation/patches/fsa_issue_padding.diff
+++ b/src/navigation/patches/fsa_issue_padding.diff
@@ -2,16 +2,18 @@ Index: navit/navit/navit.c
===================================================================
--- navit/navit.c (revision 5827)
+++ navit/navit.c (working copy)
-@@ -2353,10 +2353,12 @@ navit_get_cursor_pnt(struct navit *this_, struct point *p, int keep_orientation,
+@@ -2392,12 +2392,12 @@ navit_get_cursor_pnt(struct navit *this_, struct point *p, int keep_orientation,
+ offset = (max_offset - min_offset) / (max_offset_speed - min_offset_speed) * (nv->speed - min_offset_speed);
}
#endif
-
+-
+#if 0
if (this_->gra) {
padding = graphics_get_data(this_->gra, "padding");
} else
- dbg(lvl_warning, "cannot get padding: this->gra is NULL\n");
+ dbg(lvl_warning, "cannot get padding: this->gra is NULL");
+-
+#endif
-
transform_get_size(this_->trans, &width, &height);
- dbg(lvl_debug, "width=%d height=%d\n", width, height);
+ dbg(lvl_debug, "width=%d height=%d", width, height);
+
diff --git a/src/navigation/update_third_party.sh b/src/navigation/update_third_party.sh
index d8fc8b2..2304a76 100755
--- a/src/navigation/update_third_party.sh
+++ b/src/navigation/update_third_party.sh
@@ -1,7 +1,7 @@
#!/bin/bash
positioning_version='d4c46f13019aefb11aebd0fc1210a29a46f0b521'
-navit_version='91c5637b320469dda4c1d0ff2ef045359df22b6e'
+navit_version='03f3aa8637fff3e8e09d3bde21b28654454011fd'
echo "version of positioning is: $positioning_version"
echo "version of navit is: $navit_version"