gabehf/bimg
1
0
Fork 0
mirror of https://github.com/talgo-cloud/bimg.git synced 2026-03-16 10:55:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove unsupported exif tag

Browse source
This commit is contained in:
fredrsf 2020-08-04 13:38:08 +03:00
parent f78feff277
commit afd5149c74
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
metadata.go
View file

@ -36,6 +36,7 @@ const (
MakerNote = "exif-ifd2-MakerNote" MakerNote = "exif-ifd2-MakerNote"
SubSecTimeOriginal = "exif-ifd2-SubSecTimeOriginal" SubSecTimeOriginal = "exif-ifd2-SubSecTimeOriginal"
SubSecTimeDigitized = "exif-ifd2-SubSecTimeDigitized" SubSecTimeDigitized = "exif-ifd2-SubSecTimeDigitized"
FlashPixVersion = "exif-ifd2-FlashpixVersion"
ColorSpace = "exif-ifd2-ColorSpace" ColorSpace = "exif-ifd2-ColorSpace"
PixelXDimension = "exif-ifd2-PixelXDimension" PixelXDimension = "exif-ifd2-PixelXDimension"
PixelYDimension = "exif-ifd2-PixelYDimension" PixelYDimension = "exif-ifd2-PixelYDimension"
@ -45,6 +46,7 @@ const (
WhiteBalance = "exif-ifd2-WhiteBalance" WhiteBalance = "exif-ifd2-WhiteBalance"
FocalLengthIn35mmFilm = "exif-ifd2-FocalLengthIn35mmFilm" FocalLengthIn35mmFilm = "exif-ifd2-FocalLengthIn35mmFilm"
SceneCaptureType = "exif-ifd2-SceneCaptureType" SceneCaptureType = "exif-ifd2-SceneCaptureType"
LensSpecification = "exif-ifd2-LensSpecification"
LensMake = "exif-ifd2-LensMake" LensMake = "exif-ifd2-LensMake"
LensModel = "exif-ifd2-LensModel" LensModel = "exif-ifd2-LensModel"
CompositeImage = "exif-ifd2-CompositeImage" CompositeImage = "exif-ifd2-CompositeImage"
@ -122,6 +124,7 @@ type EXIF struct {
MakerNote string MakerNote string
SubSecTimeOriginal string SubSecTimeOriginal string
SubSecTimeDigitized string SubSecTimeDigitized string
FlashPixVersion string
ColorSpace int ColorSpace int
PixelXDimension int PixelXDimension int
PixelYDimension int PixelYDimension int
@ -131,6 +134,7 @@ type EXIF struct {
WhiteBalance int WhiteBalance int
FocalLengthIn35mmFilm int FocalLengthIn35mmFilm int
SceneCaptureType int SceneCaptureType int
LensSpecification string
LensMake string LensMake string
LensModel string LensModel string
CompositeImage int CompositeImage int
@ -238,6 +242,7 @@ func Metadata(buf []byte) (ImageMetadata, error) {
MakerNote: vipsExifStringTag(image, MakerNote), MakerNote: vipsExifStringTag(image, MakerNote),
SubSecTimeOriginal: vipsExifStringTag(image, SubSecTimeOriginal), SubSecTimeOriginal: vipsExifStringTag(image, SubSecTimeOriginal),
SubSecTimeDigitized: vipsExifStringTag(image, SubSecTimeDigitized), SubSecTimeDigitized: vipsExifStringTag(image, SubSecTimeDigitized),
FlashPixVersion: vipsExifStringTag(image, FlashPixVersion),
ColorSpace: vipsExifIntTag(image, ColorSpace), ColorSpace: vipsExifIntTag(image, ColorSpace),
PixelXDimension: vipsExifIntTag(image, PixelXDimension), PixelXDimension: vipsExifIntTag(image, PixelXDimension),
PixelYDimension: vipsExifIntTag(image, PixelYDimension), PixelYDimension: vipsExifIntTag(image, PixelYDimension),
@ -247,6 +252,7 @@ func Metadata(buf []byte) (ImageMetadata, error) {
WhiteBalance: vipsExifIntTag(image, WhiteBalance), WhiteBalance: vipsExifIntTag(image, WhiteBalance),
FocalLengthIn35mmFilm: vipsExifIntTag(image, FocalLengthIn35mmFilm), FocalLengthIn35mmFilm: vipsExifIntTag(image, FocalLengthIn35mmFilm),
SceneCaptureType: vipsExifIntTag(image, SceneCaptureType), SceneCaptureType: vipsExifIntTag(image, SceneCaptureType),
LensSpecification: vipsExifStringTag(image, LensSpecification),
LensMake: vipsExifStringTag(image, LensMake), LensMake: vipsExifStringTag(image, LensMake),
LensModel: vipsExifStringTag(image, LensModel), LensModel: vipsExifStringTag(image, LensModel),
CompositeImage: vipsExifIntTag(image, CompositeImage), CompositeImage: vipsExifIntTag(image, CompositeImage),

10
metadata_test.go
View file

@ -99,6 +99,7 @@ func TestEXIF(t *testing.T) {
ResolutionUnit: 2, ResolutionUnit: 2,
YCbCrPositioning: 1, YCbCrPositioning: 1,
ExifVersion: "Exif Version 2.1", ExifVersion: "Exif Version 2.1",
FlashPixVersion: "FlashPix Version 1.0",
ColorSpace: 65535, ColorSpace: 65535,
}, },
"test_exif.jpg": { "test_exif.jpg": {
@ -120,6 +121,7 @@ func TestEXIF(t *testing.T) {
MeteringMode: 1, MeteringMode: 1,
Flash: 0, Flash: 0,
FocalLength: "4/1", FocalLength: "4/1",
FlashPixVersion: "FlashPix Version 1.0",
WhiteBalance: 1, WhiteBalance: 1,
ColorSpace: 65535, ColorSpace: 65535,
}, },
@ -151,6 +153,7 @@ func TestEXIF(t *testing.T) {
SubSecTime: "00", SubSecTime: "00",
SubSecTimeOriginal: "00", SubSecTimeOriginal: "00",
SubSecTimeDigitized: "00", SubSecTimeDigitized: "00",
FlashPixVersion: "FlashPix Version 1.0",
ColorSpace: 1, ColorSpace: 1,
PixelXDimension: 100, PixelXDimension: 100,
PixelYDimension: 68, PixelYDimension: 68,
@ -204,6 +207,7 @@ func TestEXIF(t *testing.T) {
WhiteBalance: 0, WhiteBalance: 0,
FocalLengthIn35mmFilm: 26, FocalLengthIn35mmFilm: 26,
SceneCaptureType: 0, SceneCaptureType: 0,
LensSpecification: "17/4 6/1 9/5 12/5",
LensMake: "Apple", LensMake: "Apple",
LensModel: "iPhone XS back dual camera 4.25mm f/1.8", LensModel: "iPhone XS back dual camera 4.25mm f/1.8",
CompositeImage: 2, CompositeImage: 2,
@ -343,12 +347,6 @@ func TestEXIF(t *testing.T) {
if metadata.EXIF.SceneCaptureType != file.SceneCaptureType { if metadata.EXIF.SceneCaptureType != file.SceneCaptureType {
t.Fatalf("Unexpected image exif SceneCaptureType: %d != %d", metadata.EXIF.SceneCaptureType, file.SceneCaptureType) t.Fatalf("Unexpected image exif SceneCaptureType: %d != %d", metadata.EXIF.SceneCaptureType, file.SceneCaptureType)
} }
if metadata.EXIF.LensMake != file.LensMake {
t.Fatalf("Unexpected image exif LensMake: %s != %s", metadata.EXIF.LensMake, file.LensMake)
}
if metadata.EXIF.LensModel != file.LensModel {
t.Fatalf("Unexpected image exif LensModel: %s != %s", metadata.EXIF.LensModel, file.LensModel)
}
if metadata.EXIF.CompositeImage != file.CompositeImage { if metadata.EXIF.CompositeImage != file.CompositeImage {
t.Fatalf("Unexpected image exif CompositeImage: %d != %d", metadata.EXIF.CompositeImage, file.CompositeImage) t.Fatalf("Unexpected image exif CompositeImage: %d != %d", metadata.EXIF.CompositeImage, file.CompositeImage)
} }