More tests.

[libdcp.git] / examples / read_dcp.cc

diff --git a/examples/read_dcp.cc b/examples/read_dcp.cc
index 6cc9b67673718af73bba9c6f8bc16eab0ca7efd0..5b44fb51a5766acce07cb8bd19222c45fe83e5f6 100644 (file)
--- a/examples/read_dcp.cc
+++ b/examples/read_dcp.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /* If you are using an installed libdcp, these #includes would need to be changed to
@@ -72,7 +72,7 @@ main ()
                } else if (boost::dynamic_pointer_cast<dcp::CPL> (*i)) {
                        std::cout << "CPL\n";
                }
-               std::cout << "\t" << (*i)->file().leaf().string() << "\n";
+               std::cout << "\t" << (*i)->file()->leaf().string() << "\n";
        }
 
        /* Take the first CPL */
@@ -94,7 +94,7 @@ main ()
 
        /* Convert to ARGB */
        boost::scoped_array<uint8_t> rgba (new uint8_t[picture_image_xyz->size().width * picture_image_xyz->size().height * 4]);
-       dcp::xyz_to_rgba (picture_image_xyz, dcp::ColourConversion::srgb_to_xyz(), rgba.get ());
+       dcp::xyz_to_rgba (picture_image_xyz, dcp::ColourConversion::srgb_to_xyz(), rgba.get(), picture_image_xyz->size().width * 4);
 
        Magick::Image image (picture_image_xyz->size().width, picture_image_xyz->size().height, "BGRA", Magick::CharPixel, rgba.get ());
        image.write ("frame.png");