projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op; fix GPL address and use the explicit-program-name version.
[dcpomatic.git]
/
src
/
lib
/
image_examiner.h
diff --git
a/src/lib/image_examiner.h
b/src/lib/image_examiner.h
index 6ae0422cbbd4477f8ac7878e05a2430b251711b0..281b002f33572c1708dfef7f42297d8b14c9a31e 100644
(file)
--- a/
src/lib/image_examiner.h
+++ b/
src/lib/image_examiner.h
@@
-1,28
+1,25
@@
/*
/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013
-2014
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
#include "video_examiner.h"
*/
#include "video_examiner.h"
-namespace Magick {
- class Image;
-}
-
class ImageContent;
class ImageExaminer : public VideoExaminer
class ImageContent;
class ImageExaminer : public VideoExaminer
@@
-30,15
+27,16
@@
class ImageExaminer : public VideoExaminer
public:
ImageExaminer (boost::shared_ptr<const Film>, boost::shared_ptr<const ImageContent>, boost::shared_ptr<Job>);
public:
ImageExaminer (boost::shared_ptr<const Film>, boost::shared_ptr<const ImageContent>, boost::shared_ptr<Job>);
-
float
video_frame_rate () const;
+
boost::optional<double>
video_frame_rate () const;
dcp::Size video_size () const;
dcp::Size video_size () const;
-
ContentTi
me video_length () const {
+
Fra
me video_length () const {
return _video_length;
}
return _video_length;
}
+ bool yuv () const;
private:
boost::weak_ptr<const Film> _film;
boost::shared_ptr<const ImageContent> _image_content;
boost::optional<dcp::Size> _video_size;
private:
boost::weak_ptr<const Film> _film;
boost::shared_ptr<const ImageContent> _image_content;
boost::optional<dcp::Size> _video_size;
-
ContentTi
me _video_length;
+
Fra
me _video_length;
};
};