X-Git-Url: http://users.mur.at/ms/git/gitweb/?p=OpenColorIO-Configs.git;a=blobdiff_plain;f=aces_1.0.0%2Fpython%2Faces_ocio%2Fcreate_canon_colorspaces.py;h=f63c1bb12b0aa4b25a5db3b298c6bcb102e1cafe;hp=ec419fd3864c7fa6c77f5c6562fded72e6ad368f;hb=89360f70a6c71121580324ed3c125a83c3973887;hpb=1c4efc5c67e2313dfadf4a0786baaabd8d6489a6

diff --git a/aces_1.0.0/python/aces_ocio/create_canon_colorspaces.py b/aces_1.0.0/python/aces_ocio/create_canon_colorspaces.py
index ec419fd..f63c1bb 100644
--- a/aces_1.0.0/python/aces_ocio/create_canon_colorspaces.py
+++ b/aces_1.0.0/python/aces_ocio/create_canon_colorspaces.py
@@ -5,6 +5,8 @@
 Implements support for *Canon* colorspaces conversions and transfer functions.
 """
 
+from __future__ import division
+
 import array
 import os
 
@@ -58,7 +60,7 @@ def create_c_log(gamut,
     cs.is_data = False
 
     def legal_to_full(code_value):
-        return (code_value - 64.0) / (940.0 - 64.0)
+        return (code_value - 64) / (940 - 64)
 
     def c_log_to_linear(code_value):
         # log = fullToLegal(c1 * log10(c2*linear + 1) + c3)
@@ -67,7 +69,7 @@ def create_c_log(gamut,
         c2 = 10.1596
         c3 = 0.0730597
 
-        linear = (pow(10.0, (legal_to_full(code_value) - c3) / c1) - 1.0) / c2
+        linear = (pow(10, (legal_to_full(code_value) - c3) / c1) - 1) / c2
         linear *= 0.9
 
         return linear
@@ -77,13 +79,13 @@ def create_c_log(gamut,
     if transfer_function == 'Canon-Log':
         data = array.array('f', '\0' * lut_resolution_1d * 4)
         for c in range(lut_resolution_1d):
-            data[c] = c_log_to_linear(1023.0 * c / (lut_resolution_1d - 1))
+            data[c] = c_log_to_linear(1023 * c / (lut_resolution_1d - 1))
 
         lut = '%s_to_linear.spi1d' % transfer_function
         genlut.write_SPI_1d(
             os.path.join(lut_directory, lut),
-            0.0,
-            1.0,
+            0,
+            1,
             data,
             lut_resolution_1d,
             1)
@@ -97,50 +99,50 @@ def create_c_log(gamut,
     if gamut == 'Rec. 709 Daylight':
         cs.to_reference_transforms.append({
             'type': 'matrix',
-            'matrix': [0.561538969, 0.402060105, 0.036400926, 0.0,
-                       0.092739623, 0.924121198, -0.016860821, 0.0,
-                       0.084812961, 0.006373835, 0.908813204, 0.0,
-                       0, 0, 0, 1.0],
+            'matrix': [0.561538969, 0.402060105, 0.036400926, 0,
+                       0.092739623, 0.924121198, -0.016860821, 0,
+                       0.084812961, 0.006373835, 0.908813204, 0,
+                       0, 0, 0, 1],
             'direction': 'forward'})
     elif gamut == 'Rec. 709 Tungsten':
         cs.to_reference_transforms.append({
             'type': 'matrix',
-            'matrix': [0.566996399, 0.365079418, 0.067924183, 0.0,
-                       0.070901044, 0.880331008, 0.048767948, 0.0,
-                       0.073013542, -0.066540862, 0.99352732, 0.0,
-                       0, 0, 0, 1.0],
+            'matrix': [0.566996399, 0.365079418, 0.067924183, 0,
+                       0.070901044, 0.880331008, 0.048767948, 0,
+                       0.073013542, -0.066540862, 0.99352732, 0,
+                       0, 0, 0, 1],
             'direction': 'forward'})
     elif gamut == 'DCI-P3 Daylight':
         cs.to_reference_transforms.append({
             'type': 'matrix',
-            'matrix': [0.607160575, 0.299507286, 0.093332140, 0.0,
-                       0.004968120, 1.050982224, -0.055950343, 0.0,
-                       -0.007839939, 0.000809127, 1.007030813, 0.0,
-                       0, 0, 0, 1.0],
+            'matrix': [0.607160575, 0.299507286, 0.093332140, 0,
+                       0.004968120, 1.050982224, -0.055950343, 0,
+                       -0.007839939, 0.000809127, 1.007030813, 0,
+                       0, 0, 0, 1],
             'direction': 'forward'})
     elif gamut == 'DCI-P3 Tungsten':
         cs.to_reference_transforms.append({
             'type': 'matrix',
-            'matrix': [0.650279125, 0.253880169, 0.095840706, 0.0,
-                       -0.026137986, 1.017900530, 0.008237456, 0.0,
-                       0.007757558, -0.063081669, 1.055324110, 0.0,
-                       0, 0, 0, 1.0],
+            'matrix': [0.650279125, 0.253880169, 0.095840706, 0,
+                       -0.026137986, 1.017900530, 0.008237456, 0,
+                       0.007757558, -0.063081669, 1.055324110, 0,
+                       0, 0, 0, 1],
             'direction': 'forward'})
     elif gamut == 'Cinema Gamut Daylight':
         cs.to_reference_transforms.append({
             'type': 'matrix',
-            'matrix': [0.763064455, 0.149021161, 0.087914384, 0.0,
-                       0.003657457, 1.10696038, -0.110617837, 0.0,
-                       -0.009407794, -0.218383305, 1.227791099, 0.0,
-                       0, 0, 0, 1.0],
+            'matrix': [0.763064455, 0.149021161, 0.087914384, 0,
+                       0.003657457, 1.10696038, -0.110617837, 0,
+                       -0.009407794, -0.218383305, 1.227791099, 0,
+                       0, 0, 0, 1],
             'direction': 'forward'})
     elif gamut == 'Cinema Gamut Tungsten':
         cs.to_reference_transforms.append({
             'type': 'matrix',
-            'matrix': [0.817416293, 0.090755698, 0.091828009, 0.0,
-                       -0.035361374, 1.065690585, -0.030329211, 0.0,
-                       0.010390366, -0.299271107, 1.288880741, 0.0,
-                       0, 0, 0, 1.0],
+            'matrix': [0.817416293, 0.090755698, 0.091828009, 0,
+                       -0.035361374, 1.065690585, -0.030329211, 0,
+                       0.010390366, -0.299271107, 1.288880741, 0,
+                       0, 0, 0, 1],
             'direction': 'forward'})
 
     cs.from_reference_transforms = []