Simplify use of Image hierarchy a bit.

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

diff --git a/src/lib/image.h b/src/lib/image.h
index 0161d2b01f9850b28f4deb47fc9a184e21f6b10f..970750719794fefad5280cb2996ece40c55b912e 100644 (file)
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -34,7 +34,7 @@ extern "C" {
 
 class Scaler;
 class RGBFrameImage;
-class PostProcessImage;
+class SimpleImage;
 
 /** @class Image
  *  @brief Parent class for wrappers of some image, in some format, that
@@ -65,8 +65,9 @@ public:
 
        int components () const;
        int lines (int) const;
-       boost::shared_ptr<RGBFrameImage> scale_and_convert_to_rgb (Size, int, Scaler const *) const;
-       boost::shared_ptr<PostProcessImage> post_process (std::string) const;
+       boost::shared_ptr<Image> scale_and_convert_to_rgb (Size, int, Scaler const *) const;
+       boost::shared_ptr<Image> scale (Size, Scaler const *) const;
+       boost::shared_ptr<Image> post_process (std::string) const;
        
        void make_black ();
        
@@ -108,8 +109,6 @@ public:
        int * line_size () const;
        Size size () const;
        
-       void set_line_size (int, int);
-
 private:
        Size _size; ///< size in pixels
        uint8_t** _data; ///< array of pointers to components
@@ -138,23 +137,4 @@ private:
        uint8_t* _data;
 };
 
-/** @class PostProcessImage
- *  @brief An image that is the result of an FFmpeg post-processing run.
- */
-class PostProcessImage : public Image
-{
-public:
-       PostProcessImage (PixelFormat, Size);
-       ~PostProcessImage ();
-
-       uint8_t ** data () const;
-       int * line_size () const;
-       Size size () const;
-
-private:
-       Size _size;
-       uint8_t** _data;
-       int* _line_size;
-};
-
 #endif