merge 'release' into 'master' for v1.0.1

ampas · Oct 23, 2015 · 4c7375b · 4c7375b
2 parents 73f15c5 + 78805bd
commit 4c7375b
Show file tree

Hide file tree

Showing 28 changed files with 98 additions and 73 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright © 2013 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
+# Copyright © 2015 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
 # Portions contributed by others as indicated. All rights reserved.
 # 
 # A worldwide, royalty-free, non-exclusive right to copy, modify, create
@@ -47,9 +47,10 @@
 cmake_minimum_required (VERSION 2.6)
 project (AcesContainer)
 
+set( CMAKE_MACOSX_RPATH 1 )
 set( AcesContainer_MAJOR_VERSION 1 )
 set( AcesContainer_MINOR_VERSION 0 )
-set( AcesContainer_PATCH_VERSION 0 )
+set( AcesContainer_PATCH_VERSION 1 )
 set( AcesContainer_VERSION ${AcesContainer_MAJOR_VERSION}.${AcesContainer_MINOR_VERSION}.${AcesContainer_PATCH_VERSION} )
 
 set( INSTALL_LIB_DIR lib CACHE PATH "Install directory for libraries" )

diff --git a/LICENSE b/LICENSE
@@ -1,7 +1,7 @@
 The ACES Container Reference Implementation is provided by the Academy under the
 following terms and conditions:
 
-Copyright © 2013 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
+Copyright © 2015 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
 Portions contributed by others as indicated. All rights reserved.
 
 A worldwide, royalty-free, non-exclusive right to copy, modify, create
@@ -57,7 +57,7 @@ License Terms for the ACES Container Writer
 The ACES Container Writer is provided by Adobe Systems Incorporated under the
 following terms and conditions:
 
-Copyright © 2013 Adobe Systems Incorporated ("Adobe"). All rights reserved.
+Copyright © 2015 Adobe Systems Incorporated ("Adobe"). All rights reserved.
 
 A worldwide, royalty-free, non-exclusive right to copy, modify, create
 derivatives, and use, in source and binary forms, is hereby granted, subject to

diff --git a/README.md b/README.md
@@ -68,7 +68,7 @@ below.
 The ACES Container Reference Implementation is provided by the Academy under the
 following terms and conditions:
 
-Copyright © 2013 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
+Copyright © 2015 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
 Portions contributed by others as indicated. All rights reserved.
 
 A worldwide, royalty-free, non-exclusive right to copy, modify, create
@@ -123,7 +123,7 @@ License Terms for the ACES Container Writer
 The ACES Container Writer is provided by Adobe Systems Incorporated under the 
 following terms and conditions:
 
-Copyright © 2013 Adobe Systems Incorporated ("Adobe"). All rights reserved.
+Copyright © 2015 Adobe Systems Incorporated ("Adobe"). All rights reserved.
 
 A worldwide, royalty-free, non-exclusive right to copy, modify, create
 derivatives, and use, in source and binary forms, is hereby granted, subject to

diff --git a/aces_Writer.cpp b/aces_Writer.cpp
@@ -1,4 +1,4 @@
-// Copyright © 2013 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
+// Copyright © 2015 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
 // Portions contributed by others as indicated. All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
@@ -54,7 +54,7 @@
 // The ACES Container Writer is provided by Adobe Systems Incorporated under the 
 // following terms and conditions:
 // 
-// Copyright © 2013 Adobe Systems Incorporated ("Adobe"). All rights reserved.
+// Copyright © 2015 Adobe Systems Incorporated ("Adobe"). All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
 // derivatives, and use, in source and binary forms, is hereby granted, subject 

diff --git a/aces_Writer.h b/aces_Writer.h
@@ -1,4 +1,4 @@
-// Copyright © 2013 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
+// Copyright © 2015 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
 // Portions contributed by others as indicated. All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
@@ -54,7 +54,7 @@
 // The ACES Container Writer is provided by Adobe Systems Incorporated under the 
 // following terms and conditions:
 // 
-// Copyright © 2013 Adobe Systems Incorporated ("Adobe"). All rights reserved.
+// Copyright © 2015 Adobe Systems Incorporated ("Adobe"). All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
 // derivatives, and use, in source and binary forms, is hereby granted, subject 

diff --git a/aces_attributestructs.cpp b/aces_attributestructs.cpp
@@ -1,4 +1,4 @@
-// Copyright © 2013 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
+// Copyright © 2015 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
 // Portions contributed by others as indicated. All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
@@ -59,7 +59,7 @@
 // The ACES Container Writer is provided by Adobe Systems Incorporated under the 
 // following terms and conditions:
 // 
-// Copyright © 2013 Adobe Systems Incorporated ("Adobe"). All rights reserved.
+// Copyright © 2015 Adobe Systems Incorporated ("Adobe"). All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
 // derivatives, and use, in source and binary forms, is hereby granted, subject 

diff --git a/aces_attributestructs.h b/aces_attributestructs.h
@@ -1,4 +1,4 @@
-// Copyright © 2013 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
+// Copyright © 2015 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
 // Portions contributed by others as indicated. All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
@@ -59,7 +59,7 @@
 // The ACES Container Writer is provided by Adobe Systems Incorporated under the 
 // following terms and conditions:
 // 
-// Copyright © 2013 Adobe Systems Incorporated ("Adobe"). All rights reserved.
+// Copyright © 2015 Adobe Systems Incorporated ("Adobe"). All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
 // derivatives, and use, in source and binary forms, is hereby granted, subject 

diff --git a/aces_crossplat.h b/aces_crossplat.h
@@ -1,4 +1,4 @@
-// Copyright © 2013 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
+// Copyright © 2015 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
 // Portions contributed by others as indicated. All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
@@ -54,7 +54,7 @@
 // The ACES Container Writer is provided by Adobe Systems Incorporated under the 
 // following terms and conditions:
 // 
-// Copyright © 2013 Adobe Systems Incorporated ("Adobe"). All rights reserved.
+// Copyright © 2015 Adobe Systems Incorporated ("Adobe"). All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
 // derivatives, and use, in source and binary forms, is hereby granted, subject 

diff --git a/aces_errors.h b/aces_errors.h
@@ -1,4 +1,4 @@
-// Copyright © 2013 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
+// Copyright © 2015 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
 // Portions contributed by others as indicated. All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
@@ -54,7 +54,7 @@
 // The ACES Container Writer is provided by Adobe Systems Incorporated under the 
 // following terms and conditions:
 // 
-// Copyright © 2013 Adobe Systems Incorporated ("Adobe"). All rights reserved.
+// Copyright © 2015 Adobe Systems Incorporated ("Adobe"). All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
 // derivatives, and use, in source and binary forms, is hereby granted, subject 

diff --git a/aces_formatter.cpp b/aces_formatter.cpp
@@ -1,4 +1,4 @@
-// Copyright © 2013 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
+// Copyright © 2015 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
 // Portions contributed by others as indicated. All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
@@ -54,7 +54,7 @@
 // The ACES Container Writer is provided by Adobe Systems Incorporated under the 
 // following terms and conditions:
 // 
-// Copyright © 2013 Adobe Systems Incorporated ("Adobe"). All rights reserved.
+// Copyright © 2015 Adobe Systems Incorporated ("Adobe"). All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
 // derivatives, and use, in source and binary forms, is hereby granted, subject 

diff --git a/aces_formatter.h b/aces_formatter.h
@@ -1,4 +1,4 @@
-// Copyright © 2013 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
+// Copyright © 2015 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
 // Portions contributed by others as indicated. All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
@@ -54,7 +54,7 @@
 // The ACES Container Writer is provided by Adobe Systems Incorporated under the 
 // following terms and conditions:
 // 
-// Copyright © 2013 Adobe Systems Incorporated ("Adobe"). All rights reserved.
+// Copyright © 2015 Adobe Systems Incorporated ("Adobe"). All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
 // derivatives, and use, in source and binary forms, is hereby granted, subject 

diff --git a/aces_genericWriter.h b/aces_genericWriter.h
@@ -1,4 +1,4 @@
-// Copyright © 2013 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
+// Copyright © 2015 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
 // Portions contributed by others as indicated. All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
@@ -54,7 +54,7 @@
 // The ACES Container Writer is provided by Adobe Systems Incorporated under the 
 // following terms and conditions:
 // 
-// Copyright © 2013 Adobe Systems Incorporated ("Adobe"). All rights reserved.
+// Copyright © 2015 Adobe Systems Incorporated ("Adobe"). All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
 // derivatives, and use, in source and binary forms, is hereby granted, subject 

diff --git a/aces_iostat.cpp b/aces_iostat.cpp
@@ -1,4 +1,4 @@
-// Copyright © 2013 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
+// Copyright © 2015 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
 // Portions contributed by others as indicated. All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
@@ -54,7 +54,7 @@
 // The ACES Container Writer is provided by Adobe Systems Incorporated under the 
 // following terms and conditions:
 // 
-// Copyright © 2013 Adobe Systems Incorporated ("Adobe"). All rights reserved.
+// Copyright © 2015 Adobe Systems Incorporated ("Adobe"). All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
 // derivatives, and use, in source and binary forms, is hereby granted, subject 

diff --git a/aces_iostat.h b/aces_iostat.h
@@ -1,4 +1,4 @@
-// Copyright © 2013 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
+// Copyright © 2015 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
 // Portions contributed by others as indicated. All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
@@ -54,7 +54,7 @@
 // The ACES Container Writer is provided by Adobe Systems Incorporated under the 
 // following terms and conditions:
 // 
-// Copyright © 2013 Adobe Systems Incorporated ("Adobe"). All rights reserved.
+// Copyright © 2015 Adobe Systems Incorporated ("Adobe"). All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
 // derivatives, and use, in source and binary forms, is hereby granted, subject 

diff --git a/aces_items.h b/aces_items.h
@@ -1,4 +1,4 @@
-// Copyright © 2013 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
+// Copyright © 2015 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
 // Portions contributed by others as indicated. All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
@@ -54,7 +54,7 @@
 // The ACES Container Writer is provided by Adobe Systems Incorporated under the 
 // following terms and conditions:
 // 
-// Copyright © 2013 Adobe Systems Incorporated ("Adobe"). All rights reserved.
+// Copyright © 2015 Adobe Systems Incorporated ("Adobe"). All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
 // derivatives, and use, in source and binary forms, is hereby granted, subject 

diff --git a/aces_log.h b/aces_log.h
@@ -1,4 +1,4 @@
-// Copyright © 2013 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
+// Copyright © 2015 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
 // Portions contributed by others as indicated. All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
@@ -54,7 +54,7 @@
 // The ACES Container Writer is provided by Adobe Systems Incorporated under the 
 // following terms and conditions:
 // 
-// Copyright © 2013 Adobe Systems Incorporated ("Adobe"). All rights reserved.
+// Copyright © 2015 Adobe Systems Incorporated ("Adobe"). All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
 // derivatives, and use, in source and binary forms, is hereby granted, subject 

diff --git a/aces_md5.cc b/aces_md5.cc
@@ -1,4 +1,4 @@
-// Copyright © 2013 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
+// Copyright © 2015 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
 // Portions contributed by others as indicated. All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
@@ -54,7 +54,7 @@
 // The ACES Container Writer is provided by Adobe Systems Incorporated under the 
 // following terms and conditions:
 // 
-// Copyright © 2013 Adobe Systems Incorporated ("Adobe"). All rights reserved.
+// Copyright © 2015 Adobe Systems Incorporated ("Adobe"). All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
 // derivatives, and use, in source and binary forms, is hereby granted, subject 

diff --git a/aces_md5.hh b/aces_md5.hh
@@ -1,4 +1,4 @@
-// Copyright © 2013 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
+// Copyright © 2015 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
 // Portions contributed by others as indicated. All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
@@ -54,7 +54,7 @@
 // The ACES Container Writer is provided by Adobe Systems Incorporated under the 
 // following terms and conditions:
 // 
-// Copyright © 2013 Adobe Systems Incorporated ("Adobe"). All rights reserved.
+// Copyright © 2015 Adobe Systems Incorporated ("Adobe"). All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
 // derivatives, and use, in source and binary forms, is hereby granted, subject 

diff --git a/aces_timing.cpp b/aces_timing.cpp
@@ -1,4 +1,4 @@
-// Copyright © 2013 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
+// Copyright © 2015 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
 // Portions contributed by others as indicated. All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
@@ -54,7 +54,7 @@
 // The ACES Container Writer is provided by Adobe Systems Incorporated under the 
 // following terms and conditions:
 // 
-// Copyright © 2013 Adobe Systems Incorporated ("Adobe"). All rights reserved.
+// Copyright © 2015 Adobe Systems Incorporated ("Adobe"). All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
 // derivatives, and use, in source and binary forms, is hereby granted, subject 

diff --git a/aces_timing.h b/aces_timing.h
@@ -1,4 +1,4 @@
-// Copyright © 2013 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
+// Copyright © 2015 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
 // Portions contributed by others as indicated. All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
@@ -54,7 +54,7 @@
 // The ACES Container Writer is provided by Adobe Systems Incorporated under the 
 // following terms and conditions:
 // 
-// Copyright © 2013 Adobe Systems Incorporated ("Adobe"). All rights reserved.
+// Copyright © 2015 Adobe Systems Incorporated ("Adobe"). All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
 // derivatives, and use, in source and binary forms, is hereby granted, subject 

diff --git a/aces_types.h b/aces_types.h
@@ -1,4 +1,4 @@
-// Copyright © 2013 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
+// Copyright © 2015 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
 // Portions contributed by others as indicated. All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
@@ -54,7 +54,7 @@
 // The ACES Container Writer is provided by Adobe Systems Incorporated under the 
 // following terms and conditions:
 // 
-// Copyright © 2013 Adobe Systems Incorporated ("Adobe"). All rights reserved.
+// Copyright © 2015 Adobe Systems Incorporated ("Adobe"). All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
 // derivatives, and use, in source and binary forms, is hereby granted, subject 

diff --git a/aces_typesAndRationals.cpp b/aces_typesAndRationals.cpp
@@ -1,4 +1,4 @@
-// Copyright © 2013 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
+// Copyright © 2015 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
 // Portions contributed by others as indicated. All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
@@ -54,7 +54,7 @@
 // The ACES Container Writer is provided by Adobe Systems Incorporated under the 
 // following terms and conditions:
 // 
-// Copyright © 2013 Adobe Systems Incorporated ("Adobe"). All rights reserved.
+// Copyright © 2015 Adobe Systems Incorporated ("Adobe"). All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
 // derivatives, and use, in source and binary forms, is hereby granted, subject 

diff --git a/aces_typesAndRationals.h b/aces_typesAndRationals.h
@@ -1,4 +1,4 @@
-// Copyright © 2013 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
+// Copyright © 2015 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S.").
 // Portions contributed by others as indicated. All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
@@ -54,7 +54,7 @@
 // The ACES Container Writer is provided by Adobe Systems Incorporated under the 
 // following terms and conditions:
 // 
-// Copyright © 2013 Adobe Systems Incorporated ("Adobe"). All rights reserved.
+// Copyright © 2015 Adobe Systems Incorporated ("Adobe"). All rights reserved.
 // 
 // A worldwide, royalty-free, non-exclusive right to copy, modify, create
 // derivatives, and use, in source and binary forms, is hereby granted, subject