From 27fac0b4c6d42cb3b47bc1240d50ce11923fb66a Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 14 Oct 2012 13:22:47 +0100
Subject: [PATCH] Simplify use of Image hierarchy a bit.

---
 src/lib/image.cc   | 12 ++++++------
 src/lib/image.h    |  4 ++--
 src/lib/server.cc  |  2 +-
 src/lib/subtitle.h |  6 +++---
 test/test.cc       |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/lib/image.cc b/src/lib/image.cc
index 98c5228a9..602b20842 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -88,7 +88,7 @@ Image::scale (Size out_size, Scaler const * scaler) const
 {
 	assert (scaler);
 
-	shared_ptr<SimpleImage> scaled (new SimpleImage (pixel_format(), out_size));
+	shared_ptr<Image> scaled (new SimpleImage (pixel_format(), out_size));
 
 	struct SwsContext* scale_context = sws_getContext (
 		size().width, size().height, pixel_format(),
@@ -112,7 +112,7 @@ Image::scale (Size out_size, Scaler const * scaler) const
  *  @param out_size Output image size in pixels.
  *  @param scaler Scaler to use.
  */
-shared_ptr<RGBFrameImage>
+shared_ptr<Image>
 Image::scale_and_convert_to_rgb (Size out_size, int padding, Scaler const * scaler) const
 {
 	assert (scaler);
@@ -120,7 +120,7 @@ Image::scale_and_convert_to_rgb (Size out_size, int padding, Scaler const * scal
 	Size content_size = out_size;
 	content_size.width -= (padding * 2);
 
-	shared_ptr<RGBFrameImage> rgb (new RGBFrameImage (content_size));
+	shared_ptr<Image> rgb (new SimpleImage (PIX_FMT_RGB24, content_size));
 
 	struct SwsContext* scale_context = sws_getContext (
 		size().width, size().height, pixel_format(),
@@ -141,7 +141,7 @@ Image::scale_and_convert_to_rgb (Size out_size, int padding, Scaler const * scal
 	   scheme of things.
 	*/
 	if (padding > 0) {
-		shared_ptr<RGBFrameImage> padded_rgb (new RGBFrameImage (out_size));
+		shared_ptr<Image> padded_rgb (new SimpleImage (PIX_FMT_RGB24, out_size));
 		padded_rgb->make_black ();
 
 		/* XXX: we are cheating a bit here; we know the frame is RGB so we can
@@ -167,10 +167,10 @@ Image::scale_and_convert_to_rgb (Size out_size, int padding, Scaler const * scal
  *  @param pp Flags for the required set of post processes.
  *  @return Post-processed image.
  */
-shared_ptr<SimpleImage>
+shared_ptr<Image>
 Image::post_process (string pp) const
 {
-	shared_ptr<SimpleImage> out (new SimpleImage (PIX_FMT_YUV420P, size ()));
+	shared_ptr<Image> out (new SimpleImage (PIX_FMT_YUV420P, size ()));
 	
 	pp_mode* mode = pp_get_mode_by_name_and_quality (pp.c_str (), PP_QUALITY_MAX);
 	pp_context* context = pp_get_context (size().width, size().height, PP_FORMAT_420 | PP_CPU_CAPS_MMX2);
diff --git a/src/lib/image.h b/src/lib/image.h
index e06a82b7f..970750719 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -65,9 +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<Image> scale_and_convert_to_rgb (Size, int, Scaler const *) const;
 	boost::shared_ptr<Image> scale (Size, Scaler const *) const;
-	boost::shared_ptr<SimpleImage> post_process (std::string) const;
+	boost::shared_ptr<Image> post_process (std::string) const;
 	
 	void make_black ();
 	
diff --git a/src/lib/server.cc b/src/lib/server.cc
index 76989d078..2fda5952f 100644
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -112,7 +112,7 @@ Server::process (shared_ptr<Socket> socket)
 		post_process = "";
 	}
 	
-	shared_ptr<SimpleImage> image (new SimpleImage (pixel_format, in_size));
+	shared_ptr<Image> image (new SimpleImage (pixel_format, in_size));
 	
 	for (int i = 0; i < image->components(); ++i) {
 		socket->read_definite_and_consume (image->data()[i], image->line_size()[i] * image->lines(i), 30);
diff --git a/src/lib/subtitle.h b/src/lib/subtitle.h
index 0b82320a1..d9717564e 100644
--- a/src/lib/subtitle.h
+++ b/src/lib/subtitle.h
@@ -23,7 +23,7 @@
 
 struct AVSubtitle;
 class SubtitleImage;
-class SimpleImage;
+class Image;
 class FilmState;
 
 class Subtitle
@@ -64,11 +64,11 @@ public:
 		return _position;
 	}
 	
-	boost::shared_ptr<SimpleImage> image () const {
+	boost::shared_ptr<Image> image () const {
 		return _image;
 	}
 
 private:
 	Position _position;
-	boost::shared_ptr<SimpleImage> _image;
+	boost::shared_ptr<Image> _image;
 };
diff --git a/test/test.cc b/test/test.cc
index 5a7625dd7..789724b53 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -270,7 +270,7 @@ do_remote_encode (shared_ptr<DCPVideoFrame> frame, ServerDescription* descriptio
 
 BOOST_AUTO_TEST_CASE (client_server_test)
 {
-	shared_ptr<SimpleImage> image (new SimpleImage (PIX_FMT_RGB24, Size (1998, 1080)));
+	shared_ptr<Image> image (new SimpleImage (PIX_FMT_RGB24, Size (1998, 1080)));
 
 	uint8_t* p = image->data()[0];
 	
-- 
2.30.2