Optimized

This commit is contained in:
bradley.richins
2020-10-20 16:23:57 -06:00
parent f291891139
commit 4f1002ee2d
2 changed files with 21 additions and 21 deletions

View File

@@ -24,6 +24,8 @@ func CreateBanner(portalhex string, savename string, vopt int) {
var err error var err error
var GlyphHex [12]int64 var GlyphHex [12]int64
var glyphImg [12]string var glyphImg [12]string
var vert int
var horz int
// Setup temp dir // Setup temp dir
tempdir, err := ioutil.TempDir("", "nmslib-") tempdir, err := ioutil.TempDir("", "nmslib-")
@@ -71,19 +73,15 @@ func CreateBanner(portalhex string, savename string, vopt int) {
{ImageFilePath: tempdir + "/" + glyphImg[8]}, {ImageFilePath: tempdir + "/" + glyphImg[9]}, {ImageFilePath: tempdir + "/" + glyphImg[8]}, {ImageFilePath: tempdir + "/" + glyphImg[9]},
{ImageFilePath: tempdir + "/" + glyphImg[10]}, {ImageFilePath: tempdir + "/" + glyphImg[11]}, {ImageFilePath: tempdir + "/" + glyphImg[10]}, {ImageFilePath: tempdir + "/" + glyphImg[11]},
} }
if vopt == 1 {
// Merge images horizontally if vopt == 1 { // set vertical rendering
rgba, err := gim.New(grids, 1, 12).Merge() vert, horz = 1, 12
if err != nil { } else { // set horizontal rendering (default)
panic(err) vert, horz = 12, 1
} }
// save the output to png
fmt.Printf("Saving %s to %s in vertical format\n", portalhex, savename) // create new image from grids
file, err := os.Create(savename) rgba, err := gim.New(grids, vert, horz).Merge()
err = png.Encode(file, rgba)
} else {
// Merge images vertically
rgba, err := gim.New(grids, 12, 1).Merge()
if err != nil { if err != nil {
panic(err) panic(err)
} }
@@ -91,5 +89,7 @@ func CreateBanner(portalhex string, savename string, vopt int) {
fmt.Printf("Saving %s to %s\n", portalhex, savename) fmt.Printf("Saving %s to %s\n", portalhex, savename)
file, err := os.Create(savename) file, err := os.Create(savename)
err = png.Encode(file, rgba) err = png.Encode(file, rgba)
if err != nil {
fmt.Println(err)
} }
} }

View File

@@ -77,7 +77,6 @@ func Eng2Korvax(enwrd string) string {
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)
} }
defer csvFile.Close()
csvlines, err := csv.NewReader(csvFile).ReadAll() csvlines, err := csv.NewReader(csvFile).ReadAll()
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)
@@ -93,5 +92,6 @@ func Eng2Korvax(enwrd string) string {
return klang.korvax return klang.korvax
} }
} }
csvFile.Close()
return "*\\Kzzzzzzt\\*" // word not found default return "*\\Kzzzzzzt\\*" // word not found default
} }