Merge lp:~zorba-coders/zorba/bug-1158052-geo into lp:zorba/geo-module

[Paul J. Lucas]

Corresponding changes for bug #1158052.

Corresponding changes for bug #1158052.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Chris Hillery (ceejatec)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== modified file 'src/org/expath/ns/geo.xq.src/geo_functions.cpp'
--- src/org/expath/ns/geo.xq.src/geo_functions.cpp	2012-01-11 18:21:00 +0000
+++ src/org/expath/ns/geo.xq.src/geo_functions.cpp	2013-06-22 13:11:26 +0000
@@ -2870,7 +2870,11 @@
     binary_bin[i] = ((hex_to_bin(hex_str[i*2]) << 4) | hex_to_bin(hex_str[i*2+1]));
   }
 
-  zorba::Item base64_item = theModule->getItemFactory()->createBase64Binary(binary_bin, binary_len);
+  zorba::Item base64_item(
+    theModule->getItemFactory()->createBase64Binary(
+      reinterpret_cast<char const*>(binary_bin), binary_len, false
+    )
+  );
   delete[] binary_bin;
 
   return ItemSequence_t(new SingletonItemSequence(base64_item));
@@ -4504,4 +4508,6 @@
 }
 
 
-} /* namespace geomodule */ } /* namespace zorba */
+} /* namespace geomodule */
+} /* namespace zorba */
+/* vim:set et sw=2 ts=2: */