generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-02-22 23:11:00 +01:00
Code Issues Projects Releases Wiki Activity

Revert "Base64Decoder drops 0x0d characters on windows"

Browse Source 
This reverts commit 79549f85ddddf6655c971eb3e12a9184808764c0.
This commit is contained in:
aleks-f 2012-12-20 20:05:10 -06:00
parent a4e781f487
commit 9a67596f00
7 changed files with 5 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Foundation/include/Poco/Platform.h
View File

@ -211,11 +211,6 @@
#endif
#if !defined(POCO_ARCH)
#error "Unknown or Unsupported Hardware Architecture."
#endif
#if defined(_MSC_VER)
#define POCO_COMPILER_MSVC
#elif defined(__clang__)
@ -244,8 +239,11 @@
#define POCO_COMPILER_IBM_XLC // IBM XL C++
#elif defined (__IBMCPP__) && defined(__COMPILER_VER__)
#define POCO_COMPILER_IBM_XLC_ZOS // IBM z/OS C++
#else
#error "Unknown or Unsupported Compiler."
#endif
#if !defined(POCO_ARCH)
#error "Unknown Hardware Architecture."
#endif

3
Foundation/src/Base32Decoder.cpp
View File

@ -171,9 +171,6 @@ Base32DecoderBuf* Base32DecoderIOS::rdbuf()
Base32Decoder::Base32Decoder(std::istream& istr): Base32DecoderIOS(istr), std::istream(&_buf)
{
#ifdef POCO_OS_FAMILY_WINDOWS
unsetf(std::ios_base::skipws);
#endif
}

3
Foundation/src/Base64Decoder.cpp
View File

@ -147,9 +147,6 @@ Base64DecoderBuf* Base64DecoderIOS::rdbuf()
Base64Decoder::Base64Decoder(std::istream& istr): Base64DecoderIOS(istr), std::istream(&_buf)
{
#ifdef POCO_OS_FAMILY_WINDOWS
unsetf(std::ios_base::skipws);
#endif
}

16
Foundation/testsuite/src/Base32Test.cpp
View File

@ -37,8 +37,6 @@
#include "Poco/Base32Decoder.h"
#include "Poco/Exception.h"
#include <sstream>
#include <iterator>
#include <algorithm>
using Poco::Base32Encoder;
@ -184,19 +182,6 @@ void Base32Test::testEncodeDecode()
}
void Base32Test::testDecodeCR()
{
std::istringstream input("BU======");
Poco::Base32Decoder decoder(input);
std::vector<Poco::UInt8> result;
typedef std::istream_iterator<Poco::UInt8> istream_iterator_type;
istream_iterator_type eos;
std::copy(istream_iterator_type(decoder), eos, std::back_inserter(result));
assert(1 == result.size());
assert(0x0d == result[0]);
}
void Base32Test::setUp()
{
}
@ -214,7 +199,6 @@ CppUnit::Test* Base32Test::suite()
CppUnit_addTest(pSuite, Base32Test, testEncoder);
CppUnit_addTest(pSuite, Base32Test, testDecoder);
CppUnit_addTest(pSuite, Base32Test, testEncodeDecode);
CppUnit_addTest(pSuite, Base32Test, testDecodeCR);
return pSuite;
}

1
Foundation/testsuite/src/Base32Test.h
View File

@ -49,7 +49,6 @@ public:
void testEncoder();
void testDecoder();
void testEncodeDecode();
void testDecodeCR();
void setUp();
void tearDown();

16
Foundation/testsuite/src/Base64Test.cpp
View File

@ -37,8 +37,6 @@
#include "Poco/Base64Decoder.h"
#include "Poco/Exception.h"
#include <sstream>
#include <iterator>
#include <algorithm>
using Poco::Base64Encoder;
@ -179,19 +177,6 @@ void Base64Test::testEncodeDecode()
}
void Base64Test::testDecodeCR()
{
std::istringstream input("DQ==");
Poco::Base64Decoder decoder(input);
std::vector<Poco::UInt8> result;
typedef std::istream_iterator<Poco::UInt8> istream_iterator_type;
istream_iterator_type eos;
std::copy(istream_iterator_type(decoder), eos, std::back_inserter(result));
assert(1 == result.size());
assert(0x0d == result[0]);
}
void Base64Test::setUp()
{
}
@ -209,7 +194,6 @@ CppUnit::Test* Base64Test::suite()
CppUnit_addTest(pSuite, Base64Test, testEncoder);
CppUnit_addTest(pSuite, Base64Test, testDecoder);
CppUnit_addTest(pSuite, Base64Test, testEncodeDecode);
CppUnit_addTest(pSuite, Base64Test, testDecodeCR);
return pSuite;
}

1
Foundation/testsuite/src/Base64Test.h
View File

@ -49,7 +49,6 @@ public:
void testEncoder();
void testDecoder();
void testEncodeDecode();
void testDecodeCR();
void setUp();
void tearDown();