Skip to content

Commit f26a401

Browse files
fixup! fixup! 🔖 17-0.33.3
1 parent 0cfc1c5 commit f26a401

1 file changed

Lines changed: 18 additions & 17 deletions

File tree

scs2-session-logger/src/main/java/us/ihmc/scs2/session/mcap/encoding/CDRDeserializer.java

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package us.ihmc.scs2.session.mcap.encoding;
22

3-
import us.ihmc.fastddsjava.pointers.fastddsjava;
3+
import us.ihmc.fastddsjava.cdr.CDRBuffer;
4+
import us.ihmc.fastddsjava.natives.fastddsjava;
45
import us.ihmc.log.LogTools;
56

67
import java.nio.ByteBuffer;
@@ -23,6 +24,7 @@ public enum Type
2324
BOOLEAN(1, -1),
2425
FLOAT(Float.BYTES, 4),
2526
FLOAT32(Float.BYTES, 4),
27+
2628
DOUBLE(Double.BYTES, 8),
2729
FLOAT64(Double.BYTES, 8),
2830
CHAR(Byte.BYTES, -1),
@@ -140,7 +142,7 @@ private static void readEncapsulation(ByteBuffer buffer)
140142
* Reads a boolean {@code bool} from the buffer.
141143
*
142144
* @return the boolean value.
143-
* @see CDR#read_type_7()
145+
* @see CDRBuffer#readBoolean()
144146
*/
145147
public boolean read_bool()
146148
{
@@ -151,7 +153,7 @@ public boolean read_bool()
151153
* Reads a float {@code float32} from the buffer.
152154
*
153155
* @return the float value.
154-
* @see CDR#read_type_5()
156+
* @see CDRBuffer#readFloat()
155157
*/
156158
public float read_float32()
157159
{
@@ -163,7 +165,7 @@ public float read_float32()
163165
* Reads a double {@code float64} from the buffer.
164166
*
165167
* @return the double value.
166-
* @see CDR#read_type_6()
168+
* @see CDRBuffer#readDouble()
167169
*/
168170
public double read_float64()
169171
{
@@ -175,7 +177,7 @@ public double read_float64()
175177
* Reads a byte {@code byte} from the buffer.
176178
*
177179
* @return the byte value.
178-
* @see CDR#read_type_9()
180+
* @see CDRBuffer#readByte()
179181
*/
180182
public byte read_byte()
181183
{
@@ -186,7 +188,7 @@ public byte read_byte()
186188
* Reads a byte {@code int8} from the buffer.
187189
*
188190
* @return the byte value.
189-
* @see CDR#read_type_9()
191+
* @see CDRBuffer#readByte()
190192
*/
191193
public byte read_int8()
192194
{
@@ -197,7 +199,7 @@ public byte read_int8()
197199
* Reads an unsigned byte {@code uint8} from the buffer.
198200
*
199201
* @return the unsigned byte value.
200-
* @see CDR#read_type_9()
202+
* @see CDRBuffer#readByte()
201203
*/
202204
public int read_uint8()
203205
{
@@ -208,7 +210,7 @@ public int read_uint8()
208210
* Reads a short {@code int16} from the buffer.
209211
*
210212
* @return the short value.
211-
* @see CDR#read_type_1()
213+
* @see CDRBuffer#readShort()
212214
*/
213215
public short read_int16()
214216
{
@@ -220,7 +222,7 @@ public short read_int16()
220222
* Reads an unsigned short {@code uint16} from the buffer.
221223
*
222224
* @return the unsigned short value.
223-
* @see CDR#read_type_3()
225+
* @see CDRBuffer#readUInt16()
224226
*/
225227
public int read_uint16()
226228
{
@@ -231,7 +233,7 @@ public int read_uint16()
231233
* Reads an integer {@code int32} from the buffer.
232234
*
233235
* @return the integer value.
234-
* @see CDR#read_type_2()
236+
* @see CDRBuffer#readInt()
235237
*/
236238
public int read_int32()
237239
{
@@ -243,7 +245,7 @@ public int read_int32()
243245
* Reads an unsigned integer {@code uint32} from the buffer.
244246
*
245247
* @return the unsigned integer value.
246-
* @see CDR#read_type_4()
248+
* @see CDRBuffer#readInt()
247249
*/
248250
public long read_uint32()
249251
{
@@ -254,7 +256,7 @@ public long read_uint32()
254256
* Reads a long {@code int64} from the buffer.
255257
*
256258
* @return the long value.
257-
* @see CDR#read_type_11()
259+
* @see CDRBuffer#readLong()
258260
*/
259261
public long read_int64()
260262
{
@@ -270,7 +272,7 @@ public long read_int64()
270272
* </p>
271273
*
272274
* @return the unsigned long value.
273-
* @see CDR#read_type_12()
275+
* @see CDRBuffer#readLong()
274276
*/
275277
public long read_uint64()
276278
{
@@ -285,7 +287,7 @@ public long read_uint64()
285287
* Reads a string {@code string} from the buffer.
286288
*
287289
* @return the string value.
288-
* @see CDR#read_type_d(StringBuilder)
290+
* @see CDRBuffer#readString(StringBuilder)
289291
*/
290292
public String read_string()
291293
{
@@ -296,7 +298,7 @@ public String read_string()
296298
* Reads a string {@code string} from the buffer and returns the result as a byte array for each character.
297299
*
298300
* @return the string value as a byte array.
299-
* @see CDR#read_type_d(StringBuilder)
301+
* @see CDRBuffer#readString(StringBuilder)
300302
*/
301303
public byte[] read_stringAsBytes()
302304
{
@@ -311,7 +313,7 @@ public byte[] read_stringAsBytes()
311313
* Reads a string {@code string} from the buffer into the given {@code stringBuilderToPack}.
312314
*
313315
* @param stringBuilderToPack the string builder to which the characters are added.
314-
* @see CDR#read_type_d(StringBuilder)
316+
* @see CDRBuffer#readString(StringBuilder)
315317
*/
316318
public void read_string(StringBuilder stringBuilderToPack)
317319
{
@@ -332,7 +334,6 @@ public void read_string(StringBuilder stringBuilderToPack)
332334
*
333335
* @param reader the reader to use to read the array elements.
334336
* @param arrayLength the size of the array to read.
335-
* @see CDR#read_type_f()
336337
*/
337338
public void read_array(ElementReader reader, int arrayLength)
338339
{

0 commit comments

Comments
 (0)