Commit effe05f8 authored by Ole Streicher's avatar Ole Streicher

Rediff patches

parent 24940f6f
......@@ -20,13 +20,13 @@ https://github.com/nom-tam-fits/nom-tam-fits/issues/114
Depending on the result of the PR, this patch may be simplified.
---
src/main/nom/tam/fits/HeaderOrder.java | 8 ++++++++
.../uk/ac/starlink/fits/AbstractArrayDataIO.java | 4 ++++
src/main/uk/ac/starlink/fits/FitsConstants.java | 6 +++---
src/main/uk/ac/starlink/fits/MappedFile.java | 23 +++++++++++++++++++++-
src/main/uk/ac/starlink/fits/MultiMappedFile.java | 21 ++++++++++++++++++++
.../uk/ac/starlink/fits/WritableFitsArrayImpl.java | 2 +-
6 files changed, 59 insertions(+), 5 deletions(-)
src/main/nom/tam/fits/HeaderOrder.java | 8 ++++++++
.../uk/ac/starlink/fits/AbstractArrayDataIO.java | 4 ++++
src/main/uk/ac/starlink/fits/FitsConstants.java | 6 +++---
src/main/uk/ac/starlink/fits/MappedFile.java | 21 +++++++++++++++++++++
src/main/uk/ac/starlink/fits/MultiMappedFile.java | 21 +++++++++++++++++++++
.../uk/ac/starlink/fits/WritableFitsArrayImpl.java | 2 +-
6 files changed, 58 insertions(+), 4 deletions(-)
create mode 100644 src/main/nom/tam/fits/HeaderOrder.java
diff --git a/src/main/nom/tam/fits/HeaderOrder.java b/src/main/nom/tam/fits/HeaderOrder.java
......@@ -90,10 +90,10 @@ index 43a9689..f45e0fa 100644
String key = fcard.getKey();
if ( key == null ||
diff --git a/src/main/uk/ac/starlink/fits/MappedFile.java b/src/main/uk/ac/starlink/fits/MappedFile.java
index 3116315..b703097 100644
index 3116315..56377cf 100644
--- a/src/main/uk/ac/starlink/fits/MappedFile.java
+++ b/src/main/uk/ac/starlink/fits/MappedFile.java
@@ -106,11 +106,19 @@ public class MappedFile extends AbstractArrayDataIO implements RandomAccess {
@@ -106,6 +106,14 @@ public class MappedFile extends AbstractArrayDataIO implements RandomAccess {
return (long) niobuf_.position();
}
......@@ -108,12 +108,6 @@ index 3116315..b703097 100644
public int skipBytes( int toSkip ) {
int nskip = Math.max( toSkip, 0 );
nskip = Math.min( toSkip, niobuf_.remaining() );
niobuf_.position( niobuf_.position() + nskip );
- return nskip;
+ return nskip;
}
protected byte get() throws IOException {
@@ -169,6 +177,19 @@ public class MappedFile extends AbstractArrayDataIO implements RandomAccess {
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment