Omit vposition property when it's 0.

[libdcp.git] / test / gamma_transfer_function_test.cc

diff --git a/test/gamma_transfer_function_test.cc b/test/gamma_transfer_function_test.cc
index 827b3a8009b021ab0635d4f1b773de5b91c718ad..6e454b764676bdc382f640759f14b96baeb5f21b 100644 (file)
--- a/test/gamma_transfer_function_test.cc
+++ b/test/gamma_transfer_function_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -15,26 +15,43 @@
 
     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.
 */
 
+
 #include "gamma_transfer_function.h"
 #include "modified_gamma_transfer_function.h"
 #include <boost/test/unit_test.hpp>
 
-using boost::shared_ptr;
+
+using std::make_shared;
+using std::shared_ptr;
+
 
 /** Check GammaTransferFunction::about_equal */
 BOOST_AUTO_TEST_CASE (gamma_transfer_function_test)
 {
-       shared_ptr<dcp::GammaTransferFunction> a (new dcp::GammaTransferFunction (1.2));
-       shared_ptr<dcp::GammaTransferFunction> b (new dcp::GammaTransferFunction (1.2));
+       auto a = make_shared<dcp::GammaTransferFunction>(1.2);
+       auto b = make_shared<dcp::GammaTransferFunction>(1.2);
        BOOST_CHECK (a->about_equal (b, 1e-6));
 
-       a.reset (new dcp::GammaTransferFunction (1.2));
-       a.reset (new dcp::GammaTransferFunction (1.3));
+       a = make_shared<dcp::GammaTransferFunction>(1.3);
        BOOST_CHECK (a->about_equal (b, 0.2));
        BOOST_CHECK (!a->about_equal (b, 0.05));
 
-       shared_ptr<dcp::ModifiedGammaTransferFunction> c (new dcp::ModifiedGammaTransferFunction (2.4, 0.05, 1, 2));
+       auto c = make_shared<dcp::ModifiedGammaTransferFunction>(2.4, 0.05, 1, 2);
        BOOST_CHECK (!a->about_equal (c, 1));
 }