Skip to content

Commit fe861cb

Browse files
author
Jeremy Torres
committed
Cleanup based on updated Golang vetting. And go module.
1 parent 841f568 commit fe861cb

13 files changed

+30
-42
lines changed

‎cr2parser.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func (n Cr2Parser) ProcessFile(info *RawFileInfo) (CR2 *RawFile, err error) {
7474
if err != nil {
7575
log.Printf("Error: Unable to open file: '%s'\n", info.File)
7676
} else {
77-
h, err := n.processHeader(f)
77+
h, _ := n.processHeader(f)
7878
jpegInfo, createDate, err := n.processIfds(f, h)
7979
if err == nil {
8080
jpegPath, err := n.decodeAndWriteJpeg(f, jpegInfo, info.DestDir, info.Quality)
@@ -206,7 +206,7 @@ func (n Cr2Parser) processIfds(f *os.File, h *cr2Header) (j *jpegInfo, cDate tim
206206
if exifEntry.tag == 0x9004 {
207207
createDate, err := processASCIIEntry(&exifEntry, f)
208208
if err == nil {
209-
cDate, err = parseDateTime(createDate)
209+
cDate, _ = parseDateTime(createDate)
210210
}
211211
}
212212
}

‎cr2parser_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ func TestCr2ProcessHeader(t *testing.T) {
7878

7979
// little endian test CR2
8080
f, e := openTestCr2File()
81-
defer f.Close()
8281
if e == nil {
82+
defer f.Close()
8383
h, err := getCr2Header(f)
8484
if err != nil {
8585
t.Fail()
@@ -101,8 +101,8 @@ func TestCr2ProcessIfds(t *testing.T) {
101101

102102
// little endian CR2
103103
f, e := openTestCr2File()
104-
defer f.Close()
105104
if e == nil {
105+
defer f.Close()
106106
h, err := getCr2Header(f)
107107
if err != nil {
108108
t.Fail()
@@ -124,8 +124,8 @@ func TestProcessJpegDecodeAndWrite(t *testing.T) {
124124

125125
// little endian CR2
126126
f, e := openTestCr2File()
127-
defer f.Close()
128127
if e == nil {
128+
defer f.Close()
129129
h, err := getCr2Header(f)
130130
if err != nil {
131131
t.Fail()

‎go.mod

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
module github.com/jeremytorres/rawparser
2+
3+
go 1.18

‎jpeggo.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !jpeg && !turbojpeg && !jpegcpp
12
// +build !jpeg,!turbojpeg,!jpegcpp
23

34
/*
@@ -39,11 +40,11 @@ func init() {
3940

4041
func decodeAndWriteJpeg(data []byte, quality int, filename string) error {
4142
jpegFile, err := os.Create(filename)
42-
defer jpegFile.Close()
4343
if err != nil {
4444
log.Printf("Error creating jpeg file: %v\n", err)
4545
return err
4646
}
47+
defer jpegFile.Close()
4748

4849
// Decode image
4950
decodedImage, err := decodeJpeg(data)
@@ -74,7 +75,7 @@ func decodeJpeg(data []byte) (img image.Image, e error) {
7475
// encodeAndWriteJpeg encodes a JPEG image based on a JPEG quality parameter
7576
// from 1 to 100, where 100 is the best encoding quality.
7677
func encodeAndWriteJpeg(f *os.File, img image.Image, q int) error {
77-
e := jpeg.Encode(f, img, &jpeg.Options{q})
78+
e := jpeg.Encode(f, img, &jpeg.Options{Quality: q})
7879
if e != nil {
7980
log.Printf("Error encoding and writing embedded jpeg: %v\n", e)
8081
}

‎jpeglibcpp.go

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build jpegcpp
12
// +build jpegcpp
23

34
/*

‎jpeglibjpeg.go

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build jpeg
12
// +build jpeg
23

34
/*

‎jpeglibturbo_darwin.go

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build turbojpeg
12
// +build turbojpeg
23

34
/*

‎jpeglibturbo_linux.go

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build turbojpeg
12
// +build turbojpeg
23

34
/*

‎nefparser.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ func (n NefParser) ProcessFile(info *RawFileInfo) (nef *RawFile, err error) {
7070
if err != nil {
7171
log.Printf("Error: Unable to open file: '%s'\n", info.File)
7272
} else {
73-
h, err := n.processHeader(f)
73+
h, _ := n.processHeader(f)
7474
jpegInfo, createDate, err := n.processIfds(f, h)
7575
if err != nil {
7676
return nef, err
7777
} else if jpegInfo.length <= 0 {
78-
return nef, fmt.Errorf("invalid jpeg length: %d\n", jpegInfo.length)
78+
return nef, fmt.Errorf("invalid jpeg length: %d", jpegInfo.length)
7979
}
8080
jpegPath, err := n.decodeAndWriteJpeg(f, jpegInfo, info.DestDir, info.Quality)
8181
if err == nil {
@@ -162,11 +162,11 @@ func (n NefParser) processIfds(f *os.File, h *nefHeader) (j *jpegInfo, cDate tim
162162
subID0Entry := se.Value.(ifdEntry)
163163

164164
if subID0Entry.tag == 0x011a {
165-
jpeg.xRes, _, jpeg.xResFloat, err = processRationalEntry(n.IsHostLittleEndian(), h.isBigEndian, subID0Entry.valueOffset, f)
165+
jpeg.xRes, _, jpeg.xResFloat, _ = processRationalEntry(n.IsHostLittleEndian(), h.isBigEndian, subID0Entry.valueOffset, f)
166166
}
167167

168168
if subID0Entry.tag == 0x011b {
169-
jpeg.yRes, _, jpeg.yResFloat, err = processRationalEntry(n.IsHostLittleEndian(), h.isBigEndian, subID0Entry.valueOffset, f)
169+
jpeg.yRes, _, jpeg.yResFloat, _ = processRationalEntry(n.IsHostLittleEndian(), h.isBigEndian, subID0Entry.valueOffset, f)
170170
}
171171

172172
if subID0Entry.tag == 0x0201 {
@@ -201,7 +201,7 @@ func (n NefParser) processIfds(f *os.File, h *nefHeader) (j *jpegInfo, cDate tim
201201
if exifEntry.tag == 0x9004 {
202202
createDate, err := processASCIIEntry(&exifEntry, f)
203203
if err == nil {
204-
cDate, err = parseDateTime(createDate)
204+
cDate, _ = parseDateTime(createDate)
205205
}
206206
}
207207
}

‎nefparser_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ func TestProcessNefHeader(t *testing.T) {
7979
setupNef()
8080

8181
f, e := openTestNefFile()
82-
defer f.Close()
8382
if e == nil {
83+
defer f.Close()
8484
h, err := getNefHeader(f)
8585
if err != nil {
8686
t.Logf("Error: %v\n", err)
@@ -104,8 +104,8 @@ func TestProcessNefIfds(t *testing.T) {
104104

105105
// big endian nef
106106
f, e := openTestNefFile()
107-
defer f.Close()
108107
if e == nil {
108+
defer f.Close()
109109
h, err := getNefHeader(f)
110110
if err != nil {
111111
t.Fail()
@@ -126,8 +126,8 @@ func TestProcessNefJpegDecodeAndWrite(t *testing.T) {
126126
setupNef()
127127

128128
f, e := openTestNefFile()
129-
defer f.Close()
130129
if e == nil {
130+
defer f.Close()
131131
h, err := getNefHeader(f)
132132
if err != nil {
133133
t.Fail()

‎rawparser.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ func parseDateTime(s string) (t time.Time, err error) {
166166
return t, err
167167
}
168168
} else {
169-
err = fmt.Errorf("invalid date and/or time string format: %s %s\n", dateToken, timeToken)
169+
err = fmt.Errorf("invalid date and/or time string format: %s %s", dateToken, timeToken)
170170
}
171171

172172
return t, err
@@ -181,7 +181,7 @@ func toRfc822Date(dateTokens []string) (string, error) {
181181

182182
token := dateTokens[1]
183183

184-
// numerical date to 3-digit alpa
184+
// numerical date to 3-digit alpha
185185
switch token {
186186
case "01":
187187
monthStr = "Jan"
@@ -208,7 +208,7 @@ func toRfc822Date(dateTokens []string) (string, error) {
208208
case "12":
209209
monthStr = "Dec"
210210
default:
211-
e = fmt.Errorf("invalid month: '%s'\n", token)
211+
e = fmt.Errorf("invalid month: '%s'", token)
212212
}
213213

214214
return monthStr, e

‎rawparser_test.go

+2-22
Original file line numberDiff line numberDiff line change
@@ -58,39 +58,19 @@ func TestRawParsers(t *testing.T) {
5858
t.Fail()
5959
}
6060
rp.Register(NefParserKey, nefparser)
61-
if rp.GetParser(NefParserKey) == nil {
62-
t.Fail()
63-
}
61+
6462
// delete parser
6563
rp.DeleteParser(NefParserKey)
6664

67-
// ensure deleted
68-
if rp.GetParser(NefParserKey) != nil {
69-
t.Fail()
70-
}
71-
7265
// cr2 parser
7366
cr2parser, key := NewCr2Parser(isHostLittleEndian())
7467
if cr2parser == nil || key != Cr2ParserKey {
7568
t.Fail()
7669
}
7770
rp.Register(Cr2ParserKey, cr2parser)
78-
if rp.GetParser(Cr2ParserKey) == nil {
79-
t.Fail()
80-
}
71+
8172
// delete parser
8273
rp.DeleteParser(Cr2ParserKey)
83-
84-
// ensure deleted
85-
if rp.GetParser(Cr2ParserKey) != nil {
86-
t.Fail()
87-
}
88-
89-
// test non-existent parser
90-
if rp.GetParser("") != nil {
91-
t.Fail()
92-
}
93-
9474
}
9575

9676
func TestBytesToUShort(t *testing.T) {

‎tiffutils.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func readField(offset int64, bytesToRead uint32, f *os.File) (bytes []byte, err
9090

9191
bytesRead, err := f.ReadAt(cache, int64(offset))
9292
if bytesRead != int(bytesToRead) {
93-
err = fmt.Errorf("read %d bytes; expected %d\n", bytesRead, bytesToRead)
93+
err = fmt.Errorf("read %d bytes; expected %d", bytesRead, bytesToRead)
9494
}
9595

9696
return cache, err
@@ -157,7 +157,7 @@ func processIfd(isHostLe, isFileBe bool, offset int64, f *os.File) (*list.List,
157157
// Returns a numerator, denominator, and rational (fractional) value or error.
158158
func processRationalEntry(isHostLe, isFileBe bool, offset uint32, f *os.File) (num, den uint32, r float64, err error) {
159159
// numerator
160-
bytes, err := readField(int64(offset), 4, f)
160+
bytes, _ := readField(int64(offset), 4, f)
161161
num = bytesToUInt(isHostLe, isFileBe, bytes)
162162

163163
// denominator

0 commit comments

Comments
 (0)