projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidy up careful_string_filter and add some extra transliterations.
[dcpomatic.git]
/
src
/
lib
/
image_examiner.cc
diff --git
a/src/lib/image_examiner.cc
b/src/lib/image_examiner.cc
index acbf55696271daa84588b179debdb60bcae0e439..6e4dea7b7da6f1ddc104341f5a8c5bf415475578 100644
(file)
--- a/
src/lib/image_examiner.cc
+++ b/
src/lib/image_examiner.cc
@@
-19,16
+19,16
@@
*/
*/
-#include "image_content.h"
-#include "image_examiner.h"
-#include "film.h"
-#include "job.h"
-#include "exceptions.h"
+#include "compose.hpp"
#include "config.h"
#include "cross.h"
#include "config.h"
#include "cross.h"
-#include "
compose.hpp
"
+#include "
exceptions.h
"
#include "ffmpeg_image_proxy.h"
#include "ffmpeg_image_proxy.h"
+#include "film.h"
#include "image.h"
#include "image.h"
+#include "image_content.h"
+#include "image_examiner.h"
+#include "job.h"
#include <dcp/openjpeg_image.h>
#include <dcp/exceptions.h>
#include <dcp/j2k_transcode.h>
#include <dcp/openjpeg_image.h>
#include <dcp/exceptions.h>
#include <dcp/j2k_transcode.h>
@@
-39,8
+39,8
@@
using std::cout;
using std::list;
using std::cout;
using std::list;
-using std::sort;
using std::shared_ptr;
using std::shared_ptr;
+using std::sort;
using boost::optional;
using boost::optional;
@@
-51,23
+51,21
@@
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 {
} else {
- FFmpegImageProxy proxy(content->path(0)
, content->video->range()
);
- _video_size = proxy.image().image->size();
+ FFmpegImageProxy proxy(content->path(0));
+ _video_size = proxy.image(
Image::Alignment::COMPACT
).image->size();
}
if (content->still ()) {
}
if (content->still ()) {