← Back to branch summary

~zorba-coders/zorba/bug-1189996-image

« back to all changes in this revision

Viewing changes to src/com/zorba-xquery/www/modules/image/image_commons/image_function.cpp

  • Committer: Paul J. Lucas
  • Date: 2013-06-12 05:12:20 UTC
  • Revision ID: paul@lucasmail.org-20130612051220-tjwy8ecm9s3vyeef
Include file clean-up.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/com/zorba-xquery/www/modules/image/image_commons/image_function.cpp
15
15
 */
16
16
 
17
17
#include <sstream>
 
18
#include <Magick++.h>
 
19
 
18
20
#include <zorba/zorba.h>
19
 
#include <Magick++.h>
20
 
#include <zorba/base64.h>
21
21
#include <zorba/diagnostic_list.h>
22
 
#include <zorba/user_exception.h>
23
22
#include <zorba/empty_sequence.h>
24
23
#include <zorba/singleton_item_sequence.h>
 
24
#include <zorba/user_exception.h>
 
25
#include <zorba/util/base64_util.h>
 
26
 
25
27
#include "image_function.h"
26
28
#include "image_module.h"
27
29
 
254
256
    std::string lStringOfBlobContent((char *)aBlob.data(), aBlob.length());
255
257
    String lZorbaStringOfBlobContent(lStringOfBlobContent);
256
258
 
257
 
    return zorba::encoding::Base64::encode(lZorbaStringOfBlobContent);
 
259
    return zorba::base64::encode(lZorbaStringOfBlobContent);
258
260
}
259
261
 
260
262
String
324
326
  String lDecodedContent;
325
327
  if (aIsBase64)
326
328
  {
327
 
    lDecodedContent = zorba::encoding::Base64::decode(aString);
 
329
    lDecodedContent = zorba::base64::decode(aString);
328
330
  }
329
331
  else
330
332
  {