Skip to content

Commit

Permalink
Merge branch 'feature/breakup' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
shidarin committed Jun 15, 2014
2 parents c957917 + 186d6e8 commit cd39ac7
Show file tree
Hide file tree
Showing 27 changed files with 4,414 additions and 3,835 deletions.
1 change: 0 additions & 1 deletion .landscape.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ strictness: veryhigh
max-line-length: 120
ignore-paths:
- setup.py
- cdl_convert/__init__.py
- docs
- tests
autodetect: yes
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ install:
- pip install mock
- pip install coveralls
# command to run tests, e.g. python setup.py test
script: coverage run --source=cdl_convert/cdl_convert.py tests/__init__.py
script: coverage run --source=cdl_convert tests/__init__.py
# command to run after tests have completed
after_success:
coveralls
119 changes: 117 additions & 2 deletions cdl_convert/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,117 @@
"""All code for cdl_convert lives under the cdl_convert.py file"""
from cdl_convert import *
#!/usr/bin/env python
"""
CDL Convert
===========
Converts between common ASC CDL (http://en.wikipedia.org/wiki/ASC_CDL)
formats. The American Society of Cinematographers Color Decision List (ASC CDL,
or CDL for short) is a schema to simplify the process of interchanging color
data between various programs and facilities.
The ASC has defined schemas for including the 10 basic numbers in 5 different
formats:
* Avid Log Exchange (ALE)
* Film Log EDL Exchange (FLEx)
* CMX EDL
* XML Color Correction (cc)
* XML Color Correction Collection (ccc)
Unofficial Formats:
* OCIOCDLTransform, a Foundry Nuke node
* Space Separated CDL, a Rhythm and Hues cdl format
It is the purpose of CDLConvert to convert ASC CDL information between these
basic formats to further facilitate the ease of exchange of color data within
the Film and TV industries.
**CDLConvert is not associated with the American Society of Cinematographers**
## License
The MIT License (MIT)
cdl_convert
Copyright (c) 2014 Sean Wallitsch
http://github.com/shidarin/cdl_convert/
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
"""

# ==============================================================================
# IMPORTS
# ==============================================================================

from __future__ import absolute_import, print_function

# cdl_convert imports

from .collection import ColorCollection
from .correction import ColorCorrection, SatNode, SopNode
from .decision import ColorCorrectionRef, ColorDecision, MediaRef
from .parse import (
parse_ale, parse_cc, parse_ccc,
parse_cdl, parse_file, parse_flex,
parse_rnh_cdl
)
from .utils import reset_all, sanity_check
from .write import write_cc, write_ccc, write_cdl, write_rnh_cdl

# ==============================================================================
# GLOBALS
# ==============================================================================

__author__ = "Sean Wallitsch"
__copyright__ = "Copyright 2014, Sean Wallitsch"
__credits__ = ["Sean Wallitsch", ]
__license__ = "MIT"
__version__ = "0.6.1"
__maintainer__ = "Sean Wallitsch"
__email__ = "shidarin@alphamatte.com"
__status__ = "Development"

# ==============================================================================
# EXPORTS
# ==============================================================================

__all__ = [
'ColorCorrection',
'ColorCorrectionRef',
'ColorCollection',
'ColorDecision',
'MediaRef',
'parse_ale',
'parse_cc',
'parse_ccc',
'parse_cdl',
'parse_file',
'parse_flex',
'parse_rnh_cdl',
'reset_all',
'sanity_check',
'SatNode',
'SopNode',
'write_cc',
'write_ccc',
'write_cdl',
'write_rnh_cdl',
]
Loading

0 comments on commit cd39ac7

Please sign in to comment.