No-op: remove all trailing whitespace.

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

diff --git a/src/lib/image.h b/src/lib/image.h
index 23b88dd7601066c022bb457f116b8c252c7be256..89cd98f7b281bd6cfe68a758e3b8ceb33625d3a9 100644 (file)
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -24,21 +24,21 @@
 #ifndef DCPOMATIC_IMAGE_H
 #define DCPOMATIC_IMAGE_H
 
-#include <string>
-#include <boost/shared_ptr.hpp>
-#include <boost/function.hpp>
+#include "position.h"
+#include "position_image.h"
+#include "types.h"
+#include <dcp/colour_conversion.h>
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavfilter/avfilter.h>
 }
-#include <dcp/image.h>
-#include "util.h"
-#include "position.h"
-#include "position_image.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/function.hpp>
+#include <string>
 
-class Scaler;
+class Socket;
 
-class Image : public dcp::Image
+class Image
 {
 public:
        Image (AVPixelFormat, dcp::Size, bool);
@@ -47,10 +47,10 @@ public:
        Image (boost::shared_ptr<const Image>, bool);
        Image& operator= (Image const &);
        ~Image ();
-       
-       uint8_t ** data () const;
+
+       uint8_t * const * data () const;
        int * line_size () const;
-       int * stride () const;
+       int const * stride () const;
        dcp::Size size () const;
        bool aligned () const;
 
@@ -58,32 +58,33 @@ public:
        int line_factor (int) const;
        int lines (int) const;
 
-       boost::shared_ptr<Image> scale (dcp::Size, Scaler const *, AVPixelFormat, bool aligned) const;
+       boost::shared_ptr<Image> scale (dcp::Size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat, bool aligned) const;
        boost::shared_ptr<Image> crop (Crop c, bool aligned) const;
+       boost::shared_ptr<Image> crop_scale_window (Crop c, dcp::Size, dcp::Size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat, bool aligned) const;
 
-       boost::shared_ptr<Image> crop_scale_window (Crop c, dcp::Size, dcp::Size, Scaler const *, AVPixelFormat, bool aligned) const;
-       
        void make_black ();
        void make_transparent ();
        void alpha_blend (boost::shared_ptr<const Image> image, Position<int> pos);
        void copy (boost::shared_ptr<const Image> image, Position<int> pos);
+       void fade (float);
 
        void read_from_socket (boost::shared_ptr<Socket>);
        void write_to_socket (boost::shared_ptr<Socket>) const;
-       
+
        AVPixelFormat pixel_format () const {
                return _pixel_format;
        }
 
 private:
-       friend class pixel_formats_test;
-       
+       friend struct pixel_formats_test;
+
        void allocate ();
        void swap (Image &);
        float bytes_per_pixel (int) const;
        void yuv_16_black (uint16_t, bool);
        static uint16_t swap_16 (uint16_t);
-       
+
+       dcp::Size _size;
        AVPixelFormat _pixel_format; ///< FFmpeg's way of describing the pixel format of this Image
        uint8_t** _data; ///< array of pointers to components
        int* _line_size; ///< array of sizes of the data in each line, in pixels (without any alignment padding bytes)
@@ -92,5 +93,6 @@ private:
 };
 
 extern PositionImage merge (std::list<PositionImage> images);
+extern bool operator== (Image const & a, Image const & b);
 
 #endif