Fixed minor issue in Rec.709 and Rec.2020 transfer functions

diff --git a/aces_1.0.0/luts/rec2020_to_linear.spi1d b/aces_1.0.0/luts/rec2020_to_linear.spi1d
index 4bf240a..523e482 100644 (file)
--- a/aces_1.0.0/luts/rec2020_to_linear.spi1d
+++ b/aces_1.0.0/luts/rec2020_to_linear.spi1d
@@ -22,71 +22,71 @@ Components 1
          0.00347561645322
          0.00369284232147
          0.00391006842256
-         0.00700011989102
-         0.00712977815419
-         0.00726074632257
-         0.00739302719012
-         0.00752662261948
-         0.00766153493896
-         0.00779776694253
-         0.00793532002717
-         0.00807419791818
-         0.00821440201253
-         0.00835593510419
-         0.00849879905581
-         0.00864299573004
-         0.00878852792084
-         0.00893539749086
-         0.00908360723406
-         0.00923315901309
-         0.00938405562192
-         0.00953629799187
-         0.00968988891691
-         0.009844831191
-         0.0100011266768
-         0.0101587763056
-         0.0103177838027
-         0.0104781500995
-         0.0106398779899
-         0.0108029693365
-         0.010967426002
-         0.0111332507804
-         0.011300444603
-         0.0114690102637
-         0.0116389505565
-         0.0118102654815
-         0.0119829587638
-         0.0121570313349
-         0.0123324869201
-         0.0125093245879
-         0.012687548995
-         0.0128671610728
-         0.0130481626838
-         0.0132305556908
-         0.0134143419564
-         0.0135995242745
-         0.0137861035764
-         0.0139740826562
-         0.0141634624451
-         0.0143542457372
-         0.0145464334637
-         0.0147400274873
-         0.0149350306019
-         0.0151314446703
-         0.0153292706236
-         0.015528511256
-         0.0157291665673
-         0.0159312412143
-         0.0161347351968
-         0.0163396503776
-         0.0165459886193
-         0.0167537517846
-         0.016962941736
-         0.0171735621989
-         0.0173856113106
-         0.0175990927964
-         0.0178140066564
-         0.0180303584784
+         0.00412729429081
+         0.00434452062473
+         0.00456174649298
+         0.00477897236124
+         0.00499619869515
+         0.00521342456341
+         0.00543065043166
+         0.00564787676558
+         0.00586510263383
+         0.00608232850209
+         0.006299554836
+         0.00651678070426
+         0.00673400657251
+         0.00695123290643
+         0.00716845877469
+         0.00738568464294
+         0.00760291097686
+         0.00782013684511
+         0.00803736317903
+         0.00825458858162
+         0.00847181491554
+         0.00868904124945
+         0.00890626665205
+         0.00912349298596
+         0.00934071931988
+         0.00955794472247
+         0.00977517105639
+         0.00999239739031
+         0.0102096227929
+         0.0104268491268
+         0.0106440754607
+         0.0108613008633
+         0.0110785271972
+         0.0112957535312
+         0.0115129789338
+         0.0117302052677
+         0.0119474316016
+         0.0121646570042
+         0.0123818833381
+         0.012599109672
+         0.0128163350746
+         0.0130335614085
+         0.0132507877424
+         0.013468013145
+         0.0136852394789
+         0.0139024658129
+         0.0141196912155
+         0.0143369175494
+         0.0145541438833
+         0.0147713692859
+         0.0149885956198
+         0.0152058219537
+         0.0154230473563
+         0.0156402736902
+         0.0158574990928
+         0.0160747263581
+         0.0162919517606
+         0.0165091771632
+         0.0167264044285
+         0.0169436298311
+         0.0171608552337
+         0.0173780824989
+         0.0175953079015
+         0.0178125333041
+         0.0180297605693
          0.0182481463999
          0.0184673722833
          0.0186880417168

diff --git a/aces_1.0.0/luts/rec709_to_linear.spi1d b/aces_1.0.0/luts/rec709_to_linear.spi1d
index d793a8d..7cfe9d9 100644 (file)
--- a/aces_1.0.0/luts/rec709_to_linear.spi1d
+++ b/aces_1.0.0/luts/rec709_to_linear.spi1d
@@ -22,70 +22,70 @@ Components 1
          0.00347561645322
          0.00369284232147
          0.00391006842256
-         0.00696481298655
-         0.00709414854646
-         0.0072247935459
-         0.00735675124452
-         0.00749002350494
-         0.00762461312115
-         0.00776052242145
-         0.00789775326848
-         0.00803630799055
-         0.00817618984729
-         0.00831740070134
-         0.00845994148403
-         0.00860381685197
-         0.00874902680516
-         0.00889557506889
-         0.00904346257448
-         0.00919269304723
-         0.00934326741844
-         0.00949518848211
-         0.00964845903218
-         0.00980307999998
-         0.00995905417949
-         0.0101163834333
-         0.0102750696242
-         0.0104351164773
-         0.0105965239927
-         0.0107592949644
-         0.0109234321862
-         0.011088937521
-         0.0112558118999
-         0.0114240590483
-         0.0115936789662
-         0.0117646763101
-         0.0119370501488
-         0.0121108051389
-         0.0122859422117
-         0.0124624622986
-         0.0126403691247
-         0.0128196636215
-         0.0130003476515
-         0.0131824240088
-         0.013365894556
-         0.0135507602245
-         0.0137370228767
-         0.0139246862382
-         0.0141137503088
-         0.0143042178825
-         0.0144960908219
-         0.0146893709898
-         0.0148840593174
-         0.0150801585987
-         0.0152776716277
-         0.015476597473
-         0.0156769417226
-         0.0158787015826
-         0.0160818826407
-         0.0162864867598
-         0.0164925120771
-         0.0166999641806
-         0.0169088430703
-         0.0171191506088
-         0.0173308886588
-         0.0175440590829
-         0.0177586656064
+         0.00412729429081
+         0.00434452062473
+         0.00456174649298
+         0.00477897236124
+         0.00499619869515
+         0.00521342456341
+         0.00543065043166
+         0.00564787676558
+         0.00586510263383
+         0.00608232850209
+         0.006299554836
+         0.00651678070426
+         0.00673400657251
+         0.00695123290643
+         0.00716845877469
+         0.00738568464294
+         0.00760291097686
+         0.00782013684511
+         0.00803736317903
+         0.00825458858162
+         0.00847181491554
+         0.00868904124945
+         0.00890626665205
+         0.00912349298596
+         0.00934071931988
+         0.00955794472247
+         0.00977517105639
+         0.00999239739031
+         0.0102096227929
+         0.0104268491268
+         0.0106440754607
+         0.0108613008633
+         0.0110785271972
+         0.0112957535312
+         0.0115129789338
+         0.0117302052677
+         0.0119474316016
+         0.0121646570042
+         0.0123818833381
+         0.012599109672
+         0.0128163350746
+         0.0130335614085
+         0.0132507877424
+         0.013468013145
+         0.0136852394789
+         0.0139024658129
+         0.0141196912155
+         0.0143369175494
+         0.0145541438833
+         0.0147713692859
+         0.0149885956198
+         0.0152058219537
+         0.0154230473563
+         0.0156402736902
+         0.0158574990928
+         0.0160747263581
+         0.0162919517606
+         0.0165091771632
+         0.0167264044285
+         0.0169436298311
+         0.0171608552337
+         0.0173780824989
+         0.0175953079015
+         0.0178125333041
          0.0179747063667
          0.018192185089
          0.0184111017734

diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/general.py b/aces_1.0.0/python/aces_ocio/colorspaces/general.py
index 348e9b2..4b6d801 100644 (file)
--- a/aces_1.0.0/python/aces_ocio/colorspaces/general.py
+++ b/aces_1.0.0/python/aces_ocio/colorspaces/general.py
@@ -189,7 +189,7 @@ def transfer_function_Rec709_to_linear(v):
     d = 4.5
     g = (1.0/0.45)
 
-    if v < b:
+    if v < b*d:
         return v/d
 
     return pow(((v + (a - 1)) / a), g)
@@ -200,7 +200,7 @@ def transfer_function_Rec2020_10bit_to_linear(v):
     d = 4.5
     g = (1.0/0.45)
 
-    if v < b:
+    if v < b*d:
         return v/d
 
     return pow(((v + (a - 1)) / a), g)
@@ -211,7 +211,7 @@ def transfer_function_Rec2020_12bit_to_linear(v):
     d = 4.5
     g = (1.0/0.45)
 
-    if v < b:
+    if v < b*d:
         return v/d
 
     return pow(((v + (a - 1)) / a), g)