update

NatronGitHub · Mar 14, 2018 · e1bceec · e1bceec
1 parent 9c2a1c2
commit e1bceec
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/Arena.xcodeproj/project.pbxproj b/Arena.xcodeproj/project.pbxproj
@@ -5901,9 +5901,9 @@
 					"-llzma",
 					"-llcms2",
 					"-L$(MAGICK_PATH)/lib",
-					"-lMagick++-6.Q32HDRI",
-					"-lMagickWand-6.Q32HDRI",
-					"-lMagickCore-6.Q32HDRI",
+					"-lMagick++-7.Q16HDRI",
+					"-lMagickWand-7.Q16HDRI",
+					"-lMagickCore-7.Q16HDRI",
 					"-L$(OCIO_PATH)/lib",
 					"-lOpenColorIO",
 					"-L$(GETTEXT_PATH)/lib",
@@ -5981,9 +5981,9 @@
 					"-llzma",
 					"-llcms2",
 					"-L$(MAGICK_PATH)/lib",
-					"-lMagick++-6.Q32HDRI",
-					"-lMagickWand-6.Q32HDRI",
-					"-lMagickCore-6.Q32HDRI",
+					"-lMagick++-7.Q16HDRI",
+					"-lMagickWand-7.Q16HDRI",
+					"-lMagickCore-7.Q16HDRI",
 					"-L$(OCIO_PATH)/lib",
 					"-lOpenColorIO",
 					"-L$(GETTEXT_PATH)/lib",

diff --git a/OpenFX-IO b/OpenFX-IO
diff --git a/SupportExt b/SupportExt
+8 −7		FFmpeg/FFmpegFile.cpp
+1 −1		FFmpeg/FFmpegFile.h
+19 −3		FFmpeg/WriteFFmpeg.cpp
+7 −4		IOSupport/GenericReader.cpp
+1 −0		IOSupport/GenericReader.h
+7 −1		OCIO/OCIOCDLTransform.cpp
+7 −1		OCIO/OCIOColorSpace.cpp
+7 −1		OCIO/OCIODisplay.cpp
+7 −1		OCIO/OCIOFileTransform.cpp
+7 −1		OCIO/OCIOLogConvert.cpp
+7 −1		OCIO/OCIOLookTransform.cpp
+15 −6		OIIO/ReadOIIO.cpp
+1 −0		OIIO/WriteOIIO.cpp
+37 −6		RunScript/RunScript.cpp
+73 −85		RunScript/pstream.h
+1 −1		SupportExt
+3 −2		ofxsGenerator.cpp
+7 −0		ofxsGenerator.h
+133 −29		ofxsMultiPlane.cpp