projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix checking of frame channels vs stream channels.
[dcpomatic.git]
/
src
/
lib
/
image_examiner.cc
diff --git
a/src/lib/image_examiner.cc
b/src/lib/image_examiner.cc
index 2235c2e6994003e1c6deba869966d80647dc99e0..6e4dea7b7da6f1ddc104341f5a8c5bf415475578 100644
(file)
--- a/
src/lib/image_examiner.cc
+++ b/
src/lib/image_examiner.cc
@@
-51,20
+51,18
@@
ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const Imag
auto path = content->path(0);
if (valid_j2k_file (path)) {
auto size = boost::filesystem::file_size (path);
auto path = content->path(0);
if (valid_j2k_file (path)) {
auto size = boost::filesystem::file_size (path);
-
auto f = fopen_boost
(path, "rb");
+
dcp::File f
(path, "rb");
if (!f) {
throw FileError ("Could not open file for reading", path);
}
if (!f) {
throw FileError ("Could not open file for reading", path);
}
-
auto buffer = new uint8_t[size]
;
-
checked_fread (buffer, size, f, path
);
- f
close (f
);
+
std::vector<uint8_t> buffer(size)
;
+
f.checked_read(buffer.data(), size
);
+ f
.close(
);
try {
try {
- _video_size = dcp::decompress_j2k
(buffer, size, 0)->size
();
+ _video_size = dcp::decompress_j2k
(buffer.data(), size, 0)->size
();
} catch (dcp::ReadError& e) {
} catch (dcp::ReadError& e) {
- delete[] buffer;
throw DecodeError (String::compose (_("Could not decode JPEG2000 file %1 (%2)"), path, e.what ()));
}
throw DecodeError (String::compose (_("Could not decode JPEG2000 file %1 (%2)"), path, e.what ()));
}
- delete[] buffer;
} else {
FFmpegImageProxy proxy(content->path(0));
_video_size = proxy.image(Image::Alignment::COMPACT).image->size();
} else {
FFmpegImageProxy proxy(content->path(0));
_video_size = proxy.image(Image::Alignment::COMPACT).image->size();