summaryrefslogtreecommitdiff
path: root/src/lib/image.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-02-11 15:39:30 +0000
committerCarl Hetherington <cth@carlh.net>2014-02-11 15:39:30 +0000
commitc28b3d6f168607aca9995282b96647eb64a26dc9 (patch)
treea939edd65299674d3e522f3b3248b572ec1e351f /src/lib/image.h
parent8aeb741ccbe2edb528e98a431bf55459a6836a9b (diff)
Partial hacks to use of libdcp 1.0.
Diffstat (limited to 'src/lib/image.h')
-rw-r--r--src/lib/image.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/image.h b/src/lib/image.h
index b12db3a14..1c096be71 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -37,10 +37,10 @@ extern "C" {
class Scaler;
-class Image : public libdcp::Image
+class Image : public dcp::Image
{
public:
- Image (AVPixelFormat, libdcp::Size, bool);
+ Image (AVPixelFormat, dcp::Size, bool);
Image (AVFrame *);
Image (Image const &);
Image (boost::shared_ptr<const Image>, bool);
@@ -50,18 +50,18 @@ public:
uint8_t ** data () const;
int * line_size () const;
int * stride () const;
- libdcp::Size size () const;
+ dcp::Size size () const;
bool aligned () const;
int components () const;
int line_factor (int) const;
int lines (int) const;
- boost::shared_ptr<Image> scale (libdcp::Size, Scaler const *, AVPixelFormat, bool aligned) const;
+ boost::shared_ptr<Image> scale (dcp::Size, Scaler const *, AVPixelFormat, bool aligned) const;
boost::shared_ptr<Image> post_process (std::string, bool aligned) const;
boost::shared_ptr<Image> crop (Crop c, bool aligned) const;
- boost::shared_ptr<Image> crop_scale_window (Crop c, libdcp::Size, libdcp::Size, Scaler const *, AVPixelFormat, bool aligned) const;
+ boost::shared_ptr<Image> crop_scale_window (Crop c, dcp::Size, dcp::Size, Scaler const *, AVPixelFormat, bool aligned) const;
void make_black ();
void alpha_blend (boost::shared_ptr<const Image> image, Position<int> pos);