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

Proposed by Paul J. Lucas on 2013-06-22
Status: Merged
Merged at revision: 43
Proposed branch: lp:~zorba-coders/zorba/bug-1158052-geo
Merge into: lp:zorba/geo-module
Diff against target: 24 lines (+8/-2)
1 file modified
src/org/expath/ns/geo.xq.src/geo_functions.cpp (+8/-2)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-1158052-geo
Reviewer Review Type Date Requested Status
Chris Hillery 2013-06-22 Approve on 2013-06-28
Paul J. Lucas Approve on 2013-06-22
Review via email: mp+170945@code.launchpad.net

Commit message

Corresponding changes for bug #1158052.

Description of the change

Corresponding changes for bug #1158052.

To post a comment you must log in.
Paul J. Lucas (paul-lucas) :
review: Approve
Chris Hillery (ceejatec) :
review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue succeeded - proposal merged!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/org/expath/ns/geo.xq.src/geo_functions.cpp'
2--- src/org/expath/ns/geo.xq.src/geo_functions.cpp 2012-01-11 18:21:00 +0000
3+++ src/org/expath/ns/geo.xq.src/geo_functions.cpp 2013-06-22 13:11:26 +0000
4@@ -2870,7 +2870,11 @@
5 binary_bin[i] = ((hex_to_bin(hex_str[i*2]) << 4) | hex_to_bin(hex_str[i*2+1]));
6 }
7
8- zorba::Item base64_item = theModule->getItemFactory()->createBase64Binary(binary_bin, binary_len);
9+ zorba::Item base64_item(
10+ theModule->getItemFactory()->createBase64Binary(
11+ reinterpret_cast<char const*>(binary_bin), binary_len, false
12+ )
13+ );
14 delete[] binary_bin;
15
16 return ItemSequence_t(new SingletonItemSequence(base64_item));
17@@ -4504,4 +4508,6 @@
18 }
19
20
21-} /* namespace geomodule */ } /* namespace zorba */
22+} /* namespace geomodule */
23+} /* namespace zorba */
24+/* vim:set et sw=2 ts=2: */

Subscribers

People subscribed via source and target branches

to all changes: