Fix thinko causing hang in ::equals().

[libdcp.git] / src / data.h

diff --git a/src/data.h b/src/data.h
index 606890312f525c35c4af066513a8da1af6bbd2c5..fd6eb22bb8bd202da08c259228e90c09efabd416 100644 (file)
--- a/src/data.h
+++ b/src/data.h
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 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/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
 
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 #ifndef LIBDCP_DATA_H
@@ -30,10 +44,10 @@ class Data
 {
 public:
        Data ();
-       Data (int size);
+       explicit Data (int size);
        Data (uint8_t const * data, int size);
        Data (boost::shared_array<uint8_t> data, int size);
-       Data (boost::filesystem::path file);
+       explicit Data (boost::filesystem::path file);
 
        virtual ~Data () {}
 
@@ -48,11 +62,18 @@ public:
                return _size;
        }
 
+       void set_size (int s) {
+               _size = s;
+       }
+
 private:
        boost::shared_array<uint8_t> _data;
+       /** amount of `valid' data in _data; the array may be larger */
        int _size;
 };
 
+bool operator==(Data const & a, Data const & b);
+
 }
 
 #endif