#include "exceptions.h"
#include "config.h"
#include "cross.h"
+#include "compose.hpp"
#include <dcp/openjpeg_image.h>
#include <dcp/exceptions.h>
#include <Magick++.h>
: _film (film)
, _image_content (content)
{
-#ifdef DCPOMATIC_IMAGE_MAGICK
+#ifdef DCPOMATIC_IMAGE_MAGICK
using namespace MagickCore;
#endif
boost::filesystem::path path = content->path(0).string ();
if (valid_j2k_file (path)) {
boost::uintmax_t size = boost::filesystem::file_size (path);
- FILE* f = fopen_boost (path, "r");
+ FILE* f = fopen_boost (path, "rb");
if (!f) {
throw FileError ("Could not open file for reading", path);
}
}
if (content->still ()) {
- _video_length = Config::instance()->default_still_length() * video_frame_rate().get_value_or (24);
+ _video_length = Config::instance()->default_still_length() * video_frame_rate().get_value_or (film->video_frame_rate ());
} else {
_video_length = _image_content->number_of_paths ();
}
return _video_size.get ();
}
-optional<float>
+optional<double>
ImageExaminer::video_frame_rate () const
{
+ if (_image_content->has_own_video_frame_rate()) {
+ /* The content already knows what frame rate it should be */
+ return _image_content->video_frame_rate();
+ }
+
/* Don't know */
- return optional<float> ();
+ return optional<double> ();
}