Merge pull request #1352 from johnhaddon/imath3MacFixes

OpenEXR3/MacOS fixes

Author: ericmehl

include/IECore/IndexedIO.inl

@@ -516,7 +516,7 @@ struct IndexedIO::DataFlattenTraits<std::string*>
 		{
 			size_t stringLength = x[i].size();
 
-			IndexedIODetail::Writer<IndexedIODetail::MemoryStreamIO, IndexedIODetail::OutputMemoryStream, size_t>::write (mstream, stringLength);
+			IndexedIODetail::Writer<IndexedIODetail::MemoryStreamIO, IndexedIODetail::OutputMemoryStream, uint64_t>::write (mstream, stringLength);
 
 			memcpy( mstream.next(), x[i].c_str(), stringLength );
 
@@ -535,8 +535,8 @@ struct IndexedIO::DataFlattenTraits<std::string*>
 
 		for (size_t i = 0; i < arrayLength; i++)
 		{
-			size_t stringLength = 0;
-			IndexedIODetail::Reader<IndexedIODetail::MemoryStreamIO, IndexedIODetail::InputMemoryStream, size_t>::read (mstream, stringLength);
+			uint64_t stringLength = 0;
+			IndexedIODetail::Reader<IndexedIODetail::MemoryStreamIO, IndexedIODetail::InputMemoryStream, uint64_t>::read (mstream, stringLength);
 
 			dst[i] = std::string(mstream.next(), stringLength);
 			assert(dst[i].size() == stringLength);

include/IECore/MatrixInterpolator.inl

@@ -78,7 +78,7 @@ struct LinearInterpolator< Imath::Matrix44<T> >
 
 		Imath::Vec3<T> s0( 1 ), s1( 1 ), sx( 1 );
 		Imath::Vec3<T> h0( 0 ), h1( 0 ), hx( 0 );
-		Imath::Vec3<T> r0( 0 ), r1( 0 ), rx( 0 );
+		Imath::Vec3<T> r0( 0 ), r1( 0 );
 		Imath::Vec3<T> t0( 0 ), t1( 0 ), tx( 0 );
 
 		extractSHRT(y0, s0, h0, r0, t0);