Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/fix/pdf-2-dates' in…
Browse files Browse the repository at this point in the history 
…to fix/pdf-2-dates
  • Loading branch information
@carlwilson
carlwilson committed Aug 15, 2024
2 parents 9c6855f + 02da223 commit 9b4e5d3
Show file tree
Hide file tree
Showing 8 changed files with 229 additions and 10 deletions.
68 changes: 68 additions & 0 deletions jhove-bbt/scripts/create-1.30-target.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,74 @@ if [[ -f "${candidateRoot}/regression/modules/PDF-hul/issue_306.pdf.jhove.xml" ]
cp "${candidateRoot}/regression/modules/PDF-hul/issue_306.pdf.jhove.xml" "${targetRoot}/regression/modules/PDF-hul/issue_306.pdf.jhove.xml"
fi

# Copy the TIFF Module results changed by https://github.com/openpreserve/jhove/pull/915
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/AA_Banner.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/AA_Banner.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/AA_Banner.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/strike.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/strike.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/strike.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/testpage-large.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/testpage-large.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/testpage-large.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/testpage-medium.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/testpage-medium.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/testpage-medium.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/oxford.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/oxford.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/oxford.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/jim___gg.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/jim___gg.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/jim___gg.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/bathy1.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/bathy1.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/bathy1.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/jim___cg.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/jim___cg.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/jim___cg.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/quad-tile.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/quad-tile.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/quad-tile.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/compos.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/compos.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/compos.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/pagemaker.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/pagemaker.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/pagemaker.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/jello.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/jello.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/jello.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/little-endian.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/little-endian.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/little-endian.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/cramps-tile.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/cramps-tile.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/cramps-tile.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/jim___ah.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/jim___ah.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/jim___ah.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/g3test.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/g3test.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/g3test.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/6mp_soft.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/6mp_soft.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/6mp_soft.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/ycbcr-cat.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/ycbcr-cat.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/ycbcr-cat.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/quad-lzw.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/quad-lzw.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/quad-lzw.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/jim___dg.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/jim___dg.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/jim___dg.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/fax2d.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/fax2d.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/fax2d.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/peppers.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/peppers.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/peppers.tif.jhove.xml"
fi

# Copy the PNG Module results changed by https://github.com/openpreserve/jhove/pull/843
if [[ -f "${candidateRoot}/regression/modules/PNG-gdm/issue_148.png.jhove.xml" ]]; then
cp "${candidateRoot}/regression/modules/PNG-gdm/issue_148.png.jhove.xml" "${targetRoot}/regression/modules/PNG-gdm/issue_148.png.jhove.xml"
Expand Down
92 changes: 88 additions & 4 deletions jhove-bbt/scripts/create-1.31-target.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,92 @@ echo "TEST BASELINE: Creating baseline"
# Simply copy baseline for now we're not making any changes
echo " - copying ${baselineRoot} baseline to ${targetRoot}"
cp -R "${baselineRoot}" "${targetRoot}"
# find "${targetRoot}" -type f -name "*.pdf.jhove.xml" -exec sed -i 's/^ <reportingModule release="1.12.5" date="2024-03-05">PDF-hul<\/reportingModule>$/ <reportingModule release="1.12.6" date="2024-07-31">PDF-hul<\/reportingModule>/' {} \;
# find "${targetRoot}" -type f -name "audit.jhove.xml" -exec sed -i 's/^ <module release="1.12.5">PDF-hul<\/module>$/ <module release="1.12.6">PDF-hul<\/module>/' {} \;
# find "${targetRoot}" -type f -name "audit-PDF-hul.jhove.xml" -exec sed -i 's/^ <release>1.12.5<\/release>$/ <release>1.12.6<\/release>/' {} \;
# find "${targetRoot}" -type f -name "audit-PDF-hul.jhove.xml" -exec sed -i 's/2024-03-05/2024-07-31/' {} \;

# Copy the TIFF Module results changed by https://github.com/openpreserve/jhove/pull/915
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/AA_Banner.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/AA_Banner.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/AA_Banner.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/strike.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/strike.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/strike.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/testpage-large.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/testpage-large.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/testpage-large.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/testpage-medium.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/testpage-medium.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/testpage-medium.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/oxford.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/oxford.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/oxford.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/jim___gg.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/jim___gg.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/jim___gg.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/bathy1.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/bathy1.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/bathy1.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/jim___cg.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/jim___cg.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/jim___cg.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/quad-tile.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/quad-tile.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/quad-tile.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/compos.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/compos.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/compos.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/pagemaker.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/pagemaker.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/pagemaker.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/jello.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/jello.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/jello.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/little-endian.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/little-endian.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/little-endian.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/cramps-tile.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/cramps-tile.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/cramps-tile.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/jim___ah.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/jim___ah.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/jim___ah.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/g3test.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/g3test.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/g3test.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/6mp_soft.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/6mp_soft.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/6mp_soft.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/ycbcr-cat.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/ycbcr-cat.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/ycbcr-cat.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/quad-lzw.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/quad-lzw.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/quad-lzw.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/jim___dg.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/jim___dg.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/jim___dg.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/fax2d.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/fax2d.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/fax2d.tif.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/peppers.tif.jhove.xml" ]]; then
cp "${candidateRoot}/examples/modules/TIFF-hul/peppers.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/peppers.tif.jhove.xml"
fi

declare -a tiff_affected=("examples/modules/TIFF-hul/cramps.tif.jhove.xml"
"examples/modules/TIFF-hul/text.tif.jhove.xml"
"examples/modules/TIFF-hul/testpage-small.tif.jhove.xml")
for filename in "${tiff_affected[@]}"
do
if [[ -f "${candidateRoot}/${filename}" ]]; then
cp "${candidateRoot}/${filename}" "${targetRoot}/${filename}"
fi
done

declare -a xhtml_affected=("errors/modules/HTML-hul/xhtml-trans-no-xml-dec.html.jhove.xml"
"errors/modules/HTML-hul/xhtml-strict-no-xml-dec.html.jhove.xml"
"errors/modules/HTML-hul/xhtml-frames-no-xml-dec.html.jhove.xml"
"errors/modules/HTML-hul/xhtml-1-1-no-xml-dec.html.jhove.xml")
for filename in "${xhtml_affected[@]}"
do
if [[ -f "${candidateRoot}/${filename}" ]]; then
cp "${candidateRoot}/${filename}" "${targetRoot}/${filename}"
fi
done
1 change: 1 addition & 0 deletions jhove-ext-modules/src/main/java/org/ithaka/portico/jhove/module/epub/JhoveRepInfoReport.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,7 @@ private static Date toDate(String isoDate) {
if (isoDate == null || isoDate.length() == 0) {
return null;
}
isoDate = isoDate.trim();

SimpleDateFormat simpleDateFormat = new SimpleDateFormat(ISO_DATE_PATTERN);
Date date;
Expand Down
4 changes: 2 additions & 2 deletions ...hove/module/epub/ErrorMessages.properties → ...hove/module/epub/ErrorMessages.properties
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
EPUB-PTC-1 = FATAL, [An error occurred.]
EPUB-PTC-1-SUB = Exception: %s
EPUB-PTC-1 = FATAL, [An error occurred.]
EPUB-PTC-1-SUB = Exception: %s
EPUB-PTC-2 = FATAL, [An undefined error occurred. This may be caused by a system error or indicative of a problem with the file provided.]
13 changes: 11 additions & 2 deletions jhove-modules/html-hul/src/main/java/edu/harvard/hul/ois/jhove/module/HtmlModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ public class HtmlModule extends ModuleBase {
private static final String HTML_4_0 = "HTML 4.0";
private static final String HTML_4_01 = "HTML 4.01";
private static final String XHTML_1_0 = "XHTML 1.0";
private static final String XHTML_1_1_STR = "XHTML 1.1";

private static final String NAME = "HTML-hul";
private static final String RELEASE = "1.4.3";
Expand Down Expand Up @@ -162,7 +163,7 @@ public class HtmlModule extends ModuleBase {
/* Version names, matching the above indices */
private static final String[] VERSIONNAMES = { null, "HTML 3.2", HTML_4_0,
HTML_4_0, HTML_4_0, HTML_4_01, HTML_4_01, HTML_4_01, XHTML_1_0,
XHTML_1_0, XHTML_1_0, "XHTML 1.1" };
XHTML_1_0, XHTML_1_0, XHTML_1_1_STR };

/* Flag to know if the property TextMDMetadata is to be added */
protected boolean _withTextMD = false;
Expand Down Expand Up @@ -675,7 +676,15 @@ protected int checkDoctype(List elements) {
return HTML_4_01_TRANSITIONAL;
case "-//W3C//DTD HTML 4.01 FRAMESET//EN":
return HTML_4_01_FRAMESET;
default:
case "-//W3C//DTD XHTML 1.0 STRICT//EN":
return XHTML_1_0_STRICT;
case "-//W3C//DTD XHTML 1.0 TRANSITIONAL//EN":
return XHTML_1_0_TRANSITIONAL;
case "-//W3C//DTD XHTML 1.0 FRAMESET//EN":
return XHTML_1_0_FRAMESET;
case "-//W3C//DTD XHTML 1.1//EN":
return XHTML_1_1;
default:
break;
}
} catch (Exception e) {
Expand Down
2 changes: 1 addition & 1 deletion jhove-modules/pdf-hul/src/main/java/edu/harvard/hul/ois/jhove/module/PdfModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4285,7 +4285,7 @@ protected boolean doOutlineStuff(RepInfo info) {
* We return the page sequence number for the referenced page.
* If we can't find a match for the reference, we return -1.
*/
protected int resolveIndirectDest(PdfSimpleObject key, RepInfo info) throws PdfException {
protected int resolveIndirectDest(PdfSimpleObject key, RepInfo info) throws PdfException, IOException {
if (key == null) {
throw new IllegalArgumentException("Argument key can not be null");
}
Expand Down
5 changes: 4 additions & 1 deletion jhove-modules/pdf-hul/src/main/java/edu/harvard/hul/ois/jhove/module/pdf/Destination.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,17 @@ public final class Destination {
* from a named destination.
*/
public Destination(final PdfObject destObj, final PdfModule module,
final boolean named) throws PdfException {
final boolean named) throws PdfException, IOException {
if (destObj == null) {
throw new IllegalArgumentException("Parameter destObj cannot be null.");
}
if (!named && destObj instanceof PdfSimpleObject) {
_indirect = true;
_indirectDest = (PdfSimpleObject) destObj;
return;
} else if (!named && destObj instanceof PdfIndirectObj) {
_pageDest = findDirectDest(module, (PdfArray) module.resolveIndirectObject(destObj));
return;
}
PdfArray destArray = null;
try {
Expand Down
54 changes: 54 additions & 0 deletions jhove-modules/tiff-hul/src/main/java/edu/harvard/hul/ois/jhove/module/tiff/TiffIFD.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1131,6 +1131,8 @@ public Property getProperty(boolean rawOutput) throws TiffException {
// This function has gotten obscenely large. Split it up.
addNisoProperties(entries, rawOutput);
addMiscProperties(entries, rawOutput);
// Add Strip and Tile information from NISO since not displayed in MIX v1.0+
addNonDisplayedNisoProperties(entries, rawOutput);
addTiffITProperties(entries, rawOutput);
addTiffEPProperties(entries, rawOutput);
addGeoTiffProperties(entries, rawOutput);
Expand Down Expand Up @@ -1340,6 +1342,58 @@ private void addMiscProperties(List<Property> entries, boolean rawOutput) {
}
}

// Add Strip and Tile information from NISO since not displayed in v1.0 and subsequent
private void addNonDisplayedNisoProperties(List<Property> entries, boolean rawOutput) {
if (_niso == null) return;

int segmentType = _niso.getSegmentType();
if (segmentType != NULL) {
entries.add(new Property("SegmentType", PropertyType.INTEGER,
segmentType));
}
long[] stripOffsets = _niso.getStripOffsets();
if (stripOffsets != null) {
entries.add(new Property("StripOffsets", PropertyType.LONG,
PropertyArity.ARRAY, stripOffsets));
}
long rowsPerStrip = _niso.getRowsPerStrip();
if (rowsPerStrip != NULL) {
entries.add(new Property("RowsPerStrip", PropertyType.LONG,
rowsPerStrip));
}
long[] stripByteCounts = _niso.getStripByteCounts();
if (stripByteCounts != null) {
entries.add(new Property("StripByteCounts", PropertyType.LONG,
PropertyArity.ARRAY, stripByteCounts));
}

long tileWidth = _niso.getTileWidth();
if (tileWidth != NULL) {
entries.add(new Property("TileWidth", PropertyType.LONG,
tileWidth));
}
long tileLength = _niso.getTileLength();
if (tileLength != NULL) {
entries.add(new Property("TileLength", PropertyType.LONG,
tileLength));
}
long[] tileOffsets = _niso.getTileOffsets();
if (tileOffsets != null) {
entries.add(new Property("TileOffsets", PropertyType.LONG,
PropertyArity.ARRAY, tileOffsets));
}
long[] tileByteCounts = _niso.getTileByteCounts();
if (tileByteCounts != null) {
entries.add(new Property("TileByteCounts", PropertyType.LONG,
PropertyArity.ARRAY, tileByteCounts));
}
int planarConfiguration = _niso.getPlanarConfiguration();
if (planarConfiguration != NULL) {
entries.add(new Property("PlanarConfiguration", PropertyType.INTEGER,
planarConfiguration));
}
}

private void addTiffITProperties(List<Property> entries,
boolean rawOutput) {
/* Add TIFF/IT properties. */
Expand Down

0 comments on commit 9b4e5d3

Please sign in to comment.