projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add some missing test stuff; split server discovery off into ServerFinder.
[dcpomatic.git]
/
src
/
lib
/
still_image_examiner.cc
diff --git
a/src/lib/still_image_examiner.cc
b/src/lib/still_image_examiner.cc
index 71357e5efa70058930b4e60046e3283953cd2557..5f45d63650bb33bbf6eb5d6883edbec2082611ff 100644
(file)
--- a/
src/lib/still_image_examiner.cc
+++ b/
src/lib/still_image_examiner.cc
@@
-33,7
+33,7
@@
StillImageExaminer::StillImageExaminer (shared_ptr<const Film> f, shared_ptr<con
, _film (f)
{
using namespace MagickCore;
, _film (f)
{
using namespace MagickCore;
- Magick::Image* image = new Magick::Image (_still_image_content->
file
().string());
+ Magick::Image* image = new Magick::Image (_still_image_content->
path
().string());
_video_size = libdcp::Size (image->columns(), image->rows());
delete image;
}
_video_size = libdcp::Size (image->columns(), image->rows());
delete image;
}
@@
-58,6
+58,6
@@
StillImageExaminer::video_frame_rate () const
return 24;
}
return 24;
}
- return f->
dcp_
video_frame_rate ();
+ return f->video_frame_rate ();
}
}