From fb5ab45489847c62e79b4f8498c33514e729abe3 Mon Sep 17 00:00:00 2001 From: Viktor Tsymbalyuk Date: Thu, 14 Feb 2019 16:44:06 +0200 Subject: [PATCH] correction according Codacy Bot recomendations --- ascii85.go | 4 ++-- read.go | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ascii85.go b/ascii85.go index 0710b3f..1baed56 100644 --- 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 index 7dbe303..2cc4137 100644 --- 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 } } }