From 4e059a6b958d1142599629cfcc28f08bf0709bf3 Mon Sep 17 00:00:00 2001
From: Dustin Oprea <dustin@randomingenuity.com>
Date: Sat, 11 Jul 2020 02:49:16 -0400
Subject: [PATCH] Drop inline RELEASE TO-DOs from v2. They are now active tasks
in v3.
---
v2/common/ifd.go | 4 ----
v2/common/utility.go | 3 ---
v2/ifd.go | 6 ------
v2/ifd_enumerate.go | 3 ---
v2/utility.go | 5 -----
5 files changed, 21 deletions(-)
diff --git a/v2/common/ifd.go b/v2/common/ifd.go
index c0e9ad0..9b93f04 100644
--- a/v2/common/ifd.go
+++ b/v2/common/ifd.go
@@ -67,8 +67,6 @@ func NewIfdMappingWithStandard() (ifdMapping *IfdMapping) {
}
}()
- // RELEASE(dustin): Add error return on next release
-
im := NewIfdMapping()
err := LoadStandardIfds(im)
@@ -654,8 +652,6 @@ var (
)
var (
- // RELEASE(dustin): These are for backwards-compatibility. These used to be strings but are now IfdIdentity structs and the newer "StandardIfdIdentity" symbols above should be used instead. These will be removed in the next release.
-
IfdPathStandard = IfdStandardIfdIdentity
IfdPathStandardExif = IfdExifStandardIfdIdentity
IfdPathStandardExifIop = IfdExifIopStandardIfdIdentity
diff --git a/v2/common/utility.go b/v2/common/utility.go
index 35e4712..65165bf 100644
--- a/v2/common/utility.go
+++ b/v2/common/utility.go
@@ -73,9 +73,6 @@ func DumpBytesClauseToString(data []byte) string {
// ExifFullTimestampString produces a string like "2018:11:30 13:01:49" from a
// `time.Time` struct. It will attempt to convert to UTC first.
func ExifFullTimestampString(t time.Time) (fullTimestampPhrase string) {
-
- // RELEASE(dustin): Dump this for the next release. It duplicates the same function now in exifcommon.
-
t = t.UTC()
return fmt.Sprintf("%04d:%02d:%02d %02d:%02d:%02d", t.Year(), t.Month(), t.Day(), t.Hour(), t.Minute(), t.Second())
diff --git a/v2/ifd.go b/v2/ifd.go
index 5d122a7..80872e6 100644
--- a/v2/ifd.go
+++ b/v2/ifd.go
@@ -9,23 +9,17 @@ import (
// TODO(dustin): This file now exists for backwards-compatibility only.
// NewIfdMapping returns a new IfdMapping struct.
-//
-// RELEASE(dustin): This is a bridging function for backwards-compatibility. Remove this in the next release.
func NewIfdMapping() (ifdMapping *exifcommon.IfdMapping) {
return exifcommon.NewIfdMapping()
}
// NewIfdMappingWithStandard retruns a new IfdMapping struct preloaded with the
// standard IFDs.
-//
-// RELEASE(dustin): This is a bridging function for backwards-compatibility. Remove this in the next release.
func NewIfdMappingWithStandard() (ifdMapping *exifcommon.IfdMapping) {
return exifcommon.NewIfdMappingWithStandard()
}
// LoadStandardIfds loads the standard IFDs into the mapping.
-//
-// RELEASE(dustin): This is a bridging function for backwards-compatibility. Remove this in the next release.
func LoadStandardIfds(im *exifcommon.IfdMapping) (err error) {
defer func() {
if state := recover(); state != nil {
diff --git a/v2/ifd_enumerate.go b/v2/ifd_enumerate.go
index ef49ab8..e30da77 100644
--- a/v2/ifd_enumerate.go
+++ b/v2/ifd_enumerate.go
@@ -262,8 +262,6 @@ func (ie *IfdEnumerate) parseTag(ii *exifcommon.IfdIdentity, tagPosition int, bp
return ite, nil
}
-// RELEASE(dustin): Drop fqIfdPath and ifdIndex arguments to visitor callback. They're both accessible on the IfdTagEntry struct.
-
// TagVisitorFn is called for each tag when enumerating through the EXIF.
type TagVisitorFn func(fqIfdPath string, ifdIndex int, ite *IfdTagEntry) (err error)
@@ -615,7 +613,6 @@ func (ie *IfdEnumerate) Scan(iiRoot *exifcommon.IfdIdentity, ifdOffset uint32, v
// Ifd represents a single, parsed IFD.
type Ifd struct {
- // RELEASE(dustin): !! Why are all of these exported? Stop doing this in the next release.
// TODO(dustin): Add NextIfd().
ifdIdentity *exifcommon.IfdIdentity
diff --git a/v2/utility.go b/v2/utility.go
index e588d35..4d60c56 100644
--- a/v2/utility.go
+++ b/v2/utility.go
@@ -75,9 +75,6 @@ func ParseExifFullTimestamp(fullTimestampPhrase string) (timestamp time.Time, er
// ExifFullTimestampString produces a string like "2018:11:30 13:01:49" from a
// `time.Time` struct. It will attempt to convert to UTC first.
func ExifFullTimestampString(t time.Time) (fullTimestampPhrase string) {
-
- // RELEASE(dustin): Dump this for the next release. It duplicates the same function now in exifcommon.
-
return exifcommon.ExifFullTimestampString(t)
}
@@ -135,8 +132,6 @@ func (et ExifTag) String() string {
len(et.ValueBytes), et.ChildIfdPath)
}
-// RELEASE(dustin): In the next release, add an options struct to Scan() and GetFlatExifData(), and put the MiscellaneousExifData in the return.
-
// GetFlatExifData returns a simple, flat representation of all tags.
func GetFlatExifData(exifData []byte) (exifTags []ExifTag, err error) {
defer func() {