From 576dfc003de0718a4606662d2cf982e52be4c848 Mon Sep 17 00:00:00 2001 From: PsJuan Date: Sun, 2 May 2021 18:23:47 +0200 Subject: [PATCH 1/2] Update java version from 6 to 7. maven request --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9819009..300db32 100644 --- a/pom.xml +++ b/pom.xml @@ -116,8 +116,8 @@ maven-compiler-plugin 3.1 - 6 - 6 + 7 + 7 From c46f6270f0931dfc493c08c60a06fdb99dddefb9 Mon Sep 17 00:00:00 2001 From: PsJuan Date: Sun, 2 May 2021 18:26:56 +0200 Subject: [PATCH 2/2] pos to long --- src/main/java/io/kaitai/struct/ByteBufferKaitaiStream.java | 2 +- src/main/java/io/kaitai/struct/KaitaiStream.java | 2 +- .../java/io/kaitai/struct/RandomAccessFileKaitaiStream.java | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/io/kaitai/struct/ByteBufferKaitaiStream.java b/src/main/java/io/kaitai/struct/ByteBufferKaitaiStream.java index 5115bfe..ba03c65 100644 --- a/src/main/java/io/kaitai/struct/ByteBufferKaitaiStream.java +++ b/src/main/java/io/kaitai/struct/ByteBufferKaitaiStream.java @@ -162,7 +162,7 @@ public void seek(long newPos) { } @Override - public int pos() { + public long pos() { return bb.position(); } diff --git a/src/main/java/io/kaitai/struct/KaitaiStream.java b/src/main/java/io/kaitai/struct/KaitaiStream.java index ca15b6d..8e440b0 100644 --- a/src/main/java/io/kaitai/struct/KaitaiStream.java +++ b/src/main/java/io/kaitai/struct/KaitaiStream.java @@ -84,7 +84,7 @@ public abstract class KaitaiStream implements Closeable { * Get current position of a stream pointer. * @return pointer position, number of bytes from the beginning of the stream */ - abstract public int pos(); + abstract public long pos(); /** * Get total size of the stream in bytes. diff --git a/src/main/java/io/kaitai/struct/RandomAccessFileKaitaiStream.java b/src/main/java/io/kaitai/struct/RandomAccessFileKaitaiStream.java index 6dcd360..ca389dc 100644 --- a/src/main/java/io/kaitai/struct/RandomAccessFileKaitaiStream.java +++ b/src/main/java/io/kaitai/struct/RandomAccessFileKaitaiStream.java @@ -85,10 +85,9 @@ public void seek(long newPos) { } @Override - public int pos() { + public long pos() { try { - // FIXME cast - return (int) raf.getFilePointer(); + return raf.getFilePointer(); } catch (IOException e) { throw new RuntimeException(e); }