Fixing IMG_DeepShadow interface changes

Author: andrewkaufman

src/IECoreHoudini/RATDeepImageReader.cpp

@@ -36,6 +36,7 @@
 
 #include "UT/UT_Matrix.h"
 #include "UT/UT_Options.h"
+#include "UT/UT_Version.h"
 
 #include "IECore/FileNameParameter.h"
 
@@ -76,9 +77,18 @@ RATDeepImageReader::~RATDeepImageReader()
 bool RATDeepImageReader::canRead( const std::string &fileName )
 {
 	IMG_DeepShadow file;
-	
+
+#if UT_MAJOR_VERSION_INT >= 13
+
+	if ( file.open( fileName.c_str() ) && file.getDepthInterp() == IMG_DI_DISCRETE )
+
+#else
+
 	if ( file.open( fileName.c_str() ) && file.depthInterp() == IMG_COMPRESS_DISCRETE )
+
+#endif
 	{
+		file.close();
 		return true;
 	}
 
@@ -188,7 +198,16 @@ bool RATDeepImageReader::open( bool throwOnFailure )
 	m_worldToNDC = Imath::M44f();
 
 	bool success = true;
+	
+#if UT_MAJOR_VERSION_INT >= 13
+
+	if ( m_inputFile->open( fileName().c_str() ) && m_inputFile->getDepthInterp() == IMG_DI_DISCRETE )
+
+#else
+
 	if ( m_inputFile->open( fileName().c_str() ) && m_inputFile->depthInterp() == IMG_COMPRESS_DISCRETE )
+
+#endif
 	{
 		m_inputFileName = fileName();
 		m_ratPixel = new IMG_DeepPixelReader( *m_inputFile );
@@ -244,7 +263,17 @@ bool RATDeepImageReader::open( bool throwOnFailure )
 		// applying a matrix that seems to fix the issues in several examples
 		Imath::M44f fix;
 		fix.makeIdentity();
+		
+#if UT_MAJOR_VERSION_INT >= 13
+
+		UT_SharedPtr<UT_Options> options = m_inputFile->getTextureOptions();
+
+#else
+
 		UT_Options *options = m_inputFile->getTBFOptions();
+
+#endif
+
 		if ( options->hasOption( "camera:clip" ) )
 		{
 			const UT_Vector2D clip = options->getOptionV2( "camera:clip" );

src/IECoreHoudini/RATDeepImageWriter.cpp

@@ -36,6 +36,7 @@
 
 #include "UT/UT_Matrix.h"
 #include "UT/UT_Options.h"
+#include "UT/UT_Version.h"
 
 #include "IECore/CompoundParameter.h"
 #include "IECore/FileNameParameter.h"
@@ -73,7 +74,17 @@ RATDeepImageWriter::~RATDeepImageWriter()
 
 bool RATDeepImageWriter::canWrite( const std::string &fileName )
 {
+
+#if UT_MAJOR_VERSION_INT >= 13
+
+	return IMG_DeepShadow().create( fileName.c_str(), 2, 2 );
+
+#else
+
 	return IMG_DeepShadow().open( fileName.c_str(), 2, 2 );
+
+#endif
+
 }
 
 void RATDeepImageWriter::doWritePixel( int x, int y, const DeepPixel *pixel )
@@ -186,12 +197,31 @@ void RATDeepImageWriter::open()
 
 	const Imath::V2i &resolution = m_resolutionParameter->getTypedValue();
 
-	if ( m_outputFile->open( fileName().c_str(), resolution.x, resolution.y ) )
+#if UT_MAJOR_VERSION_INT >= 13
+
+	bool success = m_outputFile->create( fileName().c_str(), resolution.x, resolution.y );
+	
+#else
+
+	bool success = m_outputFile->open( fileName().c_str(), resolution.x, resolution.y );
+
+#endif
+
+	if ( success )
 	{
 		m_outputFileName = fileName();
 
-		// set the worldToCamera matrix
+#if UT_MAJOR_VERSION_INT >= 13
+
+		UT_SharedPtr<UT_Options> options = m_outputFile->getTextureOptions();
+
+#else
+
 		UT_Options *options = m_outputFile->getTBFOptions();
+
+#endif
+
+		// set the worldToCamera matrix
 		options->setOptionM4( "space:world", IECore::convert<UT_Matrix4>( worldToCameraParameter()->getTypedValue() ) );
 
 		/// \todo: set the cameraToNDC parameters