X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage.h;h=fd5adb0762ea9071ce1cd831f7aba49c3bef0aab;hb=0f664dab81a835feebd5db92942413f91747481f;hp=84871aae2f86d118b18039adab2b9860e9f5598c;hpb=67a68bd971ebe1b35daa3f75873b4ccb53c00ba0;p=dcpomatic.git

diff --git a/src/lib/image.h b/src/lib/image.h
index 84871aae2..fd5adb076 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -54,8 +54,10 @@ public:
 	bool aligned () const;
 
 	int planes () const;
-	int line_factor (int) const;
+	int vertical_factor (int) const;
+	int horizontal_factor (int) const;
 	dcp::Size sample_size (int) const;
+	float bytes_per_pixel (int) 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 (
@@ -80,15 +82,14 @@ private:
 
 	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)
-	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;
 };