Commit 64d1fd81 authored by Ole Streicher's avatar Ole Streicher

Rediff patches

parent df776982
......@@ -23,11 +23,10 @@ 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/FitsTableBuilder.java | 4 ++--
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 +-
7 files changed, 61 insertions(+), 7 deletions(-)
6 files changed, 59 insertions(+), 5 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,28 +89,6 @@ index 43a9689..f45e0fa 100644
if ( firstCard ) {
String key = fcard.getKey();
if ( key == null ||
diff --git a/src/main/uk/ac/starlink/fits/FitsTableBuilder.java b/src/main/uk/ac/starlink/fits/FitsTableBuilder.java
index 121d4d0..0bca02a 100644
--- a/src/main/uk/ac/starlink/fits/FitsTableBuilder.java
+++ b/src/main/uk/ac/starlink/fits/FitsTableBuilder.java
@@ -283,7 +283,7 @@ public class FitsTableBuilder implements TableBuilder, MultiTableBuilder {
AsciiTable tdata = new AsciiTable( hdr );
tdata.read( in );
tdata.getData();
- TableHDU thdu = new AsciiTableHDU( hdr, (Data) tdata );
+ TableHDU thdu = new AsciiTableHDU( hdr, tdata );
Tables.streamStarTable( new FitsStarTable( thdu ), sink );
return true;
}
@@ -431,7 +431,7 @@ public class FitsTableBuilder implements TableBuilder, MultiTableBuilder {
AsciiTable tdata = new AsciiTable( hdr );
tdata.read( strm );
tdata.getData();
- TableHDU thdu = new AsciiTableHDU( hdr, (Data) tdata );
+ TableHDU thdu = new AsciiTableHDU( hdr, tdata );
return new TableResult( new FitsStarTable( thdu ), afterpos );
}
diff --git a/src/main/uk/ac/starlink/fits/MappedFile.java b/src/main/uk/ac/starlink/fits/MappedFile.java
index 3116315..b703097 100644
--- a/src/main/uk/ac/starlink/fits/MappedFile.java
......
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