zorba-coders team mailing list archive

["Paul J. Lucas" <paul@xxxxxxxxxxxxx>]

Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/new-base64-api-image into lp:zorba/image-module.

Commit message:
Using the new Base64 API.

Requested reviews:
  Paul J. Lucas (paul-lucas)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/new-base64-api-image/+merge/177676

Using the new Base64 API.
-- 
https://code.launchpad.net/~zorba-coders/zorba/new-base64-api-image/+merge/177676
Your team Zorba Coders is subscribed to branch lp:zorba/image-module.

=== modified file 'src/com/zorba-xquery/www/modules/image/image_commons/image_function.cpp'
--- src/com/zorba-xquery/www/modules/image/image_commons/image_function.cpp	2013-06-12 05:12:20 +0000
+++ src/com/zorba-xquery/www/modules/image/image_commons/image_function.cpp	2013-07-30 19:22:24 +0000
@@ -252,11 +252,9 @@
 
 String
 ImageFunction::getEncodedStringFromBlob(Magick::Blob& aBlob) {
-
-    std::string lStringOfBlobContent((char *)aBlob.data(), aBlob.length());
-    String lZorbaStringOfBlobContent(lStringOfBlobContent);
-
-    return zorba::base64::encode(lZorbaStringOfBlobContent);
+  String result;
+  base64::encode( aBlob.data(), aBlob.length(), &result );
+  return result;
 }
 
 String
@@ -326,7 +324,7 @@
   String lDecodedContent;
   if (aIsBase64)
   {
-    lDecodedContent = zorba::base64::decode(aString);
+    zorba::base64::decode(aString, &lDecodedContent);
   }
   else
   {