Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-09-30 18:46:42 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-09-30 18:46:42 (GMT) |
| commit | 1b255f6ba90847240b92126deb5ea0174ad269b0 (patch) | |
| tree | 9d56e647ebc35c0f0941d19a302b888c1185ce1c /Swiften/FileTransfer/ByteArrayReadBytestream.h | |
| parent | af976a75b5e1b504a340602659ef930109cd2c48 (diff) | |
| download | swift-1b255f6ba90847240b92126deb5ea0174ad269b0.zip swift-1b255f6ba90847240b92126deb5ea0174ad269b0.tar.bz2 | |
Avoid a copy when reading from a byte array.
Diffstat (limited to 'Swiften/FileTransfer/ByteArrayReadBytestream.h')
| -rw-r--r-- | Swiften/FileTransfer/ByteArrayReadBytestream.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Swiften/FileTransfer/ByteArrayReadBytestream.h b/Swiften/FileTransfer/ByteArrayReadBytestream.h index 6cbdef0..9311099 100644 --- a/Swiften/FileTransfer/ByteArrayReadBytestream.h +++ b/Swiften/FileTransfer/ByteArrayReadBytestream.h @@ -7,9 +7,11 @@ #pragma once #include <vector> +#include <boost/smart_ptr/make_shared.hpp> #include <Swiften/Base/Algorithm.h> #include <Swiften/FileTransfer/ReadBytestream.h> +#include <Swiften/Base/ByteArray.h> namespace Swift { class ByteArrayReadBytestream : public ReadBytestream { @@ -17,14 +19,14 @@ namespace Swift { ByteArrayReadBytestream(const std::vector<unsigned char>& data) : data(data), position(0), dataComplete(true) { } - virtual std::vector<unsigned char> read(size_t size) { + virtual boost::shared_ptr<ByteArray> read(size_t size) { size_t readSize = size; if (position + readSize > data.size()) { readSize = data.size() - position; } - std::vector<unsigned char> result(data.begin() + position, data.begin() + position + readSize); + boost::shared_ptr<ByteArray> result = boost::make_shared<ByteArray>(data.begin() + position, data.begin() + position + readSize); - onRead(result); + onRead(*result); position += readSize; return result; } |