xymp
/
exiv2
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for HEJ2K mime type

Browse Source
main
Miloš Komarčević 2 years ago committed by Miloš Komarčević
parent 13c7d81a43
commit 5645fe6c8c
3 changed files with 115 additions and 0 deletions
Show Stats Download Patch File Download Diff File

6
src/bmffimage.cpp
Unescape Escape View File

@ -37,6 +37,8 @@ enum {
TAG_heim = 0x6865696dU, //!< "heim" HEIC */ TAG_heim = 0x6865696dU, //!< "heim" HEIC */
TAG_heis = 0x68656973U, //!< "heis" HEIC */ TAG_heis = 0x68656973U, //!< "heis" HEIC */
TAG_heix = 0x68656978U, //!< "heix" HEIC */ TAG_heix = 0x68656978U, //!< "heix" HEIC */
TAG_j2is = 0x6a326973U, //!< "j2is" HEJ2K */
TAG_j2ki = 0x6a326b69U, //!< "j2ki" HEJ2K */
TAG_mif1 = 0x6d696631U, //!< "mif1" HEIF */ TAG_mif1 = 0x6d696631U, //!< "mif1" HEIF */
TAG_crx = 0x63727820U, //!< "crx " Canon CR3 */ TAG_crx = 0x63727820U, //!< "crx " Canon CR3 */
TAG_jxl = 0x6a786c20U, //!< "jxl " JPEG XL file type */ TAG_jxl = 0x6a786c20U, //!< "jxl " JPEG XL file type */
@ -131,6 +133,10 @@ std::string BmffImage::mimeType() const {
case TAG_heif: case TAG_heif:
case TAG_mif1: case TAG_mif1:
return "image/heif"; return "image/heif";
case TAG_j2is:
return "image/j2is";
case TAG_j2ki:
return "image/hej2k";
case TAG_crx: case TAG_crx:
return "image/x-canon-cr3"; return "image/x-canon-cr3";
case TAG_jxl: case TAG_jxl:

BIN
test/data/Reagan.hej2
View File

Binary file not shown.

109
test/data/test_reference_files/Reagan.hej2.out
Unescape Escape View File

@ -0,0 +1,109 @@
Exif.Image.ImageWidth Short 1 200 200
Exif.Image.ImageLength Short 1 130 130
Exif.Image.BitsPerSample Short 4 8 8 8 8 8 8 8 8
Exif.Image.Compression Short 1 1 Uncompressed
Exif.Image.PhotometricInterpretation Short 1 2 RGB
Exif.Image.ImageDescription Ascii 403 040621-N-6536T-062
USS Ronald Reagan (CVN 76), June 21, 2004 - USS Ronald Reagan (CVN 76) sails through the Straits of Magellan on its way to the Pacific Ocean. The Navyís newest aircraft carrier is underway circumnavigating South America in transit to its new homeport of San Diego. U.S. Navy photo by Photographerís Mate 3rd Class (AW) Elizabeth Thompson. (RELEASE)
040621-N-6536T-062
USS Ronald Reagan (CVN 76), June 21, 2004 - USS Ronald Reagan (CVN 76) sails through the Straits of Magellan on its way to the Pacific Ocean. The Navyís newest aircraft carrier is underway circumnavigating South America in transit to its new homeport of San Diego. U.S. Navy photo by Photographerís Mate 3rd Class (AW) Elizabeth Thompson. (RELEASE)
Exif.Image.Make Ascii 18 NIKON CORPORATION NIKON CORPORATION
Exif.Image.Model Ascii 10 NIKON D1X NIKON D1X
Exif.Image.Orientation Short 1 1 top, left
Exif.Image.SamplesPerPixel Short 1 4 4
Exif.Image.XResolution Rational 1 3000000/10000 300
Exif.Image.YResolution Rational 1 3000000/10000 300
Exif.Image.PlanarConfiguration Short 1 1 Chunky
Exif.Image.ResolutionUnit Short 1 2 inch
Exif.Image.Software Ascii 40 Adobe Photoshop Elements 12.0 Macintosh Adobe Photoshop Elements 12.0 Macintosh
Exif.Image.DateTime Ascii 20 2016:09:13 11:58:16 2016:09:13 11:58:16
Exif.Image.Artist Ascii 34 Photographerís Mate 3rd Class (A Photographerís Mate 3rd Class (A
Exif.Image.ExifTag Long 1 792 792
Exif.Photo.ExposureTime Rational 1 1/125 1/125 s
Exif.Photo.FNumber Rational 1 5/1 F5
Exif.Photo.ExposureProgram Short 1 1 Manual
Exif.Photo.ExifVersion Undefined 4 48 50 50 48 2.20
Exif.Photo.DateTimeOriginal Ascii 20 2004:06:21 23:37:53 2004:06:21 23:37:53
Exif.Photo.DateTimeDigitized Ascii 20 2004:06:21 23:37:53 2004:06:21 23:37:53
Exif.Photo.ComponentsConfiguration Undefined 4 1 2 3 0 YCbCr
Exif.Photo.CompressedBitsPerPixel Rational 1 4/1 4
Exif.Photo.ShutterSpeedValue SRational 1 6965784/1000000 1/125 s
Exif.Photo.ApertureValue Rational 1 4643856/1000000 F5
Exif.Photo.ExposureBiasValue SRational 1 1/3 +1/3 EV
Exif.Photo.MaxApertureValue Rational 1 3/1 F2.8
Exif.Photo.MeteringMode Short 1 2 Center weighted average
Exif.Photo.LightSource Short 1 10 Cloudy weather
Exif.Photo.Flash Short 1 0 No flash
Exif.Photo.FocalLength Rational 1 42/1 42.0 mm
Exif.Photo.SubSecTime Ascii 3 06 06
Exif.Photo.SubSecTimeOriginal Ascii 3 06 06
Exif.Photo.SubSecTimeDigitized Ascii 3 06 06
Exif.Photo.FlashpixVersion Undefined 4 48 49 48 48 1.00
Exif.Photo.ColorSpace Short 1 65535 Uncalibrated
Exif.Photo.PixelXDimension Long 1 200 200
Exif.Photo.PixelYDimension Long 1 130 130
Exif.Photo.SensingMethod Short 1 2 One-chip color area
Exif.Photo.FileSource Undefined 1 3 Digital still camera
Exif.Photo.SceneType Undefined 1 1 Directly photographed
Exif.Photo.CustomRendered Short 1 0 Normal process
Exif.Photo.ExposureMode Short 1 1 Manual
Exif.Photo.WhiteBalance Short 1 1 Manual
Exif.Photo.DigitalZoomRatio Rational 1 1/1 1.0
Exif.Photo.FocalLengthIn35mmFilm Short 1 63 63.0 mm
Exif.Photo.SceneCaptureType Short 1 0 Standard
Exif.Photo.GainControl Short 1 0 None
Exif.Photo.Contrast Short 1 0 Normal
Exif.Photo.Saturation Short 1 0 Normal
Exif.Photo.Sharpness Short 1 0 Normal
Exif.Photo.SubjectDistanceRange Short 1 0 Unknown
Exif.Photo.ImageUniqueID Ascii 33 127c1377b054a3f65bf2754ebb24e7f2 127c1377b054a3f65bf2754ebb24e7f2
Exif.Image.GPSTag Long 1 1400 1400
Exif.GPSInfo.GPSVersionID Byte 4 2 2 0 0 2.2.0.0
Exif.Thumbnail.Compression Short 1 6 JPEG (old-style)
Exif.Thumbnail.XResolution Rational 1 72/1 72
Exif.Thumbnail.YResolution Rational 1 72/1 72
Exif.Thumbnail.ResolutionUnit Short 1 2 inch
Exif.Thumbnail.JPEGInterchangeFormat Long 1 1514 1514
Exif.Thumbnail.JPEGInterchangeFormatLength Long 1 4196 4196
Xmp.xmp.ModifyDate XmpText 25 2016-09-13T11:58:16+01:00 2016-09-13T11:58:16+01:00
Xmp.xmp.CreateDate XmpText 25 2004-06-21T23:37:53+01:00 2004-06-21T23:37:53+01:00
Xmp.xmp.MetadataDate XmpText 25 2016-09-13T11:58:16+01:00 2016-09-13T11:58:16+01:00
Xmp.xmp.CreatorTool XmpText 38 Adobe Photoshop Elements 6.0 Macintosh Adobe Photoshop Elements 6.0 Macintosh
Xmp.photoshop.Instructions XmpText 49 Credit as U.S. Navy photo by Elizabeth Thompson. Credit as U.S. Navy photo by Elizabeth Thompson.
Xmp.photoshop.CaptionWriter XmpText 9 Dir. NVNS Dir. NVNS
Xmp.photoshop.Urgency XmpText 1 5 5
Xmp.photoshop.City XmpText 19 Straits of Magellan Straits of Magellan
Xmp.photoshop.Category XmpText 1 N N
Xmp.photoshop.Country XmpText 13 South America South America
Xmp.photoshop.Credit XmpText 8 U.S Navy U.S Navy
Xmp.photoshop.AuthorsPosition XmpText 21 U.S Navy Photographer U.S Navy Photographer
Xmp.photoshop.DateCreated XmpText 10 2004-06-21 2004-06-21
Xmp.photoshop.Source XmpText 24 Navy Visual News Service Navy Visual News Service
Xmp.photoshop.LegacyIPTCDigest XmpText 32 977177A6C759A2BBD07317E3D5921073 977177A6C759A2BBD07317E3D5921073
Xmp.photoshop.ColorMode XmpText 1 3 3
Xmp.photoshop.ICCProfile XmpText 16 Adobe RGB (1998) Adobe RGB (1998)
Xmp.photoshop.SupplementalCategories XmpBag 3 703-614-9154, navyvisualnews@navy.mil, UNCLASSFIED 703-614-9154, navyvisualnews@navy.mil, UNCLASSFIED
Xmp.xmpMM.InstanceID XmpText 40 xmp.iid:F77F117407206811822A8C00775B3FDC xmp.iid:F77F117407206811822A8C00775B3FDC
Xmp.xmpMM.DocumentID XmpText 37 uuid:D6CBDC1D8DF2E511BA6BFBE914561F6D uuid:D6CBDC1D8DF2E511BA6BFBE914561F6D
Xmp.xmpMM.OriginalDocumentID XmpText 37 uuid:D6CBDC1D8DF2E511BA6BFBE914561F6D uuid:D6CBDC1D8DF2E511BA6BFBE914561F6D
Xmp.xmpMM.DerivedFrom XmpText 0 type="Struct"
Xmp.xmpMM.DerivedFrom/stRef:instanceID XmpText 41 uuid:ec11a6b0-cc13-11d8-9c21-fa22e28297f6 uuid:ec11a6b0-cc13-11d8-9c21-fa22e28297f6
Xmp.xmpMM.DerivedFrom/stRef:documentID XmpText 58 adobe:docid:photoshop:1c90e091-c489-11d8-ad7d-b4c1b2598b09 adobe:docid:photoshop:1c90e091-c489-11d8-ad7d-b4c1b2598b09
Xmp.xmpMM.History XmpText 0 type="Seq"
Xmp.xmpMM.History[1] XmpText 0 type="Struct"
Xmp.xmpMM.History[1]/stEvt:action XmpText 5 saved saved
Xmp.xmpMM.History[1]/stEvt:instanceID XmpText 40 xmp.iid:F77F117407206811822A8C00775B3FDC xmp.iid:F77F117407206811822A8C00775B3FDC
Xmp.xmpMM.History[1]/stEvt:when XmpText 25 2016-09-13T11:58:16+01:00 2016-09-13T11:58:16+01:00
Xmp.xmpMM.History[1]/stEvt:softwareAgent XmpText 39 Adobe Photoshop Elements 12.0 Macintosh Adobe Photoshop Elements 12.0 Macintosh
Xmp.xmpMM.History[1]/stEvt:changed XmpText 1 / /
Xmp.dc.format XmpText 10 image/jpeg image/jpeg
Xmp.dc.description LangAlt 1 lang="x-default" 040621-N-6536T-062
USS Ronald Reagan (CVN 76), June 21, 2004 - USS Ronald Reagan (CVN 76) sails through the Straits of Magellan on its way to the Pacific Ocean. The Navyís newest aircraft carrier is underway circumnavigating South America in transit to its new homeport of San Diego. U.S. Navy photo by Photographerís Mate 3rd Class (AW) Elizabeth Thompson. (RELEASE)
lang="x-default" 040621-N-6536T-062
USS Ronald Reagan (CVN 76), June 21, 2004 - USS Ronald Reagan (CVN 76) sails through the Straits of Magellan on its way to the Pacific Ocean. The Navyís newest aircraft carrier is underway circumnavigating South America in transit to its new homeport of San Diego. U.S. Navy photo by Photographerís Mate 3rd Class (AW) Elizabeth Thompson. (RELEASE)
Xmp.dc.title LangAlt 1 lang="x-default" 040621-N-6536T-062 lang="x-default" 040621-N-6536T-062
Xmp.dc.creator XmpSeq 1 Photographerís Mate 3rd Class (A Photographerís Mate 3rd Class (A
Xmp.dc.subject XmpBag 10 ronald reagan, reagan, cvn 76, cvn-76, straights magellan, magellan, carrier, nimitz-class, ship, underway ronald reagan, reagan, cvn 76, cvn-76, straights magellan, magellan, carrier, nimitz-class, ship, underway
Xmp.xmpRights.Marked XmpText 5 False False
Write Preview
Loading…
Cancel
Save