Skip to content

Commit b130361

Browse files
anderslanglandsanderslanglands
committed
update tests
1 parent f713aab commit b130361

File tree

9 files changed

+44
-38
lines changed

9 files changed

+44
-38
lines changed

‎test/imath/ref/ast/imath_vec.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
"params": [
125125
{
126126
"index": 0,
127-
"name": "v",
127+
"name": "rhs",
128128
"type": {
129129
"kind": "Reference",
130130
"id": 2,
@@ -583,7 +583,7 @@
583583
"params": [
584584
{
585585
"index": 0,
586-
"name": "v",
586+
"name": "rhs",
587587
"type": {
588588
"kind": "Reference",
589589
"id": 15,

‎test/imath/ref/imath-c/imath_vec.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ void Imath_2_5__Vec3_float__Vec3(
1111

1212
void Imath_2_5__Vec3_float__Vec3_1(
1313
Imath_V3f_t * this_
14-
, Imath_V3f_t const * v)
14+
, Imath_V3f_t const * rhs)
1515
{
16-
new (this_) Imath_2_5::Vec3<float>(to_cpp_ref(v));
16+
new (this_) Imath_2_5::Vec3<float>(to_cpp_ref(rhs));
1717
}
1818

1919
void Imath_2_5__Vec3_float__setValue(
@@ -78,9 +78,9 @@ void Imath_2_5__Vec3_int__Vec3(
7878

7979
void Imath_2_5__Vec3_int__Vec3_1(
8080
Imath_V3i_t * this_
81-
, Imath_V3i_t const * v)
81+
, Imath_V3i_t const * rhs)
8282
{
83-
new (this_) Imath_2_5::Vec3<int>(to_cpp_ref(v));
83+
new (this_) Imath_2_5::Vec3<int>(to_cpp_ref(rhs));
8484
}
8585

8686
int Imath_2_5__Vec3_int__dot(

‎test/imath/ref/imath-c/imath_vec.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ void Imath_2_5__Vec3_float__Vec3(
3131

3232
void Imath_2_5__Vec3_float__Vec3_1(
3333
Imath_V3f_t * this_
34-
, Imath_V3f_t const * v);
34+
, Imath_V3f_t const * rhs);
3535

3636
#define Imath_V3f_Vec3_1 Imath_2_5__Vec3_float__Vec3_1
3737

@@ -117,7 +117,7 @@ void Imath_2_5__Vec3_int__Vec3(
117117

118118
void Imath_2_5__Vec3_int__Vec3_1(
119119
Imath_V3i_t * this_
120-
, Imath_V3i_t const * v);
120+
, Imath_V3i_t const * rhs);
121121

122122
#define Imath_V3i_Vec3_1 Imath_2_5__Vec3_int__Vec3_1
123123

‎test/imath/ref/imath-sys/src/imath_box.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ use std::os::raw::*;
88
#[repr(C, align(4))]
99
#[derive(Clone)]
1010
pub struct Imath_2_5__Box_Imath__Vec3_float___t {
11-
min: Imath_V3f_t,
12-
max: Imath_V3f_t,
11+
pub min: Imath_V3f_t,
12+
pub max: Imath_V3f_t,
1313
}
1414

1515
#[repr(C, align(4))]
1616
#[derive(Clone)]
1717
pub struct Imath_2_5__Box_Imath__Vec3_int___t {
18-
min: Imath_V3i_t,
19-
max: Imath_V3i_t,
18+
pub min: Imath_V3i_t,
19+
pub max: Imath_V3i_t,
2020
}
2121

2222

‎test/imath/ref/imath-sys/src/imath_vec.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,25 @@ use std::os::raw::*;
88
#[repr(C, align(4))]
99
#[derive(Clone)]
1010
pub struct Imath_2_5__Vec3_float__t {
11-
x: c_float,
12-
y: c_float,
13-
z: c_float,
11+
pub x: c_float,
12+
pub y: c_float,
13+
pub z: c_float,
1414
}
1515

1616
#[repr(C, align(4))]
1717
#[derive(Clone)]
1818
pub struct Imath_2_5__Vec3_int__t {
19-
x: c_int,
20-
y: c_int,
21-
z: c_int,
19+
pub x: c_int,
20+
pub y: c_int,
21+
pub z: c_int,
2222
}
2323

2424

2525

2626
extern "C" {
2727

2828
pub fn Imath_2_5__Vec3_float__Vec3(this_: *mut Imath_V3f_t) -> c_void;
29-
pub fn Imath_2_5__Vec3_float__Vec3_1(this_: *mut Imath_V3f_t, v: *const Imath_V3f_t) -> c_void;
29+
pub fn Imath_2_5__Vec3_float__Vec3_1(this_: *mut Imath_V3f_t, rhs: *const Imath_V3f_t) -> c_void;
3030
pub fn Imath_2_5__Vec3_float__setValue(this_: *mut Imath_V3f_t, a: c_float, b: c_float, c: c_float) -> c_void;
3131
pub fn Imath_2_5__Vec3_float__dot(this_: *const Imath_V3f_t, v: *const Imath_V3f_t) -> c_float;
3232
pub fn Imath_2_5__Vec3_float__cross(this_: *const Imath_V3f_t, v: *const Imath_V3f_t) -> Imath_V3f_t;
@@ -36,7 +36,7 @@ pub fn Imath_2_5__Vec3_float__length2(this_: *const Imath_V3f_t) -> c_float;
3636
pub fn Imath_2_5__Vec3_float__normalize(this_: *mut Imath_V3f_t) -> *const Imath_V3f_t;
3737
pub fn Imath_2_5__Vec3_float__normalized(this_: *const Imath_V3f_t) -> Imath_V3f_t;
3838
pub fn Imath_2_5__Vec3_int__Vec3(this_: *mut Imath_V3i_t) -> c_void;
39-
pub fn Imath_2_5__Vec3_int__Vec3_1(this_: *mut Imath_V3i_t, v: *const Imath_V3i_t) -> c_void;
39+
pub fn Imath_2_5__Vec3_int__Vec3_1(this_: *mut Imath_V3i_t, rhs: *const Imath_V3i_t) -> c_void;
4040
pub fn Imath_2_5__Vec3_int__dot(this_: *const Imath_V3i_t, v: *const Imath_V3i_t) -> c_int;
4141
pub fn Imath_2_5__Vec3_int__cross(this_: *const Imath_V3i_t, v: *const Imath_V3i_t) -> Imath_V3i_t;
4242
pub fn Imath_2_5__Vec3_int__op_iadd(this_: *mut Imath_V3i_t, v: *const Imath_V3i_t) -> *const Imath_V3i_t;

‎test/oiio/ref/ast/c-imageio.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1632,7 +1632,7 @@
16321632
"params": [
16331633
{
16341634
"index": 0,
1635-
"name": "",
1635+
"name": "_param0",
16361636
"type": {
16371637
"kind": "RecordType",
16381638
"id": 8,
@@ -1644,7 +1644,7 @@
16441644
},
16451645
{
16461646
"index": 1,
1647-
"name": "",
1647+
"name": "_param1",
16481648
"type": {
16491649
"kind": "BuiltinType",
16501650
"id": 14,
@@ -1655,7 +1655,7 @@
16551655
},
16561656
{
16571657
"index": 2,
1658-
"name": "",
1658+
"name": "_param2",
16591659
"type": {
16601660
"kind": "Pointer",
16611661
"id": 119,
@@ -1673,7 +1673,7 @@
16731673
},
16741674
{
16751675
"index": 3,
1676-
"name": "",
1676+
"name": "_param3",
16771677
"type": {
16781678
"kind": "Pointer",
16791679
"id": 121,
@@ -1691,7 +1691,7 @@
16911691
},
16921692
{
16931693
"index": 4,
1694-
"name": "",
1694+
"name": "_param4",
16951695
"type": {
16961696
"kind": "RecordType",
16971697
"id": 8,

‎test/oiio/ref/oiio-sys/src/c_filesystem.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ impl Default for OpenImageIO_v2_2__Filesystem__IOMemReader_t {
3131

3232

3333
#[repr(transparent)]
34+
#[derive(Debug, Copy, Clone)]
3435
pub struct OpenImageIO_v2_2__Filesystem__IOProxy__Mode_e(pub u32);
3536
pub const OIIO_Filesystem_IOProxy_Mode_Closed: OpenImageIO_v2_2__Filesystem__IOProxy__Mode_e = OpenImageIO_v2_2__Filesystem__IOProxy__Mode_e(0);
3637
pub const OIIO_Filesystem_IOProxy_Mode_Read: OpenImageIO_v2_2__Filesystem__IOProxy__Mode_e = OpenImageIO_v2_2__Filesystem__IOProxy__Mode_e(114);

‎test/oiio/ref/oiio-sys/src/c_imageio.rs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ use std::os::raw::*;
88
#[repr(C, align(4))]
99
#[derive(Clone)]
1010
pub struct OpenImageIO_v2_2__ROI_t {
11-
xbegin: c_int,
12-
xend: c_int,
13-
ybegin: c_int,
14-
yend: c_int,
15-
zbegin: c_int,
16-
zend: c_int,
17-
chbegin: c_int,
18-
chend: c_int,
11+
pub xbegin: c_int,
12+
pub xend: c_int,
13+
pub ybegin: c_int,
14+
pub yend: c_int,
15+
pub zbegin: c_int,
16+
pub zend: c_int,
17+
pub chbegin: c_int,
18+
pub chend: c_int,
1919
}
2020

2121
#[repr(C, align(8))]
@@ -44,11 +44,13 @@ impl Default for OpenImageIO_v2_2__ImageInput_t {
4444

4545

4646
#[repr(transparent)]
47+
#[derive(Debug, Copy, Clone)]
4748
pub struct OpenImageIO_v2_2__ImageSpec__SerialFormat_e(pub u32);
4849
pub const OIIO_ImageSpec_SerialFormat_SerialText: OpenImageIO_v2_2__ImageSpec__SerialFormat_e = OpenImageIO_v2_2__ImageSpec__SerialFormat_e(0);
4950
pub const OIIO_ImageSpec_SerialFormat_SerialXML: OpenImageIO_v2_2__ImageSpec__SerialFormat_e = OpenImageIO_v2_2__ImageSpec__SerialFormat_e(1);
5051

5152
#[repr(transparent)]
53+
#[derive(Debug, Copy, Clone)]
5254
pub struct OpenImageIO_v2_2__ImageSpec__SerialVerbose_e(pub u32);
5355
pub const OIIO_ImageSpec_SerialVerbose_SerialBrief: OpenImageIO_v2_2__ImageSpec__SerialVerbose_e = OpenImageIO_v2_2__ImageSpec__SerialVerbose_e(0);
5456
pub const OIIO_ImageSpec_SerialVerbose_SerialDetailed: OpenImageIO_v2_2__ImageSpec__SerialVerbose_e = OpenImageIO_v2_2__ImageSpec__SerialVerbose_e(1);

‎test/oiio/ref/oiio-sys/src/c_typedesc.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,16 @@ use std::os::raw::*;
88
#[repr(C, align(4))]
99
#[derive(Clone)]
1010
pub struct OpenImageIO_v2_2__TypeDesc_t {
11-
basetype: c_uchar,
12-
aggregate: c_uchar,
13-
vecsemantics: c_uchar,
14-
reserved: c_uchar,
15-
arraylen: c_int,
11+
pub basetype: c_uchar,
12+
pub aggregate: c_uchar,
13+
pub vecsemantics: c_uchar,
14+
pub reserved: c_uchar,
15+
pub arraylen: c_int,
1616
}
1717

1818

1919
#[repr(transparent)]
20+
#[derive(Debug, Copy, Clone)]
2021
pub struct OpenImageIO_v2_2__TypeDesc__BASETYPE_e(pub u32);
2122
pub const OIIO_TypeDesc_BASETYPE_CHAR: OpenImageIO_v2_2__TypeDesc__BASETYPE_e = OpenImageIO_v2_2__TypeDesc__BASETYPE_e(3);
2223
pub const OIIO_TypeDesc_BASETYPE_DOUBLE: OpenImageIO_v2_2__TypeDesc__BASETYPE_e = OpenImageIO_v2_2__TypeDesc__BASETYPE_e(12);
@@ -44,6 +45,7 @@ pub const OIIO_TypeDesc_BASETYPE_UNKNOWN: OpenImageIO_v2_2__TypeDesc__BASETYPE_e
4445
pub const OIIO_TypeDesc_BASETYPE_USHORT: OpenImageIO_v2_2__TypeDesc__BASETYPE_e = OpenImageIO_v2_2__TypeDesc__BASETYPE_e(4);
4546

4647
#[repr(transparent)]
48+
#[derive(Debug, Copy, Clone)]
4749
pub struct OpenImageIO_v2_2__TypeDesc__AGGREGATE_e(pub u32);
4850
pub const OIIO_TypeDesc_AGGREGATE_MATRIX33: OpenImageIO_v2_2__TypeDesc__AGGREGATE_e = OpenImageIO_v2_2__TypeDesc__AGGREGATE_e(9);
4951
pub const OIIO_TypeDesc_AGGREGATE_MATRIX44: OpenImageIO_v2_2__TypeDesc__AGGREGATE_e = OpenImageIO_v2_2__TypeDesc__AGGREGATE_e(16);
@@ -53,6 +55,7 @@ pub const OIIO_TypeDesc_AGGREGATE_VEC3: OpenImageIO_v2_2__TypeDesc__AGGREGATE_e
5355
pub const OIIO_TypeDesc_AGGREGATE_VEC4: OpenImageIO_v2_2__TypeDesc__AGGREGATE_e = OpenImageIO_v2_2__TypeDesc__AGGREGATE_e(4);
5456

5557
#[repr(transparent)]
58+
#[derive(Debug, Copy, Clone)]
5659
pub struct OpenImageIO_v2_2__TypeDesc__VECSEMANTICS_e(pub u32);
5760
pub const OIIO_TypeDesc_VECSEMANTICS_COLOR: OpenImageIO_v2_2__TypeDesc__VECSEMANTICS_e = OpenImageIO_v2_2__TypeDesc__VECSEMANTICS_e(1);
5861
pub const OIIO_TypeDesc_VECSEMANTICS_KEYCODE: OpenImageIO_v2_2__TypeDesc__VECSEMANTICS_e = OpenImageIO_v2_2__TypeDesc__VECSEMANTICS_e(6);

0 commit comments

Comments
 (0)