Missing finalize() in dcpdecryptmxf.

[libdcp.git] / src / subtitle_image.cc

diff --git a/src/subtitle_image.cc b/src/subtitle_image.cc
index e280e3921274351737725c4e25657819ca2a7fc7..b281d7541a2cea3dbbe61387ac3230d0a814e42e 100644 (file)
--- a/src/subtitle_image.cc
+++ b/src/subtitle_image.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -31,14 +31,22 @@
     files in the program, then also delete it here.
 */
 
+
+/** @file  src/subtitle_image.cc
+ *  @brief SubtitleImage class
+ */
+
+
 #include "subtitle_image.h"
 #include "util.h"
 
+
 using std::ostream;
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 using namespace dcp;
 
+
 SubtitleImage::SubtitleImage (
        ArrayData png_image,
        Time in,
@@ -57,6 +65,7 @@ SubtitleImage::SubtitleImage (
 
 }
 
+
 SubtitleImage::SubtitleImage (
        ArrayData png_image,
        string id,
@@ -76,6 +85,7 @@ SubtitleImage::SubtitleImage (
 
 }
 
+
 void
 SubtitleImage::read_png_file (boost::filesystem::path file)
 {
@@ -83,6 +93,7 @@ SubtitleImage::read_png_file (boost::filesystem::path file)
        _png_image = ArrayData (file);
 }
 
+
 void
 SubtitleImage::write_png_file (boost::filesystem::path file) const
 {
@@ -90,6 +101,7 @@ SubtitleImage::write_png_file (boost::filesystem::path file) const
        png_image().write (file);
 }
 
+
 bool
 dcp::operator== (SubtitleImage const & a, SubtitleImage const & b)
 {
@@ -107,26 +119,28 @@ dcp::operator== (SubtitleImage const & a, SubtitleImage const & b)
                );
 }
 
+
 bool
 dcp::operator!= (SubtitleImage const & a, SubtitleImage const & b)
 {
        return !(a == b);
 }
 
+
 bool
 SubtitleImage::equals (shared_ptr<SubtitleImage> other, EqualityOptions options, NoteHandler note)
 {
        if (png_image() != other->png_image()) {
-               note (DCP_ERROR, "subtitle image PNG data differs");
+               note (NoteType::ERROR, "subtitle image PNG data differs");
                if (options.export_differing_subtitles) {
                        string const base = "dcpdiff_subtitle_";
                        if (boost::filesystem::exists(base + "A.png")) {
-                               note (DCP_ERROR, "could not export subtitle as " + base + "A.png already exists");
+                               note (NoteType::ERROR, "could not export subtitle as " + base + "A.png already exists");
                        } else {
                                png_image().write(base + "A.png");
                        }
                        if (boost::filesystem::exists(base + "B.png")) {
-                               note (DCP_ERROR, "could not export subtitle as " + base + "B.png already exists");
+                               note (NoteType::ERROR, "could not export subtitle as " + base + "B.png already exists");
                        } else {
                                other->png_image().write(base + "B.png");
                        }
@@ -136,48 +150,49 @@ SubtitleImage::equals (shared_ptr<SubtitleImage> other, EqualityOptions options,
        }
 
        if (in() != other->in()) {
-               note (DCP_ERROR, "subtitle in times differ");
+               note (NoteType::ERROR, "subtitle in times differ");
                return false;
        }
 
        if (out() != other->out()) {
-               note (DCP_ERROR, "subtitle out times differ");
+               note (NoteType::ERROR, "subtitle out times differ");
                return false;
        }
 
        if (h_position() != other->h_position()) {
-               note (DCP_ERROR, "subtitle horizontal positions differ");
+               note (NoteType::ERROR, "subtitle horizontal positions differ");
                return false;
        }
 
        if (h_align() != other->h_align()) {
-               note (DCP_ERROR, "subtitle horizontal alignments differ");
+               note (NoteType::ERROR, "subtitle horizontal alignments differ");
                return false;
        }
 
        if (v_position() != other->v_position()) {
-               note (DCP_ERROR, "subtitle vertical positions differ");
+               note (NoteType::ERROR, "subtitle vertical positions differ");
                return false;
        }
 
        if (v_align() != other->v_align()) {
-               note (DCP_ERROR, "subtitle vertical alignments differ");
+               note (NoteType::ERROR, "subtitle vertical alignments differ");
                return false;
        }
 
        if (fade_up_time() != other->fade_up_time()) {
-               note (DCP_ERROR, "subtitle fade-up times differ");
+               note (NoteType::ERROR, "subtitle fade-up times differ");
                return false;
        }
 
        if (fade_down_time() != other->fade_down_time()) {
-               note (DCP_ERROR, "subtitle fade-down times differ");
+               note (NoteType::ERROR, "subtitle fade-down times differ");
                return false;
        }
 
        return true;
 }
 
+
 ostream&
 dcp::operator<< (ostream& s, SubtitleImage const & sub)
 {