diff options
Diffstat (limited to 'Swiften/FileTransfer/FileReadBytestream.cpp')
| -rw-r--r-- | Swiften/FileTransfer/FileReadBytestream.cpp | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/Swiften/FileTransfer/FileReadBytestream.cpp b/Swiften/FileTransfer/FileReadBytestream.cpp index c08747b..84d6490 100644 --- a/Swiften/FileTransfer/FileReadBytestream.cpp +++ b/Swiften/FileTransfer/FileReadBytestream.cpp @@ -7,7 +7,7 @@  #include <boost/filesystem/fstream.hpp>  #include <cassert> -#include "Swiften/FileTransfer/FileReadBytestream.h" +#include <Swiften/FileTransfer/FileReadBytestream.h>  namespace Swift { @@ -21,14 +21,14 @@ FileReadBytestream::~FileReadBytestream() {  	}  } -ByteArray FileReadBytestream::read(size_t size)  { +std::vector<unsigned char> FileReadBytestream::read(size_t size)  {  	if (!stream) {  		stream = new boost::filesystem::ifstream(file, std::ios_base::in|std::ios_base::binary);  	} -	ByteArray result; +	std::vector<unsigned char> result;  	result.resize(size);  	assert(stream->good()); -	stream->read(reinterpret_cast<char*>(result.getData()), size); +	stream->read(reinterpret_cast<char*>(&result[0]), size);  	result.resize(stream->gcount());  	return result;  } | 
 Swift
 Swift