projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
encoded_data.cc
diff --git
a/src/lib/encoded_data.cc
b/src/lib/encoded_data.cc
index fffc4d91f0b51d5c016d6a4e6f472a09d471b35f..61d2644daf324dd251861dbfe686ff93e514dc31 100644
(file)
--- a/
src/lib/encoded_data.cc
+++ b/
src/lib/encoded_data.cc
@@
-33,6
+33,13
@@
EncodedData::EncodedData (int s)
}
+EncodedData::EncodedData (uint8_t const * d, int s)
+ : _data (new uint8_t[s])
+ , _size (s)
+{
+ memcpy (_data, d, s);
+}
+
EncodedData::EncodedData (boost::filesystem::path file)
{
_size = boost::filesystem::file_size (file);