From 5723519be38287501aa4dd273a7ff907128b3407 Mon Sep 17 00:00:00 2001 From: Kris De Gussem Date: Mon, 11 Feb 2013 19:32:33 +0100 Subject: Dropped duplicate code for dom/io and io/ (Bug #1120585 ) (bzr r12118) --- src/io/base64stream.cpp | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'src/io/base64stream.cpp') diff --git a/src/io/base64stream.cpp b/src/io/base64stream.cpp index 0a28a8cc3..667487c35 100644 --- a/src/io/base64stream.cpp +++ b/src/io/base64stream.cpp @@ -5,18 +5,35 @@ * of Base64 data with a stream interface, hiding * the implementation from the user. * + * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html + * * Authors: - * Bob Jamison + + * Bob Jamison + * + * Copyright (C) 2006 Bob Jamison * - * Copyright (C) 2004 Inkscape.org + + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * Released under GNU GPL, read the file 'COPYING' for more information + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "base64stream.h" + namespace Inkscape { namespace IO -- cgit v1.2.3 From 1c481ecbd68f2d67985729941fb26fb4bff3c60a Mon Sep 17 00:00:00 2001 From: Kris De Gussem Date: Thu, 14 Feb 2013 07:55:49 +0100 Subject: fix warnings introduced in revision 12123 (bzr r12125) --- src/io/base64stream.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/io/base64stream.cpp') diff --git a/src/io/base64stream.cpp b/src/io/base64stream.cpp index 667487c35..42a6ba1e4 100644 --- a/src/io/base64stream.cpp +++ b/src/io/base64stream.cpp @@ -290,7 +290,7 @@ void Base64OutputStream::putCh(int ch) /** * Writes the specified byte to this output stream. */ -void Base64OutputStream::put(int ch) +void Base64OutputStream::put(gunichar ch) { if (closed) { -- cgit v1.2.3 From 1279e676eccb0b3786d21fd390e4965f78a003c1 Mon Sep 17 00:00:00 2001 From: Kris De Gussem Date: Sun, 3 Mar 2013 10:18:37 +0100 Subject: Preparation to merge /dom/io and /io code (bug #1120585 ) (bzr r12168) --- src/io/base64stream.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/io/base64stream.cpp') 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; } -- cgit v1.2.3