Skip to content
This repository has been archived by the owner on May 16, 2022. It is now read-only.

Commit

Permalink
Add experimental Sony ARW/SR2 support
Browse files Browse the repository at this point in the history
Signed-off-by: Igor Shishkin <me@teran.ru>
  • Loading branch information
teran committed Oct 15, 2017
1 parent 9e9ee3d commit fa60a21
Show file tree
Hide file tree
Showing 6 changed files with 817 additions and 1 deletion.
31 changes: 31 additions & 0 deletions src/imgsum/cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ import (

"github.com/brett-lempereur/ish"
"github.com/nf/cr2"

"bytes"
"image/jpeg"
"github.com/Soreil/arw"
)

type JsonOutput struct {
Expand All @@ -24,6 +28,7 @@ type JsonOutput struct {

var (
re_canon = regexp.MustCompile("(?i).cr(2)$")
re_sony = regexp.MustCompile("(?i).(arw|sr2)$")
)

func calculate(file string) error {
Expand Down Expand Up @@ -147,6 +152,32 @@ func getImage(filename string) (image.Image, error) {

if re_canon.Match([]byte(filename)) {
img, err = cr2.Decode(fp)
} else if re_sony.Match([]byte(filename)) {
header, err := arw.ParseHeader(fp)
meta, err := arw.ExtractMetaData(fp, int64(header.Offset),0)
if err != nil {
return nil, err
}

var jpegOffset uint32
var jpegLength uint32
for i := range meta.FIA {
switch meta.FIA[i].Tag {
case arw.JPEGInterchangeFormat:
jpegOffset = meta.FIA[i].Offset
case arw.JPEGInterchangeFormatLength:
jpegLength = meta.FIA[i].Offset
}
}
jpg, err := arw.ExtractThumbnail(fp, jpegOffset, jpegLength)
if err != nil {
return nil, err
}
reader := bytes.NewReader(jpg)
img, err = jpeg.Decode(reader)
if err != nil {
return nil, err
}
} else {
img, _, err = image.Decode(fp)
}
Expand Down
3 changes: 2 additions & 1 deletion src/vendor.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
github.com/teran/imgsum

# import
github.com/Soreil/arw f5da5b3
github.com/bamiaux/rez 29f4463
github.com/brett-lempereur/ish bbdc45b
github.com/nf/cr2 05d46fe
github.com/steakknife/hamming 0.2.3
golang.org/x/image 334384d
golang.org/x/image f7e31b4
Loading

0 comments on commit fa60a21

Please sign in to comment.