diff -Nru jcdf-1.2.3+dfsg/AttributeDescriptorRecord.java jcdf-1.2.4+dfsg/AttributeDescriptorRecord.java
--- jcdf-1.2.3+dfsg/AttributeDescriptorRecord.java 2017-11-16 16:44:47.000000000 +0000
+++ jcdf-1.2.4+dfsg/AttributeDescriptorRecord.java 2021-12-15 11:28:41.000000000 +0000
@@ -40,11 +40,11 @@
this.num = buf.readInt( ptr );
this.nGrEntries = buf.readInt( ptr );
this.maxGrEntry = buf.readInt( ptr );
- this.rfuA = checkIntValue( buf.readInt( ptr ), 0 );
+ this.rfuA = buf.readInt( ptr );
this.azEdrHead = buf.readOffset( ptr );
this.nZEntries = buf.readInt( ptr );
this.maxZEntry = buf.readInt( ptr );
- this.rfuE = checkIntValue( buf.readInt( ptr ), -1 );
+ this.rfuE = buf.readInt( ptr );
this.name = buf.readAsciiString( ptr, nameLeng );
checkEndRecord( ptr );
}
diff -Nru jcdf-1.2.3+dfsg/AttributeEntryDescriptorRecord.java jcdf-1.2.4+dfsg/AttributeEntryDescriptorRecord.java
--- jcdf-1.2.3+dfsg/AttributeEntryDescriptorRecord.java 2017-11-16 16:44:47.000000000 +0000
+++ jcdf-1.2.4+dfsg/AttributeEntryDescriptorRecord.java 2021-12-15 11:28:41.000000000 +0000
@@ -41,11 +41,11 @@
this.dataType = buf.readInt( ptr );
this.num = buf.readInt( ptr );
this.numElems = buf.readInt( ptr );
- this.rfuA = checkIntValue( buf.readInt( ptr ), 0 );
- this.rfuB = checkIntValue( buf.readInt( ptr ), 0 );
- this.rfuC = checkIntValue( buf.readInt( ptr ), 0 );
- this.rfuD = checkIntValue( buf.readInt( ptr ), -1 );
- this.rfuE = checkIntValue( buf.readInt( ptr ), -1 );
+ this.rfuA = buf.readInt( ptr );
+ this.rfuB = buf.readInt( ptr );
+ this.rfuC = buf.readInt( ptr );
+ this.rfuD = buf.readInt( ptr );
+ this.rfuE = buf.readInt( ptr );
valueOffset_ = ptr.get();
}
diff -Nru jcdf-1.2.3+dfsg/CdfDescriptorRecord.java jcdf-1.2.4+dfsg/CdfDescriptorRecord.java
--- jcdf-1.2.3+dfsg/CdfDescriptorRecord.java 2017-11-16 16:44:47.000000000 +0000
+++ jcdf-1.2.4+dfsg/CdfDescriptorRecord.java 2021-12-15 11:28:41.000000000 +0000
@@ -36,11 +36,11 @@
this.release = buf.readInt( ptr );
this.encoding = buf.readInt( ptr );
this.flags = buf.readInt( ptr );
- this.rfuA = checkIntValue( buf.readInt( ptr ), 0 );
- this.rfuB = checkIntValue( buf.readInt( ptr ), 0 );
+ this.rfuA = buf.readInt( ptr );
+ this.rfuB = buf.readInt( ptr );
this.increment = buf.readInt( ptr );
- this.rfuD = checkIntValue( buf.readInt( ptr ), -1 );
- this.rfuE = checkIntValue( buf.readInt( ptr ), -1 );
+ this.rfuD = buf.readInt( ptr );
+ this.rfuE = buf.readInt( ptr );
int crLeng = versionAtLeast( 2, 5 ) ? 256 : 1945;
this.copyright = toLines( buf.readAsciiString( ptr, crLeng ) );
checkEndRecord( ptr );
diff -Nru jcdf-1.2.3+dfsg/CompressedCdfRecord.java jcdf-1.2.4+dfsg/CompressedCdfRecord.java
--- jcdf-1.2.3+dfsg/CompressedCdfRecord.java 2017-11-16 16:44:47.000000000 +0000
+++ jcdf-1.2.4+dfsg/CompressedCdfRecord.java 2021-12-15 11:28:41.000000000 +0000
@@ -26,7 +26,7 @@
Pointer ptr = plan.createContentPointer();
this.cprOffset = buf.readOffset( ptr );
this.uSize = buf.readOffset( ptr );
- this.rfuA = checkIntValue( buf.readInt( ptr ), 0 );
+ this.rfuA = buf.readInt( ptr );
dataOffset_ = ptr.get();
}
diff -Nru jcdf-1.2.3+dfsg/CompressedParametersRecord.java jcdf-1.2.4+dfsg/CompressedParametersRecord.java
--- jcdf-1.2.3+dfsg/CompressedParametersRecord.java 2017-11-16 16:44:47.000000000 +0000
+++ jcdf-1.2.4+dfsg/CompressedParametersRecord.java 2021-12-15 11:28:41.000000000 +0000
@@ -25,7 +25,7 @@
Buf buf = plan.getBuf();
Pointer ptr = plan.createContentPointer();
this.cType = buf.readInt( ptr );
- this.rfuA = checkIntValue( buf.readInt( ptr ), 0 );
+ this.rfuA = buf.readInt( ptr );
this.pCount = buf.readInt( ptr );
this.cParms = readIntArray( buf, ptr, this.pCount );
checkEndRecord( ptr );
diff -Nru jcdf-1.2.3+dfsg/CompressedVariableValuesRecord.java jcdf-1.2.4+dfsg/CompressedVariableValuesRecord.java
--- jcdf-1.2.3+dfsg/CompressedVariableValuesRecord.java 2017-11-16 16:44:47.000000000 +0000
+++ jcdf-1.2.4+dfsg/CompressedVariableValuesRecord.java 2021-12-15 11:28:41.000000000 +0000
@@ -24,7 +24,7 @@
super( plan, "CVVR", 13 );
Buf buf = plan.getBuf();
Pointer ptr = plan.createContentPointer();
- this.rfuA = checkIntValue( buf.readInt( ptr ), 0 );
+ this.rfuA = buf.readInt( ptr );
this.cSize = buf.readOffset( ptr );
dataOffset_ = ptr.get();
}
diff -Nru jcdf-1.2.3+dfsg/DataType.java jcdf-1.2.4+dfsg/DataType.java
--- jcdf-1.2.3+dfsg/DataType.java 2017-11-16 16:44:47.000000000 +0000
+++ jcdf-1.2.4+dfsg/DataType.java 2021-12-15 11:28:41.000000000 +0000
@@ -296,7 +296,7 @@
buf.readDataBytes( offset, n, (byte[]) array );
}
public Object getScalar( Object array, int index ) {
- return new Byte( ((byte[]) array)[ index ] );
+ return Byte.valueOf( ((byte[]) array)[ index ] );
}
}
@@ -312,7 +312,7 @@
buf.readDataShorts( offset, n, (short[]) array );
}
public Object getScalar( Object array, int index ) {
- return new Short( ((short[]) array)[ index ] );
+ return Short.valueOf( ((short[]) array)[ index ] );
}
}
@@ -328,7 +328,7 @@
buf.readDataInts( offset, n, (int[]) array );
}
public Object getScalar( Object array, int index ) {
- return new Integer( ((int[]) array)[ index ] );
+ return Integer.valueOf( ((int[]) array)[ index ] );
}
}
@@ -344,7 +344,7 @@
buf.readDataLongs( offset, n, (long[]) array );
}
public Object getScalar( Object array, int index ) {
- return new Long( ((long[]) array)[ index ] );
+ return Long.valueOf( ((long[]) array)[ index ] );
}
}
@@ -366,7 +366,7 @@
}
}
public Object getScalar( Object array, int index ) {
- return new Short( ((short[]) array)[ index ] );
+ return Short.valueOf( ((short[]) array)[ index ] );
}
}
@@ -392,7 +392,7 @@
}
}
public Object getScalar( Object array, int index ) {
- return new Integer( ((int[]) array)[ index ] );
+ return Integer.valueOf( ((int[]) array)[ index ] );
}
}
@@ -421,7 +421,7 @@
}
}
public Object getScalar( Object array, int index ) {
- return new Long( ((long[]) array )[ index ] );
+ return Long.valueOf( ((long[]) array )[ index ] );
}
}
@@ -437,7 +437,7 @@
buf.readDataFloats( offset, n, (float[]) array );
}
public Object getScalar( Object array, int index ) {
- return new Float( ((float[]) array)[ index ] );
+ return Float.valueOf( ((float[]) array)[ index ] );
}
}
@@ -453,7 +453,7 @@
buf.readDataDoubles( offset, n, (double[]) array );
}
public Object getScalar( Object array, int index ) {
- return new Double( ((double[]) array)[ index ] );
+ return Double.valueOf( ((double[]) array)[ index ] );
}
}
diff -Nru jcdf-1.2.3+dfsg/debian/changelog jcdf-1.2.4+dfsg/debian/changelog
--- jcdf-1.2.3+dfsg/debian/changelog 2020-02-15 20:06:24.000000000 +0000
+++ jcdf-1.2.4+dfsg/debian/changelog 2021-12-21 12:45:06.000000000 +0000
@@ -1,3 +1,17 @@
+jcdf (1.2.4+dfsg-1) unstable; urgency=medium
+
+ [ Debian Janitor ]
+ * Set upstream metadata fields: Bug-Database, Bug-Submit.
+
+ [ Ole Streicher ]
+ * New upstream version 1.2.4+dfsg
+ * Rediff patches
+ * Push dh compat to 13
+ * Push Standards-Version to 4.6.0. No changes
+ * Remove source and target version (1.5) requirement
+
+ -- Ole Streicher
Pre-built copies of the jar file and documentation -for the current version (v1.2-3) can be found here: +for the current version (v1.2-4) can be found here:
Previous versions may be available at -ftp://andromeda.star.bris.ac.uk/pub/star/jcdf/. +http://andromeda.star.bris.ac.uk/releases/jcdf/.
leapSecondLastUpdated
+ field from the Global Descriptor Record; this could cause a
+ RuntimeException with a message about the library leap second table
+ being out of date during TT2000 date formatting.My thanks to Michael Liu and Robert Candey at the NASA CDF office -for encouragement and help with some of the testing and implementation, -and to Jeremy Faden for discussions and help with testing. +
My thanks to several people who have helped with development and +testing, including Christophe Arviset, Robert Candey, Michael Liu, +Jeremy Faden and Bogdan Nicula.
Bugs, questions, feedback, enhancement requests welcome to
diff -Nru jcdf-1.2.3+dfsg/makefile jcdf-1.2.4+dfsg/makefile
--- jcdf-1.2.3+dfsg/makefile 2017-11-16 16:44:47.000000000 +0000
+++ jcdf-1.2.4+dfsg/makefile 2021-12-15 11:28:41.000000000 +0000
@@ -1,12 +1,13 @@
-VERSION = 1.2-3
+VERSION = 1.2-4
+VERSION_ = 1.2.4
JAVAC = javac
JAVA = java
JAR = jar
JAVADOC = javadoc
# If you're building with java8, you can uncomment this to reduce warnings
-# JAVADOC_FLAGS = -Xdoclint:all,-missing
+JAVADOC_FLAGS = -Xdoclint:all,-missing
JARFILE = jcdf.jar
@@ -19,6 +20,18 @@
NASACDFJAR = nasa/cdfjava_3.6.0.4.jar
NASALEAPSECFILE = nasa/CDFLeapSeconds.txt
+ARTIFACT_PKG = jcdf-$(VERSION_)
+ARTIFACTS = $(ARTIFACT_PKG).jar \
+ $(ARTIFACT_PKG)-sources.jar \
+ $(ARTIFACT_PKG)-javadoc.jar
+
+# See https://central.sonatype.org/publish/publish-manual/
+# Uses gpg and ~/.m2/settings.xml
+SIGN_AND_DEPLOY = \
+ mvn gpg:sign-and-deploy-file \
+ -Durl=https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ \
+ -DrepositoryId=ossrh -DpomFile=pom.xml
+
JSRC = \
BankBuf.java \
Buf.java \
@@ -75,12 +88,14 @@
OtherTest.java \
BufTest.java \
-build: jar docs
+build: jar docs artifacts
jar: $(JARFILE)
docs: $(WWW_FILES)
+artifacts: artifacts.zip
+
javadocs: $(JSRC) package-info.java
rm -rf javadocs
mkdir javadocs
@@ -172,14 +187,32 @@
should_have_failed; \
fi
+pom.xml:
+ sed 's/__VERSION__/$(VERSION_)/g' actualValue
- */
- protected int checkIntValue( int actualValue, int fixedValue ) {
- if ( actualValue != fixedValue ) {
- warnFormat( "Unexpected fixed value " + actualValue + " != "
- + fixedValue );
- }
- return actualValue;
- }
-
- /**
* Checks that a pointer is positioned at the end of this record.
* If not, a warning may be emitted.
* This performs an assertion-like function.
diff -Nru jcdf-1.2.3+dfsg/SparsenessParametersRecord.java jcdf-1.2.4+dfsg/SparsenessParametersRecord.java
--- jcdf-1.2.3+dfsg/SparsenessParametersRecord.java 2017-11-16 16:44:47.000000000 +0000
+++ jcdf-1.2.4+dfsg/SparsenessParametersRecord.java 2021-12-15 11:28:41.000000000 +0000
@@ -25,7 +25,7 @@
Buf buf = plan.getBuf();
Pointer ptr = plan.createContentPointer();
this.sArraysType = buf.readInt( ptr );
- this.rfuA = checkIntValue( buf.readInt( ptr ), 0 );
+ this.rfuA = buf.readInt( ptr );
this.pCount = buf.readInt( ptr );
this.sArraysParms = readIntArray( buf, ptr, this.pCount );
checkEndRecord( ptr );
diff -Nru jcdf-1.2.3+dfsg/VariableDescriptorRecord.java jcdf-1.2.4+dfsg/VariableDescriptorRecord.java
--- jcdf-1.2.3+dfsg/VariableDescriptorRecord.java 2017-11-16 16:44:47.000000000 +0000
+++ jcdf-1.2.4+dfsg/VariableDescriptorRecord.java 2021-12-15 11:28:41.000000000 +0000
@@ -57,9 +57,9 @@
this.vxrTail = buf.readOffset( ptr );
this.flags = buf.readInt( ptr );
this.sRecords = buf.readInt( ptr );
- this.rfuB = checkIntValue( buf.readInt( ptr ), 0 );
- this.rfuC = checkIntValue( buf.readInt( ptr ), -1 );
- this.rfuF = checkIntValue( buf.readInt( ptr ), -1 );
+ this.rfuB = buf.readInt( ptr );
+ this.rfuC = buf.readInt( ptr );
+ this.rfuF = buf.readInt( ptr );
this.numElems = buf.readInt( ptr );
this.num = buf.readInt( ptr );
this.cprOrSprOffset = buf.readOffset( ptr );