Infrastructure/imageproxy
0
Fork 0
mirror of https://github.com/willnorris/imageproxy.git synced 2025-01-13 22:51:38 -05:00
Code Issues Activity

rename jpegQuality to defaultQuality

Browse source 
Also fix a few go vet errors
This commit is contained in:
Will Norris 2015-02-12 14:21:26 -08:00
parent e7b0a5b88c
commit d74dd6e985
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
imageproxy_test.go
View file

@ -181,7 +181,7 @@ func TestProxy_ServeHTTP(t *testing.T) {
p.ServeHTTP(resp, req) p.ServeHTTP(resp, req)
if got, want := resp.Code, tt.code; got != want { if got, want := resp.Code, tt.code; got != want {
t.Errorf("ServeHTTP(%q) returned status %d, want %d", req, got, want) t.Errorf("ServeHTTP(%v) returned status %d, want %d", req, got, want)
} }
} }
} }
@ -200,10 +200,10 @@ func TestProxy_ServeHTTP_is304(t *testing.T) {
p.ServeHTTP(resp, req) p.ServeHTTP(resp, req)
if got, want := resp.Code, http.StatusNotModified; got != want { if got, want := resp.Code, http.StatusNotModified; got != want {
t.Errorf("ServeHTTP(%q) returned status %d, want %d", req, got, want) t.Errorf("ServeHTTP(%v) returned status %d, want %d", req, got, want)
} }
if got, want := resp.Header().Get("Etag"), `"tag"`; got != want { if got, want := resp.Header().Get("Etag"), `"tag"`; got != want {
t.Errorf("ServeHTTP(%q) returned etag header %v, want %v", req, got, want) t.Errorf("ServeHTTP(%v) returned etag header %v, want %v", req, got, want)
} }
} }
@ -237,7 +237,7 @@ func TestTransformingTransport(t *testing.T) {
t.Errorf("RoundTrip(%v) did not return expected error", tt.url) t.Errorf("RoundTrip(%v) did not return expected error", tt.url)
} }
if got, want := resp.StatusCode, tt.code; got != want { if got, want := resp.StatusCode, tt.code; got != want {
t.Errorf("RoundTrip(%v) returned status code %d, want %d", got, want) t.Errorf("RoundTrip(%v) returned status code %d, want %d", tt.url, got, want)
} }
} }
} }

7
transform.go
View file

@ -24,8 +24,8 @@ import (
"github.com/disintegration/imaging" "github.com/disintegration/imaging"
) )
// compression quality of resized jpegs // default compression quality of resized jpegs
const jpegQuality = 95 const defaultQuality = 95
// resample filter used when resizing images // resample filter used when resizing images
var resampleFilter = imaging.Lanczos var resampleFilter = imaging.Lanczos
@ -54,9 +54,8 @@ func Transform(img []byte, opt Options) ([]byte, error) {
gif.Encode(buf, m, nil) gif.Encode(buf, m, nil)
case "jpeg": case "jpeg":
quality := opt.Quality quality := opt.Quality
if quality == 0 { if quality == 0 {
quality = jpegQuality quality = defaultQuality
} }
jpeg.Encode(buf, m, &jpeg.Options{Quality: quality}) jpeg.Encode(buf, m, &jpeg.Options{Quality: quality})

4
transform_test.go
View file

@ -60,10 +60,10 @@ func TestTransform(t *testing.T) {
out, err := Transform(in, emptyOptions) out, err := Transform(in, emptyOptions)
if err != nil { if err != nil {
t.Errorf("Transform with encoder %s returned unexpected error: %v", err) t.Errorf("Transform with encoder %s returned unexpected error: %v", tt.name, err)
} }
if !reflect.DeepEqual(in, out) { if !reflect.DeepEqual(in, out) {
t.Errorf("Transform with with encoder %s with empty options returned modified result") t.Errorf("Transform with with encoder %s with empty options returned modified result", tt.name)
} }
out, err = Transform(in, Options{Width: -1, Height: -1}) out, err = Transform(in, Options{Width: -1, Height: -1})