Skip to content

Commit

Permalink
Merge pull request #124 from daveneiman/fix_JPEG_EXIF_normalization
Browse files Browse the repository at this point in the history
LIBDRS-5575 - FITS not generating MIX for JPEG EXIF files
  • Loading branch information
daveneiman authored Feb 15, 2017
2 parents 127871a + 7d6732b commit 8258e6c
Show file tree
Hide file tree
Showing 12 changed files with 964 additions and 9 deletions.
Binary file added testfiles/ICFA.KC.BIA.1524-small.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
244 changes: 244 additions & 0 deletions testfiles/output/3426592.jpg_XmlUnitExpectedOutput.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,244 @@
<?xml version="1.0" encoding="UTF-8"?>
<fits xmlns="http://hul.harvard.edu/ois/xml/ns/fits/fits_output" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hul.harvard.edu/ois/xml/ns/fits/fits_output http://hul.harvard.edu/ois/xml/xsd/fits/fits_output.xsd" version="1.0.5" timestamp="2/15/17 10:52 AM">
<identification>
<identity format="JPEG File Interchange Format" mimetype="image/jpeg" toolname="FITS" toolversion="1.0.5">
<tool toolname="Droid" toolversion="6.1.5" />
<tool toolname="Jhove" toolversion="1.11" />
<tool toolname="file utility" toolversion="5.04" />
<tool toolname="Exiftool" toolversion="10.00" />
<tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" />
<version toolname="Droid" toolversion="6.1.5">1.01</version>
<externalIdentifier toolname="Droid" toolversion="6.1.5" type="puid">fmt/43</externalIdentifier>
</identity>
</identification>
<fileinfo>
<size toolname="Jhove" toolversion="1.11">1036284</size>
<creatingApplicationName toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="SINGLE_RESULT">Adobe Photoshop Elements 2.0</creatingApplicationName>
<lastmodified toolname="Exiftool" toolversion="10.00" status="CONFLICT">2005:07:15 12:26:58</lastmodified>
<lastmodified toolname="Tika" toolversion="1.10" status="CONFLICT">2005-07-15T12:26:58</lastmodified>
<created toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="SINGLE_RESULT">2005:07:15 12:26:58</created>
<filepath toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">/Users/dan179/git/git-daveneiman/fits/testfiles/3426592.jpg</filepath>
<filename toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">3426592.jpg</filename>
<md5checksum toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">ac780de154d1eedff7fec0a22173f7d7</md5checksum>
<fslastmodified toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">1460585102000</fslastmodified>
</fileinfo>
<filestatus>
<well-formed toolname="Jhove" toolversion="1.11" status="SINGLE_RESULT">true</well-formed>
<valid toolname="Jhove" toolversion="1.11" status="SINGLE_RESULT">true</valid>
<message toolname="Jhove" toolversion="1.11" status="SINGLE_RESULT">Value offset not word-aligned: 75 offset=732</message>
<message toolname="Jhove" toolversion="1.11" status="SINGLE_RESULT">Value offset not word-aligned: 91 offset=744</message>
<message toolname="Jhove" toolversion="1.11" status="SINGLE_RESULT">Value offset not word-aligned: 139 offset=756</message>
<message toolname="Jhove" toolversion="1.11" status="SINGLE_RESULT">Value offset not word-aligned: 163 offset=780</message>
</filestatus>
<metadata>
<image>
<byteOrder toolname="Jhove" toolversion="1.11" status="SINGLE_RESULT">big endian</byteOrder>
<compressionScheme toolname="Jhove" toolversion="1.11" status="SINGLE_RESULT">JPEG</compressionScheme>
<imageWidth toolname="Jhove" toolversion="1.11">1220</imageWidth>
<imageHeight toolname="Exiftool" toolversion="10.00">1462</imageHeight>
<colorSpace toolname="Jhove" toolversion="1.11" status="SINGLE_RESULT">YCbCr</colorSpace>
<referenceBlackWhite toolname="Exiftool" toolversion="10.00" status="CONFLICT">0 0 0 0 0 0</referenceBlackWhite>
<referenceBlackWhite toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">0.0</referenceBlackWhite>
<YCbCrSubSampling toolname="Exiftool" toolversion="10.00" status="SINGLE_RESULT">2 2</YCbCrSubSampling>
<YCbCrCoefficients toolname="Exiftool" toolversion="10.00" status="CONFLICT">0 0 0</YCbCrCoefficients>
<YCbCrCoefficients toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">0.0</YCbCrCoefficients>
<YCbCrPositioning toolname="Exiftool" toolversion="10.00" status="CONFLICT">Unknown (0)</YCbCrPositioning>
<YCbCrPositioning toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">0</YCbCrPositioning>
<orientation toolname="Exiftool" toolversion="10.00">normal*</orientation>
<samplingFrequencyUnit toolname="Jhove" toolversion="1.11">in.</samplingFrequencyUnit>
<xSamplingFrequency toolname="Exiftool" toolversion="10.00">1200</xSamplingFrequency>
<ySamplingFrequency toolname="Exiftool" toolversion="10.00">1200</ySamplingFrequency>
<bitsPerSample toolname="Jhove" toolversion="1.11">8 8 8</bitsPerSample>
<samplesPerPixel toolname="Jhove" toolversion="1.11" status="SINGLE_RESULT">3</samplesPerPixel>
<whitePointXValue toolname="Exiftool" toolversion="10.00" status="SINGLE_RESULT">0</whitePointXValue>
<whitePointYValue toolname="Exiftool" toolversion="10.00" status="SINGLE_RESULT">0</whitePointYValue>
<scanningSoftwareName toolname="Exiftool" toolversion="10.00" status="SINGLE_RESULT">Adobe Photoshop Elements 2.0</scanningSoftwareName>
<fNumber toolname="Exiftool" toolversion="10.00">0</fNumber>
<exposureTime toolname="Exiftool" toolversion="10.00">0</exposureTime>
<isoSpeedRating toolname="Exiftool" toolversion="10.00" status="SINGLE_RESULT">0, 0</isoSpeedRating>
<brightnessValue toolname="Exiftool" toolversion="10.00" status="SINGLE_RESULT">0</brightnessValue>
<exposureBiasValue toolname="Exiftool" toolversion="10.00">0</exposureBiasValue>
<lightSource toolname="Exiftool" toolversion="10.00">unknown</lightSource>
<subjectDistance toolname="Exiftool" toolversion="10.00" status="CONFLICT">0 m</subjectDistance>
<subjectDistance toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">0.0</subjectDistance>
<flash toolname="Exiftool" toolversion="10.00">Flash did not fire</flash>
<focalLength toolname="Exiftool" toolversion="10.00">0.0</focalLength>
<exposureIndex toolname="Exiftool" toolversion="10.00">0</exposureIndex>
<captureDevice toolname="Exiftool" toolversion="10.00" status="SINGLE_RESULT">Unknown (0)</captureDevice>
<exposureProgram toolname="Exiftool" toolversion="10.00">Not defined</exposureProgram>
<shutterSpeedValue toolname="Exiftool" toolversion="10.00" status="CONFLICT">1</shutterSpeedValue>
<shutterSpeedValue toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">0.0</shutterSpeedValue>
<apertureValue toolname="Exiftool" toolversion="10.00" status="CONFLICT">1.0</apertureValue>
<apertureValue toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">0.0</apertureValue>
<maxApertureValue toolname="Exiftool" toolversion="10.00" status="CONFLICT">1.0</maxApertureValue>
<maxApertureValue toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">0.0</maxApertureValue>
<brightnessvalue toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="SINGLE_RESULT">3737950.0</brightnessvalue>
<standard>
<mix:mix xmlns:mix="http://www.loc.gov/mix/v20">
<mix:BasicDigitalObjectInformation>
<mix:byteOrder>big endian</mix:byteOrder>
<mix:Compression>
<mix:compressionScheme>JPEG</mix:compressionScheme>
</mix:Compression>
</mix:BasicDigitalObjectInformation>
<mix:BasicImageInformation>
<mix:BasicImageCharacteristics>
<mix:imageWidth>1220</mix:imageWidth>
<mix:imageHeight>1462</mix:imageHeight>
<mix:PhotometricInterpretation>
<mix:colorSpace>YCbCr</mix:colorSpace>
<mix:YCbCr>
<mix:YCbCrSubSampling>
<mix:yCbCrSubsampleHoriz>2</mix:yCbCrSubsampleHoriz>
<mix:yCbCrSubsampleVert>2</mix:yCbCrSubsampleVert>
</mix:YCbCrSubSampling>
<mix:YCbCrCoefficients>
<mix:lumaRed>
<mix:numerator>0</mix:numerator>
<mix:denominator>100</mix:denominator>
</mix:lumaRed>
<mix:lumaGreen>
<mix:numerator>0</mix:numerator>
<mix:denominator>100</mix:denominator>
</mix:lumaGreen>
<mix:lumaBlue>
<mix:numerator>0</mix:numerator>
<mix:denominator>100</mix:denominator>
</mix:lumaBlue>
</mix:YCbCrCoefficients>
</mix:YCbCr>
<mix:ReferenceBlackWhite>
<mix:Component>
<mix:componentPhotometricInterpretation>Y</mix:componentPhotometricInterpretation>
<mix:footroom>
<mix:numerator>0</mix:numerator>
<mix:denominator>100</mix:denominator>
</mix:footroom>
<mix:headroom>
<mix:numerator>0</mix:numerator>
<mix:denominator>100</mix:denominator>
</mix:headroom>
</mix:Component>
<mix:Component>
<mix:componentPhotometricInterpretation>Cb</mix:componentPhotometricInterpretation>
<mix:footroom>
<mix:numerator>0</mix:numerator>
<mix:denominator>100</mix:denominator>
</mix:footroom>
<mix:headroom>
<mix:numerator>0</mix:numerator>
<mix:denominator>100</mix:denominator>
</mix:headroom>
</mix:Component>
<mix:Component>
<mix:componentPhotometricInterpretation>Cr</mix:componentPhotometricInterpretation>
<mix:footroom>
<mix:numerator>0</mix:numerator>
<mix:denominator>100</mix:denominator>
</mix:footroom>
<mix:headroom>
<mix:numerator>0</mix:numerator>
<mix:denominator>100</mix:denominator>
</mix:headroom>
</mix:Component>
</mix:ReferenceBlackWhite>
</mix:PhotometricInterpretation>
</mix:BasicImageCharacteristics>
</mix:BasicImageInformation>
<mix:ImageCaptureMetadata>
<mix:GeneralCaptureInformation>
<mix:dateTimeCreated>2005-07-15T16:26:58.0Z</mix:dateTimeCreated>
</mix:GeneralCaptureInformation>
<mix:ScannerCapture>
<mix:ScanningSystemSoftware>
<mix:scanningSoftwareName>Adobe Photoshop Elements 2.0</mix:scanningSoftwareName>
</mix:ScanningSystemSoftware>
</mix:ScannerCapture>
<mix:DigitalCameraCapture>
<mix:DigitalCameraModel />
<mix:CameraCaptureSettings>
<mix:ImageData>
<mix:fNumber>0.0</mix:fNumber>
<mix:exposureTime>0.0</mix:exposureTime>
<mix:exposureProgram>Not defined</mix:exposureProgram>
<mix:shutterSpeedValue>
<mix:numerator>1</mix:numerator>
<mix:denominator>1</mix:denominator>
</mix:shutterSpeedValue>
<mix:apertureValue>
<mix:numerator>100</mix:numerator>
<mix:denominator>100</mix:denominator>
</mix:apertureValue>
<mix:brightnessValue>
<mix:numerator>0</mix:numerator>
<mix:denominator>1</mix:denominator>
</mix:brightnessValue>
<mix:exposureBiasValue>
<mix:numerator>0</mix:numerator>
<mix:denominator>1</mix:denominator>
</mix:exposureBiasValue>
<mix:maxApertureValue>
<mix:numerator>100</mix:numerator>
<mix:denominator>100</mix:denominator>
</mix:maxApertureValue>
<mix:lightSource>unknown</mix:lightSource>
<mix:flash>Flash did not fire</mix:flash>
<mix:focalLength>0.0</mix:focalLength>
</mix:ImageData>
</mix:CameraCaptureSettings>
</mix:DigitalCameraCapture>
<mix:orientation>normal*</mix:orientation>
</mix:ImageCaptureMetadata>
<mix:ImageAssessmentMetadata>
<mix:SpatialMetrics>
<mix:samplingFrequencyUnit>in.</mix:samplingFrequencyUnit>
<mix:xSamplingFrequency>
<mix:numerator>1200</mix:numerator>
<mix:denominator>1</mix:denominator>
</mix:xSamplingFrequency>
<mix:ySamplingFrequency>
<mix:numerator>1200</mix:numerator>
<mix:denominator>1</mix:denominator>
</mix:ySamplingFrequency>
</mix:SpatialMetrics>
<mix:ImageColorEncoding>
<mix:BitsPerSample>
<mix:bitsPerSampleValue>8</mix:bitsPerSampleValue>
<mix:bitsPerSampleValue>8</mix:bitsPerSampleValue>
<mix:bitsPerSampleValue>8</mix:bitsPerSampleValue>
<mix:bitsPerSampleUnit>integer</mix:bitsPerSampleUnit>
</mix:BitsPerSample>
<mix:samplesPerPixel>3</mix:samplesPerPixel>
<mix:WhitePoint>
<mix:whitePointXValue>
<mix:numerator>0</mix:numerator>
<mix:denominator>1</mix:denominator>
</mix:whitePointXValue>
<mix:whitePointYValue>
<mix:numerator>0</mix:numerator>
<mix:denominator>1</mix:denominator>
</mix:whitePointYValue>
</mix:WhitePoint>
</mix:ImageColorEncoding>
</mix:ImageAssessmentMetadata>
</mix:mix>
</standard>
</image>
</metadata>
<statistics fitsExecutionTime="408">
<tool toolname="MediaInfo" toolversion="0.7.75" status="did not run" />
<tool toolname="OIS Audio Information" toolversion="0.1" status="did not run" />
<tool toolname="ADL Tool" toolversion="0.1" status="did not run" />
<tool toolname="VTT Tool" toolversion="0.1" status="did not run" />
<tool toolname="Droid" toolversion="6.1.5" executionTime="45" />
<tool toolname="Jhove" toolversion="1.11" executionTime="299" />
<tool toolname="file utility" toolversion="5.04" executionTime="133" />
<tool toolname="Exiftool" toolversion="10.00" executionTime="357" />
<tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" executionTime="302" />
<tool toolname="OIS File Information" toolversion="0.2" executionTime="19" />
<tool toolname="OIS XML Metadata" toolversion="0.2" status="did not run" />
<tool toolname="ffident" toolversion="0.2" executionTime="61" />
<tool toolname="Tika" toolversion="1.10" executionTime="179" />
</statistics>
</fits>

Loading

0 comments on commit 8258e6c

Please sign in to comment.