Skip to content

Commit 3a39d64

Browse files
authored
Merge branch 'RB-10.5' into ieCortexUpdates
2 parents 9ead39d + de33eeb commit 3a39d64

File tree

2 files changed

+27
-0
lines changed

2 files changed

+27
-0
lines changed

Changes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
Improvements
55
------------
66

7+
- OpenImageIOAlgo::DataView : Added support for Int64Data, UInt64Data, Int64VectorData and UInt64VectorData.
78
- IECoreHoudini : Updated to support Houdini 20.0 and 20.5.
89
- IECoreMaya : Avoid compilation warnings with new gcc.
910

src/IECoreImage/OpenImageIOAlgo.cpp

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,14 @@ DataView::DataView( const IECore::Data *d, bool createUStrings )
347347
type = TypeDesc::TypeInt;
348348
data = static_cast<const IntData *>( d )->baseReadable();
349349
break;
350+
case UInt64DataTypeId :
351+
type = TypeDesc::UINT64;
352+
data = static_cast<const UInt64Data *>( d )->baseReadable();
353+
break;
354+
case Int64DataTypeId :
355+
type = TypeDesc::INT64;
356+
data = static_cast<const Int64Data *>( d )->baseReadable();
357+
break;
350358
case FloatDataTypeId :
351359
type = TypeDesc::TypeFloat;
352360
data = static_cast<const FloatData *>( d )->baseReadable();
@@ -471,6 +479,24 @@ DataView::DataView( const IECore::Data *d, bool createUStrings )
471479
);
472480
data = static_cast<const UIntVectorData *>( d )->baseReadable();
473481
break;
482+
case UInt64VectorDataTypeId :
483+
type = TypeDesc(
484+
TypeDesc::UINT64,
485+
TypeDesc::SCALAR,
486+
TypeDesc::NOSEMANTICS,
487+
static_cast<const UInt64VectorData *>( d )->readable().size()
488+
);
489+
data = static_cast<const UInt64VectorData *>( d )->baseReadable();
490+
break;
491+
case Int64VectorDataTypeId :
492+
type = TypeDesc(
493+
TypeDesc::INT64,
494+
TypeDesc::SCALAR,
495+
TypeDesc::NOSEMANTICS,
496+
static_cast<const Int64VectorData *>( d )->readable().size()
497+
);
498+
data = static_cast<const Int64VectorData *>( d )->baseReadable();
499+
break;
474500
case CharVectorDataTypeId :
475501
type = TypeDesc(
476502
TypeDesc::CHAR,

0 commit comments

Comments
 (0)