Various stuff; mostly change to decoder scaling and adding subtitle; scaling test.

[dcpomatic.git] / src / lib / image.h

diff --git a/src/lib/image.h b/src/lib/image.h
index 70dacfaee4bd9e4bcd24bdf8ba4241916b1941e4..f9bda7460327e62706ef2fa3a982c0b4efe478b3 100644 (file)
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -21,8 +21,8 @@
  *  @brief A set of classes to describe video images.
  */
 
-#ifndef DVDOMATIC_IMAGE_H
-#define DVDOMATIC_IMAGE_H
+#ifndef DCPOMATIC_IMAGE_H
+#define DCPOMATIC_IMAGE_H
 
 #include <string>
 #include <boost/shared_ptr.hpp>
@@ -71,10 +71,11 @@ public:
        int components () const;
        int lines (int) const;
 
-       boost::shared_ptr<Image> scale_and_convert_to_rgb (libdcp::Size out_size, int padding, Scaler const * scaler, bool aligned) const;
+       boost::shared_ptr<Image> scale_and_convert_to_rgb (libdcp::Size, Scaler const *, bool) const;
        boost::shared_ptr<Image> scale (libdcp::Size, Scaler const *, bool aligned) const;
        boost::shared_ptr<Image> post_process (std::string, bool aligned) const;
        void alpha_blend (boost::shared_ptr<const Image> image, Position pos);
+       void copy (boost::shared_ptr<const Image> image, Position pos);
        boost::shared_ptr<Image> crop (Crop c, bool aligned) const;
        
        void make_black ();