Use an enum class for Marker.

[libdcp.git] / src / transfer_function.h

diff --git a/src/transfer_function.h b/src/transfer_function.h
index 90947bdd291621948ba37f59fc211745682d9531..52624c6689b7c82c9b339deef4c94c57d2650d68 100644 (file)
--- a/src/transfer_function.h
+++ b/src/transfer_function.h
@@ -15,6 +15,20 @@
 
     You should have received a copy of the GNU General Public License
     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.
 */
 
 /** @file  src/transfer_function.h
@@ -25,7 +39,7 @@
 #define LIBDCP_TRANSFER_FUNCTION_H
 
 #include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <boost/thread/mutex.hpp>
 #include <map>
 
@@ -42,7 +56,7 @@ public:
        /** @return A look-up table (of size 2^bit_depth) whose values range from 0 to 1 */
        double const * lut (int bit_depth, bool inverse) const;
 
-       virtual bool about_equal (boost::shared_ptr<const TransferFunction> other, double epsilon) const = 0;
+       virtual bool about_equal (std::shared_ptr<const TransferFunction> other, double epsilon) const = 0;
 
 protected:
        /** Make a LUT and return an array allocated by new */