Some OS X build fixes.

[libdcp.git] / src / argb_frame.cc

diff --git a/src/argb_frame.cc b/src/argb_frame.cc
index 8e54e3b48ef55a94a475babd99d88713886eab92..99d6c8145154a3efb0fa6caa5d76502cec42611a 100644 (file)
--- a/src/argb_frame.cc
+++ b/src/argb_frame.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,20 +17,22 @@
 
 */
 
+/** @file  src/argb_frame.cc
+ *  @brief ARGBFrame class. 
+ */
+
 #include "argb_frame.h"
 
-using namespace libdcp;
+using namespace dcp;
 
-/** Construct an empty ARGBFrame with a given width and height and with
+/** Construct an empty ARGBFrame of a given size and with
  *  undefined contents.
- *  @param width Width in pixels.
- *  @param height Height in pixels.
+ *  @param size Size in pixels.
  */
-ARGBFrame::ARGBFrame (int width, int height)
-       : _width (width)
-       , _height (height)
+ARGBFrame::ARGBFrame (Size size)
+       : _size (size)
 {
-       _data = new uint8_t[width * height * 4];
+       _data = new uint8_t[_size.width * _size.height * 4];
 }
 
 
@@ -43,5 +45,5 @@ ARGBFrame::~ARGBFrame ()
 int
 ARGBFrame::stride () const
 {
-       return _width * 4;
+       return _size.width * 4;
 }