From: Thomas Mansencal Date: Thu, 30 Jul 2015 09:25:36 +0000 (+1200) Subject: Remove unused locals. X-Git-Url: http://users.mur.at/ms/git/gitweb/?p=OpenColorIO-Configs.git;a=commitdiff_plain;h=e567a3894cb97877de4bb60ab4d0a9cc98a11a83 Remove unused locals. --- diff --git a/aces_1.0.0/python/aces_ocio/aces_config.py b/aces_1.0.0/python/aces_ocio/aces_config.py index 77df1a2..7d802e0 100755 --- a/aces_1.0.0/python/aces_ocio/aces_config.py +++ b/aces_1.0.0/python/aces_ocio/aces_config.py @@ -173,11 +173,6 @@ def generate_OCIO_transform(transforms): Return value description. """ - interpolation_options = { - 'linear': ocio.Constants.INTERP_LINEAR, - 'nearest': ocio.Constants.INTERP_NEAREST, - 'tetrahedral': ocio.Constants.INTERP_TETRAHEDRAL} - direction_options = { 'forward': ocio.Constants.TRANSFORM_DIR_FORWARD, 'inverse': ocio.Constants.TRANSFORM_DIR_INVERSE} @@ -368,11 +363,9 @@ def add_colorspace_aliases(config, def add_look(config, look, - prefix, custom_lut_dir, reference_name, - config_data, - multiple_displays=False): + config_data): """ Object description. @@ -451,8 +444,7 @@ def add_look(config, print() -def integrate_looks_into_views(config, - looks, +def integrate_looks_into_views(looks, reference_name, config_data, multiple_displays=False): @@ -637,14 +629,12 @@ def create_config(config_data, for look in look_info: add_look(config, look, - prefix, custom_lut_dir, reference_data.name, config_data) # Integrate looks with displays, views - integrate_looks_into_views(config, - look_info, + integrate_looks_into_views(look_info, reference_data.name, config_data, multiple_displays) @@ -1099,8 +1089,7 @@ def generate_LUTs(odt_info, # General Color Spaces # ------------------------------------------------------------------------- general_colorspaces = general.create_colorspaces(lut_directory, - lut_resolution_1d, - lut_resolution_3d) + lut_resolution_1d) for cs in general_colorspaces: config_data['colorSpaces'].append(cs) @@ -1121,7 +1110,6 @@ def generate_baked_LUTs(odt_info, shaper_name, baked_directory, config_path, - lut_resolution_1d, lut_resolution_3d, lut_resolution_shaper=1024, prefix=False): @@ -1392,7 +1380,6 @@ def create_ACES_config(aces_ctl_directory, shaper_name, os.path.join(config_directory, 'baked'), os.path.join(config_directory, 'config.ocio'), - lut_resolution_1d, lut_resolution_3d, lut_resolution_1d, prefix=prefix_colorspaces_with_family_names) diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/aces.py b/aces_1.0.0/python/aces_ocio/colorspaces/aces.py index c3e725e..b0574fc 100644 --- a/aces_1.0.0/python/aces_ocio/colorspaces/aces.py +++ b/aces_1.0.0/python/aces_ocio/colorspaces/aces.py @@ -251,11 +251,7 @@ def create_ACESproxy(aces_ctl_directory, # ------------------------------------------------------------------------- # *ACEScg* # ------------------------------------------------------------------------- -def create_ACEScg(aces_ctl_directory, - lut_directory, - lut_resolution_1d, - cleanup, - name='ACEScg'): +def create_ACEScg(): """ Creates the *ACEScg* colorspace. @@ -270,6 +266,8 @@ def create_ACEScg(aces_ctl_directory, *ACEScg* colorspace. """ + name = 'ACEScg' + cs = ColorSpace(name) cs.description = 'The %s color space' % name cs.aliases = ['acescg', 'lin_ap1'] @@ -304,7 +302,6 @@ def create_ACEScg(aces_ctl_directory, # *ADX* # ------------------------------------------------------------------------- def create_ADX(lut_directory, - lut_resolution_1d, bit_depth=10, name='ADX'): """ @@ -651,7 +648,6 @@ def create_ACES_LMT(lmt_name, shaper_info, aces_ctl_directory, lut_directory, - lut_resolution_1d=1024, lut_resolution_3d=64, cleanup=True, aliases=None): @@ -775,7 +771,6 @@ def create_LMTs(aces_ctl_directory, lut_resolution_1d, lut_resolution_3d, lmt_info, - shaper_name, cleanup): """ Object description. @@ -843,7 +838,6 @@ def create_LMTs(aces_ctl_directory, lmt_shaper_data, aces_ctl_directory, lut_directory, - lmt_lut_resolution_1d, lmt_lut_resolution_3d, cleanup, lmt_aliases) @@ -860,7 +854,6 @@ def create_ACES_RRT_plus_ODT(odt_name, shaper_info, aces_ctl_directory, lut_directory, - lut_resolution_1d=1024, lut_resolution_3d=64, cleanup=True, aliases=None): @@ -1234,7 +1227,6 @@ def create_ODTs(aces_ctl_directory, rrt_shaper, aces_ctl_directory, lut_directory, - lut_resolution_1d, lut_resolution_3d, cleanup, odt_aliases) @@ -1528,14 +1520,13 @@ def create_colorspaces(aces_ctl_directory, lut_resolution_1d, cleanup) colorspaces.append(ACESproxy) - ACEScg = create_ACEScg(aces_ctl_directory, lut_directory, - lut_resolution_1d, cleanup) + ACEScg = create_ACEScg() colorspaces.append(ACEScg) - ADX10 = create_ADX(lut_directory, lut_resolution_1d, bit_depth=10) + ADX10 = create_ADX(lut_directory, bit_depth=10) colorspaces.append(ADX10) - ADX16 = create_ADX(lut_directory, lut_resolution_1d, bit_depth=16) + ADX16 = create_ADX(lut_directory, bit_depth=16) colorspaces.append(ADX16) lmts = create_LMTs(aces_ctl_directory, @@ -1543,7 +1534,6 @@ def create_colorspaces(aces_ctl_directory, lut_resolution_1d, lut_resolution_3d, lmt_info, - shaper_name, cleanup) colorspaces.extend(lmts) diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/arri.py b/aces_1.0.0/python/aces_ocio/colorspaces/arri.py index 534bece..a1dab18 100644 --- a/aces_1.0.0/python/aces_ocio/colorspaces/arri.py +++ b/aces_1.0.0/python/aces_ocio/colorspaces/arri.py @@ -30,7 +30,6 @@ __all__ = ['create_log_c', def create_log_c(gamut, transfer_function, exposure_index, - name, lut_directory, lut_resolution_1d, aliases): @@ -202,7 +201,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): gamut, transfer_function, EI, - 'LogC', lut_directory, lut_resolution_1d, ['%sei%s_%s' % ('logc3', str(EI), 'arriwide')]) @@ -214,7 +212,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): '', transfer_function, EI, - 'LogC', lut_directory, lut_resolution_1d, ['crv_%sei%s' % ('logc3', str(EI))]) @@ -225,7 +222,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): gamut, '', default_EI, - 'LogC', lut_directory, lut_resolution_1d, ['%s_%s' % ('lin', 'arriwide')]) diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/canon.py b/aces_1.0.0/python/aces_ocio/colorspaces/canon.py index e19f714..620b485 100644 --- a/aces_1.0.0/python/aces_ocio/colorspaces/canon.py +++ b/aces_1.0.0/python/aces_ocio/colorspaces/canon.py @@ -28,7 +28,6 @@ __all__ = ['create_c_log', def create_c_log(gamut, transfer_function, - name, lut_directory, lut_resolution_1d, aliases): @@ -177,7 +176,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): c_log_1 = create_c_log( 'Rec. 709 Daylight', 'Canon-Log', - 'Canon-Log', lut_directory, lut_resolution_1d, ['canonlog_rec709day']) @@ -186,7 +184,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): c_log_2 = create_c_log( 'Rec. 709 Tungsten', 'Canon-Log', - 'Canon-Log', lut_directory, lut_resolution_1d, ['canonlog_rec709tung']) @@ -195,7 +192,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): c_log_3 = create_c_log( 'DCI-P3 Daylight', 'Canon-Log', - 'Canon-Log', lut_directory, lut_resolution_1d, ['canonlog_dcip3day']) @@ -204,7 +200,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): c_log_4 = create_c_log( 'DCI-P3 Tungsten', 'Canon-Log', - 'Canon-Log', lut_directory, lut_resolution_1d, ['canonlog_dcip3tung']) @@ -213,7 +208,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): c_log_5 = create_c_log( 'Cinema Gamut Daylight', 'Canon-Log', - 'Canon-Log', lut_directory, lut_resolution_1d, ['canonlog_cgamutday']) @@ -222,7 +216,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): c_log_6 = create_c_log( 'Cinema Gamut Tungsten', 'Canon-Log', - 'Canon-Log', lut_directory, lut_resolution_1d, ['canonlog_cgamuttung']) @@ -232,7 +225,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): c_log_7 = create_c_log( '', 'Canon-Log', - 'Canon-Log', lut_directory, lut_resolution_1d, ['crv_canonlog']) @@ -242,7 +234,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): c_log_8 = create_c_log( 'Rec. 709 Daylight', '', - 'Canon-Log', lut_directory, lut_resolution_1d, ['lin_canonrec709day']) @@ -251,7 +242,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): c_log_9 = create_c_log( 'Rec. 709 Tungsten', '', - 'Canon-Log', lut_directory, lut_resolution_1d, ['lin_canonrec709tung']) @@ -260,7 +250,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): c_log_10 = create_c_log( 'DCI-P3 Daylight', '', - 'Canon-Log', lut_directory, lut_resolution_1d, ['lin_canondcip3day']) @@ -269,7 +258,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): c_log_11 = create_c_log( 'DCI-P3 Tungsten', '', - 'Canon-Log', lut_directory, lut_resolution_1d, ['lin_canondcip3tung']) @@ -278,7 +266,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): c_log_12 = create_c_log( 'Cinema Gamut Daylight', '', - 'Canon-Log', lut_directory, lut_resolution_1d, ['lin_canoncgamutday']) @@ -287,7 +274,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): c_log_13 = create_c_log( 'Cinema Gamut Tungsten', '', - 'Canon-Log', lut_directory, lut_resolution_1d, ['lin_canoncgamuttung']) 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 c3d8101..bf33549 100644 --- a/aces_1.0.0/python/aces_ocio/colorspaces/general.py +++ b/aces_1.0.0/python/aces_ocio/colorspaces/general.py @@ -315,8 +315,7 @@ def transfer_function_Rec1886_to_linear(v): def create_colorspaces(lut_directory, - lut_resolution_1d, - lut_resolution_3d): + lut_resolution_1d): """ Generates the colorspace conversions. diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/gopro.py b/aces_1.0.0/python/aces_ocio/colorspaces/gopro.py index af660e4..b64cee9 100644 --- a/aces_1.0.0/python/aces_ocio/colorspaces/gopro.py +++ b/aces_1.0.0/python/aces_ocio/colorspaces/gopro.py @@ -28,7 +28,6 @@ __all__ = ['create_protune', def create_protune(gamut, transfer_function, - name, lut_directory, lut_resolution_1d, aliases): @@ -133,7 +132,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): protune_1 = create_protune( 'Protune Native', 'Protune Flat', - 'Protune', lut_directory, lut_resolution_1d, ['protuneflat_protunegamutexp']) @@ -143,7 +141,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): protune_2 = create_protune( '', 'Protune Flat', - 'Protune', lut_directory, lut_resolution_1d, ['crv_protuneflat']) @@ -153,7 +150,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): protune_3 = create_protune( 'Protune Native', '', - 'Protune', lut_directory, lut_resolution_1d, ['lin_protunegamutexp']) diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/panasonic.py b/aces_1.0.0/python/aces_ocio/colorspaces/panasonic.py index 72365ed..2d32131 100644 --- a/aces_1.0.0/python/aces_ocio/colorspaces/panasonic.py +++ b/aces_1.0.0/python/aces_ocio/colorspaces/panasonic.py @@ -27,7 +27,6 @@ __all__ = ['create_v_log', def create_v_log(gamut, transfer_function, - name, lut_directory, lut_resolution_1d, aliases): @@ -132,7 +131,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): v_log_1 = create_v_log( 'V-Gamut', 'V-Log', - 'V-Log', lut_directory, lut_resolution_1d, ['vlog_vgamut']) @@ -142,7 +140,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): v_log_2 = create_v_log( '', 'V-Log', - 'V-Log', lut_directory, lut_resolution_1d, ['crv_vlog']) @@ -152,7 +149,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): v_log_3 = create_v_log( 'V-Gamut', '', - 'V-Log', lut_directory, lut_resolution_1d, ['lin_vgamut']) diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/red.py b/aces_1.0.0/python/aces_ocio/colorspaces/red.py index cc9df11..ef274a1 100644 --- a/aces_1.0.0/python/aces_ocio/colorspaces/red.py +++ b/aces_1.0.0/python/aces_ocio/colorspaces/red.py @@ -28,7 +28,6 @@ __all__ = ['create_RED_log_film', def create_RED_log_film(gamut, transfer_function, - name, lut_directory, lut_resolution_1d, aliases=None): @@ -172,7 +171,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): RED_log_film_dragon = create_RED_log_film( 'DRAGONcolor', 'REDlogFilm', - 'REDlogFilm', lut_directory, lut_resolution_1d, ['rlf_dgn']) @@ -181,7 +179,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): RED_log_film_dragon2 = create_RED_log_film( 'DRAGONcolor2', 'REDlogFilm', - 'REDlogFilm', lut_directory, lut_resolution_1d, ['rlf_dgn2']) @@ -190,7 +187,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): RED_log_film_color = create_RED_log_film( 'REDcolor', 'REDlogFilm', - 'REDlogFilm', lut_directory, lut_resolution_1d, ['rlf_rc']) @@ -199,7 +195,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): RED_log_film_color2 = create_RED_log_film( 'REDcolor2', 'REDlogFilm', - 'REDlogFilm', lut_directory, lut_resolution_1d, ['rlf_rc2']) @@ -208,7 +203,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): RED_log_film_color3 = create_RED_log_film( 'REDcolor3', 'REDlogFilm', - 'REDlogFilm', lut_directory, lut_resolution_1d, ['rlf_rc3']) @@ -217,7 +211,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): RED_log_film_color4 = create_RED_log_film( 'REDcolor4', 'REDlogFilm', - 'REDlogFilm', lut_directory, lut_resolution_1d, ['rlf_rc4']) @@ -227,7 +220,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): RED_log_film = create_RED_log_film( '', 'REDlogFilm', - 'REDlogFilm', lut_directory, lut_resolution_1d, ['crv_rlf']) @@ -237,7 +229,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): RED_dragon = create_RED_log_film( 'DRAGONcolor', '', - 'REDlogFilm', lut_directory, lut_resolution_1d, ['lin_dgn']) @@ -246,7 +237,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): RED_dragon2 = create_RED_log_film( 'DRAGONcolor2', '', - 'REDlogFilm', lut_directory, lut_resolution_1d, ['lin_dgn2']) @@ -255,7 +245,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): RED_color = create_RED_log_film( 'REDcolor', '', - 'REDlogFilm', lut_directory, lut_resolution_1d, ['lin_rc']) @@ -264,7 +253,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): RED_color2 = create_RED_log_film( 'REDcolor2', '', - 'REDlogFilm', lut_directory, lut_resolution_1d, ['lin_rc2']) @@ -273,7 +261,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): RED_color3 = create_RED_log_film( 'REDcolor3', '', - 'REDlogFilm', lut_directory, lut_resolution_1d, ['lin_rc3']) @@ -282,7 +269,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): RED_color4 = create_RED_log_film( 'REDcolor4', '', - 'REDlogFilm', lut_directory, lut_resolution_1d, ['lin_rc4']) diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/sony.py b/aces_1.0.0/python/aces_ocio/colorspaces/sony.py index 876066d..50a4b41 100644 --- a/aces_1.0.0/python/aces_ocio/colorspaces/sony.py +++ b/aces_1.0.0/python/aces_ocio/colorspaces/sony.py @@ -28,7 +28,6 @@ __all__ = ['create_S_Log', def create_S_Log(gamut, transfer_function, - name, lut_directory, lut_resolution_1d, aliases): @@ -236,7 +235,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): s_log1_s_gamut = create_S_Log( 'S-Gamut', 'S-Log1', - 'S-Log', lut_directory, lut_resolution_1d, ['slog1_sgamut']) @@ -246,7 +244,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): s_log2_s_gamut = create_S_Log( 'S-Gamut', 'S-Log2', - 'S-Log2', lut_directory, lut_resolution_1d, ['slog2_sgamut']) @@ -255,7 +252,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): s_log2_s_gamut_daylight = create_S_Log( 'S-Gamut Daylight', 'S-Log2', - 'S-Log2', lut_directory, lut_resolution_1d, ['slog2_sgamutday']) @@ -264,7 +260,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): s_log2_s_gamut_tungsten = create_S_Log( 'S-Gamut Tungsten', 'S-Log2', - 'S-Log2', lut_directory, lut_resolution_1d, ['slog2_sgamuttung']) @@ -274,7 +269,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): s_log3_s_gamut3Cine = create_S_Log( 'S-Gamut3.Cine', 'S-Log3', - 'S-Log3', lut_directory, lut_resolution_1d, ['slog3_sgamutcine']) @@ -283,7 +277,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): s_log3_s_gamut3 = create_S_Log( 'S-Gamut3', 'S-Log3', - 'S-Log3', lut_directory, lut_resolution_1d, ['slog3_sgamut3']) @@ -293,7 +286,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): s_log1 = create_S_Log( '', 'S-Log1', - 'S-Log', lut_directory, lut_resolution_1d, ['crv_slog1']) @@ -302,7 +294,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): s_log2 = create_S_Log( '', 'S-Log2', - 'S-Log2', lut_directory, lut_resolution_1d, ['crv_slog2']) @@ -311,7 +302,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): s_log3 = create_S_Log( '', 'S-Log3', - 'S-Log3', lut_directory, lut_resolution_1d, ['crv_slog3']) @@ -321,7 +311,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): s_gamut = create_S_Log( 'S-Gamut', '', - 'S-Log', lut_directory, lut_resolution_1d, ['lin_sgamut']) @@ -330,7 +319,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): s_gamut_daylight = create_S_Log( 'S-Gamut Daylight', '', - 'S-Log2', lut_directory, lut_resolution_1d, ['lin_sgamutday']) @@ -339,7 +327,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): s_gamut_tungsten = create_S_Log( 'S-Gamut Tungsten', '', - 'S-Log2', lut_directory, lut_resolution_1d, ['lin_sgamuttung']) @@ -348,7 +335,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): s_gamut3Cine = create_S_Log( 'S-Gamut3.Cine', '', - 'S-Log3', lut_directory, lut_resolution_1d, ['lin_sgamut3cine']) @@ -357,7 +343,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d): s_gamut3 = create_S_Log( 'S-Gamut3', '', - 'S-Log3', lut_directory, lut_resolution_1d, ['lin_sgamut3'])