summaryrefslogtreecommitdiffstats
path: root/src/io/base64stream.cpp
diff options
context:
space:
mode:
authorjtx <javier.arraiza@marker.es>2013-03-04 11:34:32 +0000
committerjtx <javier.arraiza@marker.es>2013-03-04 11:34:32 +0000
commitbac1d241af62679c8d1824c6162965699914c39c (patch)
treec2595c5fa5a11288ec3780e75f943480e19f86e1 /src/io/base64stream.cpp
parentUpdate from branch (diff)
parentUse ink_cairo_surface_filter when converting surfaces between linearRGB and s... (diff)
downloadinkscape-bac1d241af62679c8d1824c6162965699914c39c.tar.gz
inkscape-bac1d241af62679c8d1824c6162965699914c39c.zip
merge from master branch
(bzr r11950.3.5)
Diffstat (limited to 'src/io/base64stream.cpp')
-rw-r--r--src/io/base64stream.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/io/base64stream.cpp b/src/io/base64stream.cpp
index 42a6ba1e4..28c819347 100644
--- a/src/io/base64stream.cpp
+++ b/src/io/base64stream.cpp
@@ -290,12 +290,12 @@ void Base64OutputStream::putCh(int ch)
/**
* Writes the specified byte to this output stream.
*/
-void Base64OutputStream::put(gunichar ch)
+int Base64OutputStream::put(gunichar ch)
{
if (closed)
{
//probably throw an exception here
- return;
+ return -1;
}
outBuf <<= 8;
@@ -322,6 +322,7 @@ void Base64OutputStream::put(gunichar ch)
bitCount = 0;
outBuf = 0L;
}
+ return 1;
}