Make terminate_threads() less likely to leave _threads containing invalid pointers.

[dcpomatic.git] / src / lib / image_examiner.cc

diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index 73d004d7f9571fafad9f601db9c5f1cb58700a90..775a69eebac4779b69226f7a8f408f9ad19d43c2 100644 (file)
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2013-2015 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.
 
-    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
-    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/>.
 
 */
 
@@ -25,9 +26,11 @@
 #include "config.h"
 #include "cross.h"
 #include "compose.hpp"
+#include "ffmpeg_image_proxy.h"
+#include "image.h"
 #include <dcp/openjpeg_image.h>
 #include <dcp/exceptions.h>
-#include <Magick++.h>
+#include <dcp/j2k.h>
 #include <iostream>
 
 #include "i18n.h"
@@ -42,9 +45,6 @@ ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const Imag
        : _film (film)
        , _image_content (content)
 {
-#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);
@@ -53,7 +53,7 @@ ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const Imag
                        throw FileError ("Could not open file for reading", path);
                }
                uint8_t* buffer = new uint8_t[size];
-               fread (buffer, 1, size, f);
+               checked_fread (buffer, size, f, path);
                fclose (f);
                try {
                        _video_size = dcp::decompress_j2k (buffer, size, 0)->size ();
@@ -63,9 +63,8 @@ ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const Imag
                }
                delete[] buffer;
        } else {
-               Magick::Image* image = new Magick::Image (content->path(0).string());
-               _video_size = dcp::Size (image->columns(), image->rows());
-               delete image;
+               FFmpegImageProxy proxy(content->path(0));
+               _video_size = proxy.image().first->size();
        }
 
        if (content->still ()) {
@@ -84,9 +83,9 @@ ImageExaminer::video_size () const
 optional<double>
 ImageExaminer::video_frame_rate () const
 {
-       if (_image_content->has_own_video_frame_rate()) {
+       if (_image_content->video_frame_rate()) {
                /* The content already knows what frame rate it should be */
-               return _image_content->video_frame_rate();
+               return _image_content->video_frame_rate().get();
        }
 
        /* Don't know */