From afd5149c74679ad1aadd1c17af5b6a2ca3e9435d Mon Sep 17 00:00:00 2001
From: fredrsf <kaznahovskiy.s@concord-consulting.org>
Date: Tue, 4 Aug 2020 13:38:08 +0300
Subject: [PATCH] remove unsupported exif tag

---
 metadata.go      |  6 ++++++
 metadata_test.go | 10 ++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/metadata.go b/metadata.go
index c6c58bb..2f6f730 100644
--- a/metadata.go
+++ b/metadata.go
@@ -36,6 +36,7 @@ const (
 	MakerNote = "exif-ifd2-MakerNote"
 	SubSecTimeOriginal = "exif-ifd2-SubSecTimeOriginal"
 	SubSecTimeDigitized = "exif-ifd2-SubSecTimeDigitized"
+	FlashPixVersion = "exif-ifd2-FlashpixVersion"
 	ColorSpace = "exif-ifd2-ColorSpace"
 	PixelXDimension = "exif-ifd2-PixelXDimension"
 	PixelYDimension = "exif-ifd2-PixelYDimension"
@@ -45,6 +46,7 @@ const (
 	WhiteBalance = "exif-ifd2-WhiteBalance"
 	FocalLengthIn35mmFilm = "exif-ifd2-FocalLengthIn35mmFilm"
 	SceneCaptureType = "exif-ifd2-SceneCaptureType"
+	LensSpecification = "exif-ifd2-LensSpecification"
 	LensMake = "exif-ifd2-LensMake"
 	LensModel = "exif-ifd2-LensModel"
 	CompositeImage = "exif-ifd2-CompositeImage"
@@ -122,6 +124,7 @@ type EXIF struct {
 	MakerNote string
 	SubSecTimeOriginal string
 	SubSecTimeDigitized string
+	FlashPixVersion string
 	ColorSpace int
 	PixelXDimension int
 	PixelYDimension int
@@ -131,6 +134,7 @@ type EXIF struct {
 	WhiteBalance int
 	FocalLengthIn35mmFilm int
 	SceneCaptureType int
+	LensSpecification string
 	LensMake string
 	LensModel string
 	CompositeImage int
@@ -238,6 +242,7 @@ func Metadata(buf []byte) (ImageMetadata, error) {
 			MakerNote: vipsExifStringTag(image, MakerNote),
 			SubSecTimeOriginal: vipsExifStringTag(image, SubSecTimeOriginal),
 			SubSecTimeDigitized: vipsExifStringTag(image, SubSecTimeDigitized),
+			FlashPixVersion: vipsExifStringTag(image, FlashPixVersion),
 			ColorSpace: vipsExifIntTag(image, ColorSpace),
 			PixelXDimension: vipsExifIntTag(image, PixelXDimension),
 			PixelYDimension: vipsExifIntTag(image, PixelYDimension),
@@ -247,6 +252,7 @@ func Metadata(buf []byte) (ImageMetadata, error) {
 			WhiteBalance: vipsExifIntTag(image, WhiteBalance),
 			FocalLengthIn35mmFilm: vipsExifIntTag(image, FocalLengthIn35mmFilm),
 			SceneCaptureType: vipsExifIntTag(image, SceneCaptureType),
+			LensSpecification: vipsExifStringTag(image, LensSpecification),
 			LensMake: vipsExifStringTag(image, LensMake),
 			LensModel: vipsExifStringTag(image, LensModel),
 			CompositeImage: vipsExifIntTag(image, CompositeImage),
diff --git a/metadata_test.go b/metadata_test.go
index 02882e7..61b32bc 100644
--- a/metadata_test.go
+++ b/metadata_test.go
@@ -99,6 +99,7 @@ func TestEXIF(t *testing.T) {
 			ResolutionUnit: 2,
 			YCbCrPositioning: 1,
 			ExifVersion: "Exif Version 2.1",
+			FlashPixVersion: "FlashPix Version 1.0",
 			ColorSpace: 65535,
 		},
 		"test_exif.jpg":        {
@@ -120,6 +121,7 @@ func TestEXIF(t *testing.T) {
 			MeteringMode: 1,
 			Flash: 0,
 			FocalLength: "4/1",
+			FlashPixVersion: "FlashPix Version 1.0",
 			WhiteBalance: 1,
 			ColorSpace: 65535,
 		},
@@ -151,6 +153,7 @@ func TestEXIF(t *testing.T) {
 			SubSecTime: "00",
 			SubSecTimeOriginal: "00",
 			SubSecTimeDigitized: "00",
+			FlashPixVersion: "FlashPix Version 1.0",
 			ColorSpace: 1,
 			PixelXDimension: 100,
 			PixelYDimension: 68,
@@ -204,6 +207,7 @@ func TestEXIF(t *testing.T) {
 			WhiteBalance: 0,
 			FocalLengthIn35mmFilm: 26,
 			SceneCaptureType: 0,
+			LensSpecification: "17/4 6/1 9/5 12/5",
 			LensMake: "Apple",
 			LensModel: "iPhone XS back dual camera 4.25mm f/1.8",
 			CompositeImage: 2,
@@ -343,12 +347,6 @@ func TestEXIF(t *testing.T) {
 		if 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 {
 			t.Fatalf("Unexpected image exif CompositeImage: %d != %d", metadata.EXIF.CompositeImage, file.CompositeImage)
 		}