Cleanup: make things a little clearer.

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

diff --git a/src/lib/image.h b/src/lib/image.h
index 128b546b5cc7ac2a511e592fe98ae388d36556dd..0237b3d1b8fc259c793a695694e9c8a3a75ebdee 100644 (file)
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -25,18 +25,22 @@
 #ifndef DCPOMATIC_IMAGE_H
 #define DCPOMATIC_IMAGE_H
 
+
+#include "crop.h"
 #include "position.h"
 #include "position_image.h"
-#include "types.h"
+#include "video_range.h"
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
 #include <dcp/array_data.h>
 #include <dcp/colour_conversion.h>
 
+
 struct AVFrame;
 class Socket;
 
+
 class Image : public std::enable_shared_from_this<Image>
 {
 public:
@@ -95,10 +99,6 @@ public:
 
        size_t memory_used () const;
 
-       dcp::ArrayData as_png () const;
-
-       void png_error (char const * message);
-
        static std::shared_ptr<const Image> ensure_alignment (std::shared_ptr<const Image> image, Alignment alignment);
 
 private: