Skip to content
This repository was archived by the owner on Dec 20, 2018. It is now read-only.

Commit 47b3611

Browse files
committed
Move data files to data
Plus error out when the files can't be loaded.
1 parent 4b6af85 commit 47b3611

File tree

7 files changed

+21
-7
lines changed

7 files changed

+21
-7
lines changed

edge.xcf assets/edge.xcf

File renamed without changes.

favicon.xcf assets/favicon.xcf

File renamed without changes.

gradient.xcf assets/gradient.xcf

File renamed without changes.

edge.png data/edge.png

File renamed without changes.

gradient.png data/gradient.png

File renamed without changes.
File renamed without changes.

png.go

+21-7
Original file line numberDiff line numberDiff line change
@@ -65,22 +65,36 @@ const (
6565
)
6666

6767
func init() {
68-
fi, _ := os.Open("edge.png")
69-
edge, _ = png.Decode(fi)
68+
fi, err := os.Open("data/edge.png")
69+
if err != nil {
70+
log.Fatal(err)
71+
}
7072
defer fi.Close()
7173

72-
fi, _ = os.Open("gradient.png")
73-
gradient, _ = png.Decode(fi)
74+
edge, err = png.Decode(fi)
75+
if err != nil {
76+
log.Fatal(err)
77+
}
78+
79+
fi, err = os.Open("data/gradient.png")
80+
if err != nil {
81+
log.Fatal(err)
82+
}
7483
defer fi.Close()
7584

76-
fontBytes, err := ioutil.ReadFile("opensanssemibold.ttf")
85+
gradient, err = png.Decode(fi)
86+
if err != nil {
87+
log.Fatal(err)
88+
}
89+
90+
fontBytes, err := ioutil.ReadFile("data/opensanssemibold.ttf")
7791
if err != nil {
78-
log.Println(err)
92+
log.Fatal(err)
7993
}
8094

8195
font, err = freetype.ParseFont(fontBytes)
8296
if err != nil {
83-
log.Println(err)
97+
log.Fatal(err)
8498
}
8599

86100
c = freetype.NewContext()

0 commit comments

Comments
 (0)