IECoreImage : Adapt for OIIO 3.0 TypeDesc changes

The type aliases nested in the TypeDesc class have been removed. Both OIIO 2 and 3 have namespace-level equivalents, so the new code will compile with both.

Author: johnhaddon

src/IECoreImage/ImageReader.cpp

@@ -461,7 +461,7 @@ class ImageReader::Implementation
 					m_inputFileName,
 					0, miplevel(), // subimage, miplevel
 					ustring( "fileformat" ),
-					TypeDesc::TypeString, &fileFormat
+					OIIO::TypeString, &fileFormat
 				);
 
 				if( strcmp( fileFormat, "png" ) == 0 )

src/IECoreImage/OpenImageIOAlgo.cpp

@@ -318,7 +318,7 @@ DataView::DataView( const IECore::Data *d, bool createUStrings )
 			data = static_cast<const UCharData *>( d )->baseReadable();
 			break;
 		case StringDataTypeId :
-			type = TypeDesc::TypeString;
+			type = OIIO::TypeString;
 			m_charPointers.resize(1);
 			m_charPointers[0] = static_cast<const StringData *>( d )->readable().c_str();
 			if( createUStrings )
@@ -344,7 +344,7 @@ DataView::DataView( const IECore::Data *d, bool createUStrings )
 			data = static_cast<const HalfData *>( d )->baseReadable();
 			break;
 		case IntDataTypeId :
-			type = TypeDesc::TypeInt;
+			type = OIIO::TypeInt;
 			data = static_cast<const IntData *>( d )->baseReadable();
 			break;
 		case UInt64DataTypeId :
@@ -356,7 +356,7 @@ DataView::DataView( const IECore::Data *d, bool createUStrings )
 			data = static_cast<const Int64Data *>( d )->baseReadable();
 			break;
 		case FloatDataTypeId :
-			type = TypeDesc::TypeFloat;
+			type = OIIO::TypeFloat;
 			data = static_cast<const FloatData *>( d )->baseReadable();
 			break;
 		case DoubleDataTypeId :
@@ -420,15 +420,15 @@ DataView::DataView( const IECore::Data *d, bool createUStrings )
 			data = static_cast<const M44dData *>( d )->baseReadable();
 			break;
 		case Color3fDataTypeId :
-			type = TypeDesc::TypeColor;
+			type = OIIO::TypeColor;
 			data = static_cast<const Color3fData *>( d )->baseReadable();
 			break;
 		case Color4fDataTypeId :
 			type = TypeDesc( TypeDesc::FLOAT, TypeDesc::VEC4, TypeDesc::COLOR );
 			data = static_cast<const Color4fData *>( d )->baseReadable();
 			break;
 		case TimeCodeDataTypeId :
-			type = TypeDesc::TypeTimeCode;
+			type = OIIO::TypeTimeCode;
 			data = static_cast<const TimeCodeData *>( d )->baseReadable();
 			break;