projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mostly-merge master.
[dcpomatic.git]
/
src
/
lib
/
image_examiner.cc
diff --git
a/src/lib/image_examiner.cc
b/src/lib/image_examiner.cc
index 17064fd45ce10b0827fdb5c6ffddce51c363ed4c..9ceb7b896515da1f983503d7aa2f0663319ef57a 100644
(file)
--- a/
src/lib/image_examiner.cc
+++ b/
src/lib/image_examiner.cc
@@
-36,24
+36,23
@@
using boost::shared_ptr;
using boost::lexical_cast;
using boost::bad_lexical_cast;
using boost::lexical_cast;
using boost::bad_lexical_cast;
-ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const ImageContent> content, shared_ptr<Job>
job
)
+ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const ImageContent> content, shared_ptr<Job>)
: _film (film)
, _image_content (content)
: _film (film)
, _image_content (content)
- , _video_length (0)
{
using namespace MagickCore;
Magick::Image* image = new Magick::Image (content->path(0).string());
{
using namespace MagickCore;
Magick::Image* image = new Magick::Image (content->path(0).string());
- _video_size =
lib
dcp::Size (image->columns(), image->rows());
+ _video_size = dcp::Size (image->columns(), image->rows());
delete image;
if (content->still ()) {
delete image;
if (content->still ()) {
- _video_length = Con
fig::instance()->default_still_length() * video_frame_rate(
);
+ _video_length = Con
tentTime::from_seconds (Config::instance()->default_still_length()
);
} else {
} else {
- _video_length =
_image_content->number_of_paths (
);
+ _video_length =
ContentTime (double (_image_content->number_of_paths ()) / video_frame_rate ()
);
}
}
}
}
-
lib
dcp::Size
+dcp::Size
ImageExaminer::video_size () const
{
return _video_size.get ();
ImageExaminer::video_size () const
{
return _video_size.get ();