fix problems with drawing polyline and polygon on 64 bit OS

Change-Id: I1a1cb52e639e160a0a904ef4d5d70ebf7921de95

diff --git a/inc/engine/graphic/Bitmap.h b/inc/engine/graphic/Bitmap.h
index c6497fc3e974170865cdb9dc90c0be699c327dc9..07bbf77a03aa6f7dc4e27053dce5eda5a5086c06 100644 (file)
--- a/inc/engine/graphic/Bitmap.h
+++ b/inc/engine/graphic/Bitmap.h
@@ -61,7 +61,7 @@ private:
     unsigned char* buffer;
     pthread_mutex_t mutex;
 
-    void BitBlt(int xDest, int yDest, unsigned char *pSrcBuffer, int xSour, int ySour, int wSour, int hSour, int nPitch, unsigned long opacity = 255);
+    void BitBlt(int xDest, int yDest, unsigned char *pSrcBuffer, int xSour, int ySour, int wSour, int hSour, int nPitch, unsigned int opacity = 255);
 };
 
 TIZEN_MAPS_END_NAMESPACE

diff --git a/inc/engine/graphic/Canvas.h b/inc/engine/graphic/Canvas.h
index cb420c8e84baa4cbd3d6b1ade824049776d81953..6704ccfe1f1768ebf3f82838e44d9feab7adcc65 100644 (file)
--- a/inc/engine/graphic/Canvas.h
+++ b/inc/engine/graphic/Canvas.h
@@ -49,12 +49,12 @@ public:
 protected:
        void* _pNativeGfxEngine;
 private:
-       unsigned long __ComposeColor(unsigned long color32, int opacity);
-       void __SetColor(cairo_t* pCairo, unsigned long composedColor);
+       unsigned int __ComposeColor(unsigned int color32, int opacity);
+       void __SetColor(cairo_t* pCairo, unsigned int composedColor);
        void __SetLineStyle(cairo_t* pCairo, LineStyleType lineStyle);
 
-       unsigned long* __pBuffer;
-       unsigned long __fgColor;
+       unsigned int* __pBuffer;
+       unsigned int __fgColor;
        int __lineWidth;
        cairo_operator_t __cairo_operator;
        Color __fgColorNative;

diff --git a/lib/aarch64/libheremaps-engine.so.1 b/lib/aarch64/libheremaps-engine.so.1
index 4f081736fa34eeeadcf87ac4eaaa3e212e0cec05..08eda78ebb1a7cc3dcb9c3b843f7dfedc8d48ccf 120000 (symlink)
--- a/lib/aarch64/libheremaps-engine.so.1
+++ b/lib/aarch64/libheremaps-engine.so.1
@@ -1 +1 @@
-libheremaps-engine.so.1.0.6_28
\ No newline at end of file
+libheremaps-engine.so.1.0.6_29
\ No newline at end of file

diff --git a/lib/aarch64/libheremaps-engine.so.1.0.6_28 b/lib/aarch64/libheremaps-engine.so.1.0.6_28
deleted file mode 100755 (executable)
index bf237da..0000000
Binary files a/lib/aarch64/libheremaps-engine.so.1.0.6_28 and /dev/null differ

diff --git a/lib/aarch64/libheremaps-engine.so.1.0.6_29 b/lib/aarch64/libheremaps-engine.so.1.0.6_29
new file mode 100755 (executable)
index 0000000..a7cab15
Binary files /dev/null and b/lib/aarch64/libheremaps-engine.so.1.0.6_29 differ

diff --git a/lib/arm/libheremaps-engine.so.1 b/lib/arm/libheremaps-engine.so.1
index 4f081736fa34eeeadcf87ac4eaaa3e212e0cec05..08eda78ebb1a7cc3dcb9c3b843f7dfedc8d48ccf 120000 (symlink)
--- a/lib/arm/libheremaps-engine.so.1
+++ b/lib/arm/libheremaps-engine.so.1
@@ -1 +1 @@
-libheremaps-engine.so.1.0.6_28
\ No newline at end of file
+libheremaps-engine.so.1.0.6_29
\ No newline at end of file

diff --git a/lib/arm/libheremaps-engine.so.1.0.6_28 b/lib/arm/libheremaps-engine.so.1.0.6_28
deleted file mode 100755 (executable)
index aad4267..0000000
Binary files a/lib/arm/libheremaps-engine.so.1.0.6_28 and /dev/null differ

diff --git a/lib/arm/libheremaps-engine.so.1.0.6_29 b/lib/arm/libheremaps-engine.so.1.0.6_29
new file mode 100755 (executable)
index 0000000..8c31de2
Binary files /dev/null and b/lib/arm/libheremaps-engine.so.1.0.6_29 differ

diff --git a/lib/i586/libheremaps-engine.so.1 b/lib/i586/libheremaps-engine.so.1
index 4f081736fa34eeeadcf87ac4eaaa3e212e0cec05..08eda78ebb1a7cc3dcb9c3b843f7dfedc8d48ccf 120000 (symlink)
--- a/lib/i586/libheremaps-engine.so.1
+++ b/lib/i586/libheremaps-engine.so.1
@@ -1 +1 @@
-libheremaps-engine.so.1.0.6_28
\ No newline at end of file
+libheremaps-engine.so.1.0.6_29
\ No newline at end of file

diff --git a/lib/i586/libheremaps-engine.so.1.0.6_28 b/lib/i586/libheremaps-engine.so.1.0.6_28
deleted file mode 100755 (executable)
index 9fcd612..0000000
Binary files a/lib/i586/libheremaps-engine.so.1.0.6_28 and /dev/null differ

diff --git a/lib/i586/libheremaps-engine.so.1.0.6_29 b/lib/i586/libheremaps-engine.so.1.0.6_29
new file mode 100755 (executable)
index 0000000..a152c02
Binary files /dev/null and b/lib/i586/libheremaps-engine.so.1.0.6_29 differ

diff --git a/lib/x86_64/libheremaps-engine.so.1 b/lib/x86_64/libheremaps-engine.so.1
index 4f081736fa34eeeadcf87ac4eaaa3e212e0cec05..08eda78ebb1a7cc3dcb9c3b843f7dfedc8d48ccf 120000 (symlink)
--- a/lib/x86_64/libheremaps-engine.so.1
+++ b/lib/x86_64/libheremaps-engine.so.1
@@ -1 +1 @@
-libheremaps-engine.so.1.0.6_28
\ No newline at end of file
+libheremaps-engine.so.1.0.6_29
\ No newline at end of file

diff --git a/lib/x86_64/libheremaps-engine.so.1.0.6_28 b/lib/x86_64/libheremaps-engine.so.1.0.6_28
deleted file mode 100755 (executable)
index 9fdc97d..0000000
Binary files a/lib/x86_64/libheremaps-engine.so.1.0.6_28 and /dev/null differ

diff --git a/lib/x86_64/libheremaps-engine.so.1.0.6_29 b/lib/x86_64/libheremaps-engine.so.1.0.6_29
new file mode 100755 (executable)
index 0000000..38fdb49
Binary files /dev/null and b/lib/x86_64/libheremaps-engine.so.1.0.6_29 differ

diff --git a/maps-plugin-here.changes b/maps-plugin-here.changes
index b21a418427f57d217b3867081395ce3dbfa8c770..4c1afb843f906c7e6d047f4328f0e028fad350b5 100644 (file)
--- a/maps-plugin-here.changes
+++ b/maps-plugin-here.changes
@@ -1,3 +1,8 @@
+[Version]   maps-plugin-here_0.3.17
+[Date]      21 Feb 2017
+[Title]     fix problems with drawing polyline and polygon on 64 bit OS
+[Developer] Seechan Kim <cbible.kim@samsung.com>
+
 [Version]   maps-plugin-here_0.3.16
 [Date]      10 Feb 2017
 [Title]     add APIs to set and get scale of the whole map

diff --git a/packaging/maps-plugin-here.spec b/packaging/maps-plugin-here.spec
index 050e327e46843ebbc12487ec814737e684c5adb2..064355539c9d9c3431746ed15da1f417f18453d0 100644 (file)
--- a/packaging/maps-plugin-here.spec
+++ b/packaging/maps-plugin-here.spec
@@ -1,6 +1,6 @@
 Name:       maps-plugin-here
 Summary:    Tizen HERE Maps Plug-in Library
-Version:    0.3.16
+Version:    0.3.17
 Release:    1
 Group:      Location/Libraries
 License:    Apache-2.0 and HERE