Give a slightly better error whn trying to add a KDM using add-file (#1035).

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

diff --git a/src/lib/image.h b/src/lib/image.h
index c5fc3dd2db47d11af362cd757c6b38a12d33efe6..cdad28c20214ff38f71dcce743d19126ac2c36fa 100644 (file)
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -40,7 +40,7 @@ class Socket;
 class Image
 {
 public:
-       Image (AVPixelFormat, dcp::Size, bool, int extra_pixels = 0);
+       Image (AVPixelFormat p, dcp::Size s, bool aligned, int extra_pixels = 0);
        Image (AVFrame *);
        Image (Image const &);
        Image (boost::shared_ptr<const Image>, bool);
@@ -57,10 +57,10 @@ public:
        int line_factor (int) const;
        dcp::Size sample_size (int) const;
 
-       boost::shared_ptr<Image> scale (dcp::Size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat, bool aligned, bool fast) const;
+       boost::shared_ptr<Image> scale (dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, bool aligned, bool fast) const;
        boost::shared_ptr<Image> crop_scale_window (
-               Crop c, dcp::Size, dcp::Size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat, bool aligned, bool fast)
-               const;
+               Crop crop, dcp::Size inter_size, dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, bool aligned, bool fast
+               ) const;
 
        void make_black ();
        void make_transparent ();
@@ -87,8 +87,8 @@ private:
        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)
-       int* _stride; ///< array of strides for each line (including any alignment padding bytes)
+       int* _line_size; ///< array of sizes of the data in each line, in bytes (without any alignment padding bytes)
+       int* _stride; ///< array of strides for each line, in bytes (including any alignment padding bytes)
        bool _aligned;
        int _extra_pixels;
 };