Merge branch 'RB-10.5' into ieCortexUpdates

ImageEngine · Nov 4, 2024 · 3a39d64 · 3a39d64
2 parents 9ead39d + de33eeb
commit 3a39d64
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/Changes b/Changes
@@ -4,6 +4,7 @@
 Improvements
 ------------
 
+- OpenImageIOAlgo::DataView : Added support for Int64Data, UInt64Data, Int64VectorData and UInt64VectorData.
 - IECoreHoudini : Updated to support Houdini 20.0 and 20.5.
 - IECoreMaya : Avoid compilation warnings with new gcc.
 

diff --git a/src/IECoreImage/OpenImageIOAlgo.cpp b/src/IECoreImage/OpenImageIOAlgo.cpp
@@ -347,6 +347,14 @@ DataView::DataView( const IECore::Data *d, bool createUStrings )
 			type = TypeDesc::TypeInt;
 			data = static_cast<const IntData *>( d )->baseReadable();
 			break;
+		case UInt64DataTypeId :
+			type = TypeDesc::UINT64;
+			data = static_cast<const UInt64Data *>( d )->baseReadable();
+			break;
+		case Int64DataTypeId :
+			type = TypeDesc::INT64;
+			data = static_cast<const Int64Data *>( d )->baseReadable();
+			break;
 		case FloatDataTypeId :
 			type = TypeDesc::TypeFloat;
 			data = static_cast<const FloatData *>( d )->baseReadable();
@@ -471,6 +479,24 @@ DataView::DataView( const IECore::Data *d, bool createUStrings )
 			);
 			data = static_cast<const UIntVectorData *>( d )->baseReadable();
 			break;
+		case UInt64VectorDataTypeId :
+			type = TypeDesc(
+				TypeDesc::UINT64,
+				TypeDesc::SCALAR,
+				TypeDesc::NOSEMANTICS,
+				static_cast<const UInt64VectorData *>( d )->readable().size()
+			);
+			data = static_cast<const UInt64VectorData *>( d )->baseReadable();
+			break;
+		case Int64VectorDataTypeId :
+			type = TypeDesc(
+				TypeDesc::INT64,
+				TypeDesc::SCALAR,
+				TypeDesc::NOSEMANTICS,
+				static_cast<const Int64VectorData *>( d )->readable().size()
+			);
+			data = static_cast<const Int64VectorData *>( d )->baseReadable();
+			break;
 		case CharVectorDataTypeId :
 			type = TypeDesc(
 				TypeDesc::CHAR,