Merge lp:~zorba-coders/zorba/new-base64-api-read-pdf into lp:zorba/read-pdf-module

Proposed by Paul J. Lucas
Status: Merged
Approved by: Paul J. Lucas
Approved revision: 24
Merged at revision: 24
Proposed branch: lp:~zorba-coders/zorba/new-base64-api-read-pdf
Merge into: lp:zorba/read-pdf-module
Diff against target: 23 lines (+2/-3)
1 file modified
src/read-pdf.xq.src/read-pdf.cpp (+2/-3)
To merge this branch: bzr merge lp:~zorba-coders/zorba/new-base64-api-read-pdf
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
Paul J. Lucas Approve
Review via email: mp+177960@code.launchpad.net

Commit message

New Base64 API.

Description of the change

New Base64 API.

To post a comment you must log in.
Revision history for this message
Paul J. Lucas (paul-lucas) :
review: Approve
Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
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/read-pdf.xq.src/read-pdf.cpp'
2--- src/read-pdf.xq.src/read-pdf.cpp 2013-06-21 04:26:05 +0000
3+++ src/read-pdf.xq.src/read-pdf.cpp 2013-07-31 22:22:31 +0000
4@@ -392,7 +392,7 @@
5 {
6 String lTmpEncoded(lMsg, lSize);
7 // lTmpDecodedBuf is used to make sure lMsg is still alive during HMAC_Update
8- lTmpDecodedBuf = base64::decode(lTmpEncoded);
9+ base64::decode(lMsg, lSize, &lTmpDecodedBuf);
10 lMsg = lTmpDecodedBuf.c_str();
11 lSize = lTmpDecodedBuf.size();
12 }
13@@ -595,9 +595,8 @@
14 const char* lMsg = lItem.getBase64BinaryValue(lSize);
15 if (lItem.isEncoded())
16 {
17- String lTmpEncoded(lMsg, lSize);
18 // lTmpDecodedBuf is used to make sure lMsg is still alive during HMAC_Update
19- lTmpDecodedBuf = base64::decode(lTmpEncoded);
20+ base64::decode(lMsg, lSize, &lTmpDecodedBuf);
21 lMsg = lTmpDecodedBuf.c_str();
22 lSize = lTmpDecodedBuf.size();
23 }

Subscribers

People subscribed via source and target branches

to all changes: