correction according Codacy Bot recomendations

cpegeric · Feb 14, 2019 · fb5ab45 · fb5ab45
1 parent a561fbf
commit fb5ab45
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/ascii85.go b/ascii85.go
@@ -16,7 +16,7 @@ func newAlphaReader(reader io.Reader) *alphaReader {
 	return &alphaReader{reader: reader}
 }
 
-func checkAscii85(r byte) byte {
+func checkASCII85(r byte) byte {
 	if r >= '!' && r <= 'u' { // 33 <= ascii85 <=117
 		return r
 	}
@@ -36,7 +36,7 @@ func (a *alphaReader) Read(p []byte) (int, error) {
 	buf := make([]byte, n)
 	tilda := false
 	for i := 0; i < n; i++ {
-		char := checkAscii85(p[i])
+		char := checkASCII85(p[i])
 		if char == '>' && tilda { // end of data
 			break
 		}

diff --git a/read.go b/read.go
@@ -842,14 +842,15 @@ func applyFilter(rd io.Reader, name string, param Value) io.Reader {
 			return &pngUpReader{r: zr, hist: make([]byte, 1+columns), tmp: make([]byte, 1+columns)}
 		}
 	case "ASCII85Decode":
-		cleanAscii85 := newAlphaReader(rd)
-		decoder := ascii85.NewDecoder(cleanAscii85)
+		cleanASCII85 := newAlphaReader(rd)
+		decoder := ascii85.NewDecoder(cleanASCII85)
 
-		if param.Keys() == nil {
-			return decoder
-		} else {
+		switch param.Keys() {
+		default:
 			fmt.Println("param=", param)
 			panic("not expected DecodeParms for ascii85")
+		case nil:
+			return decoder
 		}
 	}
 }