Fix macOS build warning.

[libdcp.git] / src / mono_picture_asset.cc

diff --git a/src/mono_picture_asset.cc b/src/mono_picture_asset.cc
index 4524c85da5eadafa2b57af0ea0da1da337d4821f..78ab87098dc6c4c381201bff665e0b3c7500a027 100644 (file)
--- a/src/mono_picture_asset.cc
+++ b/src/mono_picture_asset.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -31,6 +31,12 @@
     files in the program, then also delete it here.
 */
 
+
+/** @file  src/mono_picture_asset.cc
+ *  @brief MonoPictureAsset class
+ */
+
+
 #include "mono_picture_asset.h"
 #include "mono_picture_asset_writer.h"
 #include "mono_picture_asset_reader.h"
@@ -41,65 +47,71 @@
 #include <asdcp/AS_DCP.h>
 #include <asdcp/KM_fileio.h>
 
+
 using std::string;
 using std::vector;
 using std::list;
 using std::pair;
 using std::shared_ptr;
 using std::dynamic_pointer_cast;
+using std::make_shared;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
 using namespace dcp;
 
+
 MonoPictureAsset::MonoPictureAsset (boost::filesystem::path file)
        : PictureAsset (file)
 {
        ASDCP::JP2K::MXFReader reader;
-       Kumu::Result_t r = reader.OpenRead (file.string().c_str());
-       if (ASDCP_FAILURE (r)) {
-               boost::throw_exception (MXFFileError ("could not open MXF file for reading", file.string(), r));
+       auto r = reader.OpenRead (file.string().c_str());
+       if (ASDCP_FAILURE(r)) {
+               boost::throw_exception (MXFFileError("could not open MXF file for reading", file.string(), r));
        }
 
        ASDCP::JP2K::PictureDescriptor desc;
-       if (ASDCP_FAILURE (reader.FillPictureDescriptor (desc))) {
-               boost::throw_exception (ReadError ("could not read video MXF information"));
+       if (ASDCP_FAILURE (reader.FillPictureDescriptor(desc))) {
+               boost::throw_exception (ReadError("could not read video MXF information"));
        }
 
        read_picture_descriptor (desc);
 
        ASDCP::WriterInfo info;
        if (ASDCP_FAILURE (reader.FillWriterInfo (info))) {
-               boost::throw_exception (ReadError ("could not read video MXF information"));
+               boost::throw_exception (ReadError("could not read video MXF information"));
        }
 
        _id = read_writer_info (info);
 }
 
+
 MonoPictureAsset::MonoPictureAsset (Fraction edit_rate, Standard standard)
        : PictureAsset (edit_rate, standard)
 {
 
 }
 
+
 static void
 storing_note_handler (list<pair<NoteType, string> >& notes, NoteType t, string s)
 {
        notes.push_back (make_pair (t, s));
 }
 
+
 bool
 MonoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, NoteHandler note) const
 {
-       if (!dynamic_pointer_cast<const MonoPictureAsset> (other)) {
+       if (!dynamic_pointer_cast<const MonoPictureAsset>(other)) {
                return false;
        }
 
        ASDCP::JP2K::MXFReader reader_A;
        DCP_ASSERT (_file);
-       Kumu::Result_t r = reader_A.OpenRead (_file->string().c_str());
-       if (ASDCP_FAILURE (r)) {
-               boost::throw_exception (MXFFileError ("could not open MXF file for reading", _file->string(), r));
+       auto r = reader_A.OpenRead (_file->string().c_str());
+       if (ASDCP_FAILURE(r)) {
+               boost::throw_exception (MXFFileError("could not open MXF file for reading", _file->string(), r));
        }
 
        ASDCP::JP2K::MXFReader reader_B;
@@ -122,13 +134,13 @@ MonoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, No
                return false;
        }
 
-       shared_ptr<const MonoPictureAsset> other_picture = dynamic_pointer_cast<const MonoPictureAsset> (other);
+       auto other_picture = dynamic_pointer_cast<const MonoPictureAsset> (other);
        DCP_ASSERT (other_picture);
 
        bool result = true;
 
-       shared_ptr<MonoPictureAssetReader> reader = start_read ();
-       shared_ptr<MonoPictureAssetReader> other_reader = other_picture->start_read ();
+       auto reader = start_read ();
+       auto other_reader = other_picture->start_read ();
 
 #ifdef LIBDCP_OPENMP
 #pragma omp parallel for
@@ -141,8 +153,8 @@ MonoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, No
 
                if (result || opt.keep_going) {
 
-                       shared_ptr<const MonoPictureFrame> frame_A = reader->get_frame (i);
-                       shared_ptr<const MonoPictureFrame> frame_B = other_reader->get_frame (i);
+                       auto frame_A = reader->get_frame (i);
+                       auto frame_B = other_reader->get_frame (i);
 
                        list<pair<NoteType, string> > notes;
 
@@ -159,8 +171,8 @@ MonoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, No
 #endif
                        {
                                note (NoteType::PROGRESS, String::compose("Compared video frame %1 of %2", i, _intrinsic_duration));
-                               for (list<pair<NoteType, string> >::const_iterator i = notes.begin(); i != notes.end(); ++i) {
-                                       note (i->first, i->second);
+                               for (auto const& i: notes) {
+                                       note (i.first, i.second);
                                }
                        }
                }
@@ -169,17 +181,20 @@ MonoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, No
        return result;
 }
 
+
 shared_ptr<PictureAssetWriter>
 MonoPictureAsset::start_write (boost::filesystem::path file, bool overwrite)
 {
-       /* XXX: can't we use shared_ptr here? */
-       return shared_ptr<MonoPictureAssetWriter> (new MonoPictureAssetWriter (this, file, overwrite));
+       /* Can't use make_shared here as the MonoPictureAssetWriter constructor is private */
+       return shared_ptr<MonoPictureAssetWriter>(new MonoPictureAssetWriter(this, file, overwrite));
 }
 
 shared_ptr<MonoPictureAssetReader>
 MonoPictureAsset::start_read () const
 {
-       return shared_ptr<MonoPictureAssetReader> (new MonoPictureAssetReader (this, key(), standard()));
+       /* Can't use make_shared here as the MonoPictureAssetReader constructor is private */
+       return shared_ptr<MonoPictureAssetReader>(new MonoPictureAssetReader(this, key(), standard()));
+
 }
 
 string