Rationalise #undef-ing of ERROR.

[libdcp.git] / src / subtitle_image.h

diff --git a/src/subtitle_image.h b/src/subtitle_image.h
index 9d74d18c5d4e6289b93fc66b0fd00775d7ddf3be..ae733fe499e1ac2c4a4d7ea9d39f597388783fe3 100644 (file)
--- a/src/subtitle_image.h
+++ b/src/subtitle_image.h
@@ -42,7 +42,6 @@
 
 
 #include "array_data.h"
-#include "types.h"
 #include "subtitle.h"
 #include "dcp_time.h"
 #include <boost/optional.hpp>
@@ -66,6 +65,7 @@ public:
                HAlign h_align,
                float v_position,
                VAlign v_align,
+               float z_position,
                Time fade_up_time,
                Time fade_down_time
                );
@@ -79,6 +79,7 @@ public:
                HAlign h_align,
                float v_position,
                VAlign v_align,
+               float z_position,
                Time fade_up_time,
                Time fade_down_time
                );
@@ -103,7 +104,7 @@ public:
                return _file;
        }
 
-       bool equals(std::shared_ptr<const dcp::Subtitle> other_sub, EqualityOptions options, NoteHandler note) const override;
+       bool equals(std::shared_ptr<const dcp::Subtitle> other_sub, EqualityOptions const& options, NoteHandler note) const override;
 
 private:
        ArrayData _png_image;