summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author <philippe colliot>2015-08-06 18:58:15 +0200
committer <philippe colliot>2015-08-06 18:58:15 +0200
commitaef525ee8944a3a331b9fc896eecba3dad66e45b (patch)
tree4447d23d7796e7aa040e4e538d2850182930c34a
parent712524b12130b4d906a72550b515226c08cc64b8 (diff)
downloadpoi-service-aef525ee8944a3a331b9fc896eecba3dad66e45b.tar.gz
Fix a path issue and a bracket
-rw-r--r--src/navigation/CMakeLists.txt2
-rw-r--r--src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/navigation/CMakeLists.txt b/src/navigation/CMakeLists.txt
index 8cf4773..31e50a0 100644
--- a/src/navigation/CMakeLists.txt
+++ b/src/navigation/CMakeLists.txt
@@ -54,7 +54,7 @@ set(API_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../api")
if(NOT ${YOCTO_CONFIG})
set(NAVIT_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/navit/navit/cmake")
- set(DBUS_GENERATED_INCLUDE_DIR_POSITIONING "${CMAKE_BINARY_DIR}/api") # this one is for positioning
+ set(DBUS_GENERATED_INCLUDE_DIR_POSITIONING "${CMAKE_CURRENT_BINARY_DIR}/api") # this one is for positioning
set(NAVIT_CONFIG_H_DIR "${CMAKE_CURRENT_BINARY_DIR}/navit/navit")
else()
set(NAVIT_CMAKE_DIR "${STAGING_LIBDIR}/navit/cmake")
diff --git a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
index fd1ed20..9d9fd86 100644
--- a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
+++ b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
@@ -1489,8 +1489,10 @@ MapViewerControlObj::MapViewerControlObj(MapViewerControl *mapviewercontrol, uin
if (ilm_surfaceCreate(nativehandle, MapViewSize._1, MapViewSize._2, ILM_PIXELFORMAT_RGBA_8888, &surfaceId) != ILM_SUCCESS) {
dbg(lvl_debug,"error on ilm_surfaceCreate\n");
}
+
if (ilm_surfaceSetSourceRectangle(surfaceId, 0, 0, MapViewSize._1, MapViewSize._2) != ILM_SUCCESS) {
dbg(lvl_debug,"error on ilm_surfaceSetSourceRectangle\n");
+ }
if (ilm_surfaceSetDestinationRectangle(surfaceId, 0, 0, MapViewSize._1, MapViewSize._2-FSA_VERTICAL_OFFSET) != ILM_SUCCESS) {
dbg(lvl_debug,"error on ilm_surfaceSetDestinationRectangle\n");