diff options
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/codeberg.org/superseriousbusiness/exif-terminator/jpeg.go | 2 | ||||
| -rw-r--r-- | vendor/codeberg.org/superseriousbusiness/exif-terminator/png.go | 2 | ||||
| -rw-r--r-- | vendor/codeberg.org/superseriousbusiness/exif-terminator/terminator.go | 4 | ||||
| -rw-r--r-- | vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/.MODULE_ROOT (renamed from vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/.MODULE_ROOT) | 0 | ||||
| -rw-r--r-- | vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/LICENSE (renamed from vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/LICENSE) | 0 | ||||
| -rw-r--r-- | vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/README.md | 7 | ||||
| -rw-r--r-- | vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/markers.go (renamed from vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/markers.go) | 0 | ||||
| -rw-r--r-- | vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/media_parser.go (renamed from vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/media_parser.go) | 0 | ||||
| -rw-r--r-- | vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/segment.go (renamed from vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/segment.go) | 0 | ||||
| -rw-r--r-- | vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/segment_list.go (renamed from vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/segment_list.go) | 0 | ||||
| -rw-r--r-- | vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/splitter.go (renamed from vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/splitter.go) | 0 | ||||
| -rw-r--r-- | vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/testing_common.go (renamed from vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/testing_common.go) | 0 | ||||
| -rw-r--r-- | vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/utility.go (renamed from vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/utility.go) | 0 | ||||
| -rw-r--r-- | vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/.MODULE_ROOT (renamed from vendor/github.com/superseriousbusiness/go-png-image-structure/v2/.MODULE_ROOT) | 0 | ||||
| -rw-r--r-- | vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/LICENSE (renamed from vendor/github.com/superseriousbusiness/go-png-image-structure/v2/LICENSE) | 0 | ||||
| -rw-r--r-- | vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/chunk_decoder.go (renamed from vendor/github.com/superseriousbusiness/go-png-image-structure/v2/chunk_decoder.go) | 0 | ||||
| -rw-r--r-- | vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/media_parser.go (renamed from vendor/github.com/superseriousbusiness/go-png-image-structure/v2/media_parser.go) | 0 | ||||
| -rw-r--r-- | vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/png.go (renamed from vendor/github.com/superseriousbusiness/go-png-image-structure/v2/png.go) | 62 | ||||
| -rw-r--r-- | vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/testing_common.go (renamed from vendor/github.com/superseriousbusiness/go-png-image-structure/v2/testing_common.go) | 0 | ||||
| -rw-r--r-- | vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/utility.go (renamed from vendor/github.com/superseriousbusiness/go-png-image-structure/v2/utility.go) | 0 | ||||
| -rw-r--r-- | vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/README.md | 10 | ||||
| -rw-r--r-- | vendor/modules.txt | 14 |
22 files changed, 51 insertions, 50 deletions
diff --git a/vendor/codeberg.org/superseriousbusiness/exif-terminator/jpeg.go b/vendor/codeberg.org/superseriousbusiness/exif-terminator/jpeg.go index 01ca313ca..25b21e3c5 100644 --- a/vendor/codeberg.org/superseriousbusiness/exif-terminator/jpeg.go +++ b/vendor/codeberg.org/superseriousbusiness/exif-terminator/jpeg.go @@ -23,7 +23,7 @@ import ( "fmt" "io" - jpegstructure "github.com/superseriousbusiness/go-jpeg-image-structure/v2" + jpegstructure "codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2" ) var markerLen = map[byte]int{ diff --git a/vendor/codeberg.org/superseriousbusiness/exif-terminator/png.go b/vendor/codeberg.org/superseriousbusiness/exif-terminator/png.go index b8b94efb7..a8245271c 100644 --- a/vendor/codeberg.org/superseriousbusiness/exif-terminator/png.go +++ b/vendor/codeberg.org/superseriousbusiness/exif-terminator/png.go @@ -21,7 +21,7 @@ package terminator import ( "io" - pngstructure "github.com/superseriousbusiness/go-png-image-structure/v2" + pngstructure "codeberg.org/superseriousbusiness/go-png-image-structure/v2" ) type pngVisitor struct { diff --git a/vendor/codeberg.org/superseriousbusiness/exif-terminator/terminator.go b/vendor/codeberg.org/superseriousbusiness/exif-terminator/terminator.go index 5793b8599..8e4976631 100644 --- a/vendor/codeberg.org/superseriousbusiness/exif-terminator/terminator.go +++ b/vendor/codeberg.org/superseriousbusiness/exif-terminator/terminator.go @@ -25,8 +25,8 @@ import ( "fmt" "io" - jpegstructure "github.com/superseriousbusiness/go-jpeg-image-structure/v2" - pngstructure "github.com/superseriousbusiness/go-png-image-structure/v2" + jpegstructure "codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2" + pngstructure "codeberg.org/superseriousbusiness/go-png-image-structure/v2" ) func Terminate(in io.Reader, mediaType string) (io.Reader, error) { diff --git a/vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/.MODULE_ROOT b/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/.MODULE_ROOT index e69de29bb..e69de29bb 100644 --- a/vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/.MODULE_ROOT +++ b/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/.MODULE_ROOT diff --git a/vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/LICENSE b/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/LICENSE index 163291ed6..163291ed6 100644 --- a/vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/LICENSE +++ b/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/LICENSE diff --git a/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/README.md b/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/README.md new file mode 100644 index 000000000..80c68c9f8 --- /dev/null +++ b/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/README.md @@ -0,0 +1,7 @@ +**Forked from https://github.com/dsoprea/go-jpeg-image-structure** + +## Overview + +Parse raw JPEG data into individual segments of data. You can print or export this data, including hash digests for each. You can also parse/modify the EXIF data and write an updated image. + +EXIF, XMP, and IPTC data can also be extracted. The provided CLI tool can print this data as well. diff --git a/vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/markers.go b/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/markers.go index a12171bd8..a12171bd8 100644 --- a/vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/markers.go +++ b/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/markers.go diff --git a/vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/media_parser.go b/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/media_parser.go index e6fc60bc4..e6fc60bc4 100644 --- a/vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/media_parser.go +++ b/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/media_parser.go diff --git a/vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/segment.go b/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/segment.go index 6b433bf1f..6b433bf1f 100644 --- a/vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/segment.go +++ b/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/segment.go diff --git a/vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/segment_list.go b/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/segment_list.go index b4f4d5810..b4f4d5810 100644 --- a/vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/segment_list.go +++ b/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/segment_list.go diff --git a/vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/splitter.go b/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/splitter.go index 1856beddf..1856beddf 100644 --- a/vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/splitter.go +++ b/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/splitter.go diff --git a/vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/testing_common.go b/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/testing_common.go index e7169c2f0..e7169c2f0 100644 --- a/vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/testing_common.go +++ b/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/testing_common.go diff --git a/vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/utility.go b/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/utility.go index 1c618ba6d..1c618ba6d 100644 --- a/vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/utility.go +++ b/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/utility.go diff --git a/vendor/github.com/superseriousbusiness/go-png-image-structure/v2/.MODULE_ROOT b/vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/.MODULE_ROOT index e69de29bb..e69de29bb 100644 --- a/vendor/github.com/superseriousbusiness/go-png-image-structure/v2/.MODULE_ROOT +++ b/vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/.MODULE_ROOT diff --git a/vendor/github.com/superseriousbusiness/go-png-image-structure/v2/LICENSE b/vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/LICENSE index 163291ed6..163291ed6 100644 --- a/vendor/github.com/superseriousbusiness/go-png-image-structure/v2/LICENSE +++ b/vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/LICENSE diff --git a/vendor/github.com/superseriousbusiness/go-png-image-structure/v2/chunk_decoder.go b/vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/chunk_decoder.go index 518bc91ad..518bc91ad 100644 --- a/vendor/github.com/superseriousbusiness/go-png-image-structure/v2/chunk_decoder.go +++ b/vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/chunk_decoder.go diff --git a/vendor/github.com/superseriousbusiness/go-png-image-structure/v2/media_parser.go b/vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/media_parser.go index 4c8421905..4c8421905 100644 --- a/vendor/github.com/superseriousbusiness/go-png-image-structure/v2/media_parser.go +++ b/vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/media_parser.go diff --git a/vendor/github.com/superseriousbusiness/go-png-image-structure/v2/png.go b/vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/png.go index dfe773b71..5c476f737 100644 --- a/vendor/github.com/superseriousbusiness/go-png-image-structure/v2/png.go +++ b/vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/png.go @@ -248,51 +248,55 @@ func (c *Chunk) Bytes() ([]byte, error) { if len(c.Data) != int(c.Length) { return nil, errors.New("length of data not correct") } - b := make([]byte, 0, 4+4+c.Length+4) - b = binary.BigEndian.AppendUint32(b, c.Length) - b = append(b, c.Type...) - b = append(b, c.Data...) - b = binary.BigEndian.AppendUint32(b, c.Crc) - return b, nil -} -// Write encodes and writes the bytes for this chunk. -func (c *Chunk) WriteTo(w io.Writer) (int, error) { - if len(c.Data) != int(c.Length) { - return 0, errors.New("length of data not correct") + preallocated := make([]byte, 0, 4+4+c.Length+4) + b := bytes.NewBuffer(preallocated) + + err := binary.Write(b, binary.BigEndian, c.Length) + if err != nil { + return nil, err } - var n int + if _, err := b.Write([]byte(c.Type)); err != nil { + return nil, err + } - b := make([]byte, 4) // uint32 buf + if c.Data != nil { + if _, err := b.Write(c.Data); err != nil { + return nil, err + } + } - binary.BigEndian.PutUint32(b, c.Length) - if nn, err := w.Write(b); err != nil { - return n + nn, err + if err := binary.Write(b, binary.BigEndian, c.Crc); err != nil { + return nil, err } - n += len(b) + return b.Bytes(), nil +} - if nn, err := io.WriteString(w, c.Type); err != nil { - return n + nn, err +// Write encodes and writes the bytes for this chunk. +func (c *Chunk) WriteTo(w io.Writer) (int, error) { + if len(c.Data) != int(c.Length) { + return 0, errors.New("length of data not correct") } - n += len(c.Type) - - if nn, err := w.Write(c.Data); err != nil { - return n + nn, err + if err := binary.Write(w, binary.BigEndian, c.Length); err != nil { + return 0, err } - n += len(c.Data) + if _, err := w.Write([]byte(c.Type)); err != nil { + return 0, err + } - binary.BigEndian.PutUint32(b, c.Crc) - if nn, err := w.Write(b); err != nil { - return n + nn, err + if _, err := w.Write(c.Data); err != nil { + return 0, err } - n += len(b) + if err := binary.Write(w, binary.BigEndian, c.Crc); err != nil { + return 0, err + } - return n, nil + return 4 + len(c.Type) + len(c.Data) + 4, nil } // readHeader verifies that the PNG header bytes appear next. diff --git a/vendor/github.com/superseriousbusiness/go-png-image-structure/v2/testing_common.go b/vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/testing_common.go index 42f28d282..42f28d282 100644 --- a/vendor/github.com/superseriousbusiness/go-png-image-structure/v2/testing_common.go +++ b/vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/testing_common.go diff --git a/vendor/github.com/superseriousbusiness/go-png-image-structure/v2/utility.go b/vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/utility.go index cac6020f2..cac6020f2 100644 --- a/vendor/github.com/superseriousbusiness/go-png-image-structure/v2/utility.go +++ b/vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/utility.go diff --git a/vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/README.md b/vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/README.md deleted file mode 100644 index bf60ef504..000000000 --- a/vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/README.md +++ /dev/null @@ -1,10 +0,0 @@ -[](https://travis-ci.org/dsoprea/go-jpeg-image-structure/v2) -[](https://codecov.io/gh/dsoprea/go-jpeg-image-structure) -[](https://goreportcard.com/report/github.com/dsoprea/go-jpeg-image-structure/v2) -[](https://godoc.org/github.com/dsoprea/go-jpeg-image-structure/v2) - -## Overview - -Parse raw JPEG data into individual segments of data. You can print or export this data, including hash digests for each. You can also parse/modify the EXIF data and write an updated image. - -EXIF, XMP, and IPTC data can also be extracted. The provided CLI tool can print this data as well. diff --git a/vendor/modules.txt b/vendor/modules.txt index 47b49c650..a2b0994d4 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -245,9 +245,15 @@ codeberg.org/superseriousbusiness/activity/streams/values/rfc2045 codeberg.org/superseriousbusiness/activity/streams/values/rfc5988 codeberg.org/superseriousbusiness/activity/streams/values/string codeberg.org/superseriousbusiness/activity/streams/vocab -# codeberg.org/superseriousbusiness/exif-terminator v0.9.1 +# codeberg.org/superseriousbusiness/exif-terminator v0.10.0 ## explicit; go 1.21 codeberg.org/superseriousbusiness/exif-terminator +# codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2 v2.1.0-SSB +## explicit; go 1.17 +codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2 +# codeberg.org/superseriousbusiness/go-png-image-structure/v2 v2.1.0-SSB +## explicit; go 1.12 +codeberg.org/superseriousbusiness/go-png-image-structure/v2 # codeberg.org/superseriousbusiness/httpsig v1.3.0-SSB ## explicit; go 1.21 codeberg.org/superseriousbusiness/httpsig @@ -807,12 +813,6 @@ github.com/stretchr/testify/suite # github.com/subosito/gotenv v1.6.0 ## explicit; go 1.18 github.com/subosito/gotenv -# github.com/superseriousbusiness/go-jpeg-image-structure/v2 v2.0.0-20220321154430-d89a106fdabe -## explicit; go 1.17 -github.com/superseriousbusiness/go-jpeg-image-structure/v2 -# github.com/superseriousbusiness/go-png-image-structure/v2 v2.0.1-SSB -## explicit; go 1.12 -github.com/superseriousbusiness/go-png-image-structure/v2 # github.com/superseriousbusiness/oauth2/v4 v4.3.2-SSB.0.20230227143000-f4900831d6c8 ## explicit; go 1.13 github.com/superseriousbusiness/oauth2/v4 |
