Skip to content

Commit cbfcd73

Browse files
committed
Fix pending change spelling
Fix int/uint mismatch with nanovdb Fix mFlags mismatch with nanovdb. Signed-off-by: Jeff Lait <jlait@andorra.sidefx.com>
1 parent b575a42 commit cbfcd73

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

nanovdb/nanovdb/CNanoVDB.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ typedef struct
220220
{
221221
int64_t mByteOffset; // byte offset to the blind data, relative to the GridData.
222222
uint64_t mElementCount; // number of elements, e.g. point count
223-
uint32_t mFlags; // flags
223+
uint32_t mValueSize; // byte size of each value, etc.
224224
uint32_t mSemantic; // semantic meaning of the data.
225225
uint32_t mDataClass; // 4 bytes
226226
uint32_t mDataType; // 4 bytes
@@ -244,8 +244,8 @@ typedef struct
244244
double mVoxelSize[3]; // 24B. size of a voxel in world units
245245
uint32_t mGridClass; // 4B.
246246
uint32_t mGridType; // 4B.
247-
uint64_t mBlindMetadataOffset; // 8B. offset of GridBlindMetaData structures.
248-
int32_t mBlindMetadataCount; // 4B. count of GridBlindMetaData structures.
247+
int64_t mBlindMetadataOffset; // 8B. offset of GridBlindMetaData structures.
248+
uint32_t mBlindMetadataCount; // 4B. count of GridBlindMetaData structures.
249249

250250
// Total 652: misaligned by 20.
251251
// uint32_t _reserved[CNANOVDB_ALIGNMENT_PADDING(8 + 8 + 4 + 4 + 4 + 4 + 8 + 256 + 24 + 24 + sizeof(cnanovdb_map) + 24 + 4 + 4 + 8 + 4, CNANOVDB_DATA_ALIGNMENT) / 4];

pendingchanges/cnanonsize.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ NanoVDB:
77
Bug Fixes:
88
- static used for local kernel methods in CNanoVDB
99
- Remove auto-computed reserved sizes in favour of hard coded sizes
10-
in CNanoVDB. While less maintainble, C99 forbids zero sized
10+
in CNanoVDB. While less maintainable, C99 forbids zero sized
1111
arrays so some compilers crashed when encountering this.
1212
- Initialize key value when constructing an accessor, some compilers
1313
entered bad states with this undefined.

0 commit comments

Comments
 (0)