X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage.h;h=46633df679d00b9f6eceee34be126711c0fd5d85;hb=d4826867a7ac80c06c1a28edb526c748ff3f015f;hp=4b059ff36fb8c7534d4559015409d282b5a50056;hpb=92784c9c28c48859578cd6e75aa01d5657d0c341;p=dcpomatic.git diff --git a/src/lib/image.h b/src/lib/image.h index 4b059ff36..46633df67 100644 --- a/src/lib/image.h +++ b/src/lib/image.h @@ -41,7 +41,7 @@ class Socket; class Image : public boost::enable_shared_from_this { public: - Image (AVPixelFormat p, dcp::Size s, bool aligned, int extra_pixels = 0); + Image (AVPixelFormat p, dcp::Size s, bool aligned); explicit Image (AVFrame *); explicit Image (Image const &); Image (boost::shared_ptr, bool); @@ -92,6 +92,7 @@ private: void allocate (); void swap (Image &); + void make_part_black (int x, int w); void yuv_16_black (uint16_t, bool); static uint16_t swap_16 (uint16_t); @@ -101,7 +102,6 @@ private: 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; }; extern PositionImage merge (std::list images);