Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-03-26 10:09:46 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-04-18 19:11:40 (GMT) |
| commit | bb37c9f89e4135f3128fc98c23ea19eea945c4cd (patch) | |
| tree | 92e9504a27d6eaa8182bb0bab8a7556825a46ad7 /Swiften/FileTransfer/FileReadBytestream.cpp | |
| parent | 039636edc1b151431cba21a28986ff2be66b5349 (diff) | |
| download | swift-bb37c9f89e4135f3128fc98c23ea19eea945c4cd.zip swift-bb37c9f89e4135f3128fc98c23ea19eea945c4cd.tar.bz2 | |
Jingle refactoring.
Diffstat (limited to 'Swiften/FileTransfer/FileReadBytestream.cpp')
| -rw-r--r-- | Swiften/FileTransfer/FileReadBytestream.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/FileTransfer/FileReadBytestream.cpp b/Swiften/FileTransfer/FileReadBytestream.cpp index c08747b..e997366 100644 --- a/Swiften/FileTransfer/FileReadBytestream.cpp +++ b/Swiften/FileTransfer/FileReadBytestream.cpp @@ -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; } |