Replace dcp::Data with dcp::ArrayData

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

diff --git a/src/lib/image.h b/src/lib/image.h
index 46633df679d00b9f6eceee34be126711c0fd5d85..ab9b3c78a40f4436527f077b2facd3cb98d883d7 100644 (file)
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -31,6 +31,7 @@
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
+#include <dcp/array_data.h>
 #include <dcp/colour_conversion.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
@@ -49,7 +50,9 @@ public:
        ~Image ();
 
        uint8_t * const * data () const;
+       /** @return array of sizes of the data in each line, in bytes (not including any alignment padding) */
        int const * line_size () const;
+       /** @return array of sizes of the data in each line, in bytes (including any alignment padding) */
        int const * stride () const;
        dcp::Size size () const;
        bool aligned () const;
@@ -81,7 +84,7 @@ public:
 
        size_t memory_used () const;
 
-       dcp::Data as_png () const;
+       dcp::ArrayData as_png () const;
 
        void png_error (char const * message);