diff --git a/Gopkg.lock b/Gopkg.lock index 1c64c9b..bef2d00 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -1,15 +1,9 @@ # This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. -[[projects]] - name = "github.com/tj/go-debug" - packages = ["."] - revision = "ff4a55a20a86994118644bbddc6a216da193cc13" - version = "v2.0.0" - [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "6a05cef6e16f81ece71d6125d24af0bceb1d65db5c902c7b46eeb6d2a46826d3" + inputs-digest = "ab4fef131ee828e96ba67d31a7d690bd5f2f42040c6766b1b12fe856f87e0ff7" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 4791377..9425a54 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -20,7 +20,3 @@ # name = "github.com/x/y" # version = "2.4.0" - -[[constraint]] - name = "github.com/tj/go-debug" - version = "2.0.0" diff --git a/resizer.go b/resizer.go index d1f6453..358e369 100644 --- a/resizer.go +++ b/resizer.go @@ -29,8 +29,6 @@ func resizer(buf []byte, o Options) ([]byte, error) { return nil, errors.New("Unsupported image output type") } - debug("Options: %#v", o) - // Auto rotate image based on EXIF orientation header image, rotated, err := rotateAndFlipImage(image, o) if err != nil { @@ -223,9 +221,6 @@ func transformImage(image *C.VipsImage, o Options, shrink int, residual float64) return nil, err } - debug("Transform: shrink=%v, residual=%v, interpolator=%v", - shrink, residual, o.Interpolator.String()) - return image, nil } @@ -246,9 +241,6 @@ func applyEffects(image *C.VipsImage, o Options) (*C.VipsImage, error) { } } - debug("Effects: gaussSigma=%v, gaussMinAmpl=%v, sharpenRadius=%v", - o.GaussianBlur.Sigma, o.GaussianBlur.MinAmpl, o.Sharpen.Radius) - return image, nil } diff --git a/vendor/github.com/tj/go-debug/History.md b/vendor/github.com/tj/go-debug/History.md deleted file mode 100644 index 318ceb4..0000000 --- a/vendor/github.com/tj/go-debug/History.md +++ /dev/null @@ -1,21 +0,0 @@ - -v2.0.0 / 2014-10-22 -================== - - * remove live toggling feature. Closes #10 - -1.1.1 / 2014-07-07 -================== - - * fix: dispose socket. Closes #1 - -1.1.0 / 2014-06-29 -================== - - * add unix domain socket live debugging support - * add support for enabling/disabling at runtime - -0.1.0 / 2014-05-24 -================== - - * add global and debug relative deltas diff --git a/vendor/github.com/tj/go-debug/Makefile b/vendor/github.com/tj/go-debug/Makefile deleted file mode 100644 index 16bc6d3..0000000 --- a/vendor/github.com/tj/go-debug/Makefile +++ /dev/null @@ -1,8 +0,0 @@ - -test: - @go test - -bench: - @go test -bench=. - -.PHONY: bench test \ No newline at end of file diff --git a/vendor/github.com/tj/go-debug/Readme.md b/vendor/github.com/tj/go-debug/Readme.md deleted file mode 100644 index 6560af8..0000000 --- a/vendor/github.com/tj/go-debug/Readme.md +++ /dev/null @@ -1,75 +0,0 @@ - -# go-debug - - Conditional debug logging for Go libraries. - - View the [docs](http://godoc.org/github.com/tj/go-debug). - -## Installation - -``` -$ go get github.com/tj/go-debug -``` - -## Example - -```go -package main - -import . "github.com/tj/go-debug" -import "time" - -var debug = Debug("single") - -func main() { - for { - debug("sending mail") - debug("send email to %s", "tobi@segment.io") - debug("send email to %s", "loki@segment.io") - debug("send email to %s", "jane@segment.io") - time.Sleep(500 * time.Millisecond) - } -} -``` - -If you run the program with the `DEBUG=*` environment variable you will see: - -``` -15:58:15.115 34us 33us single - sending mail -15:58:15.116 3us 3us single - send email to tobi@segment.io -15:58:15.116 1us 1us single - send email to loki@segment.io -15:58:15.116 1us 1us single - send email to jane@segment.io -15:58:15.620 504ms 504ms single - sending mail -15:58:15.620 6us 6us single - send email to tobi@segment.io -15:58:15.620 4us 4us single - send email to loki@segment.io -15:58:15.620 4us 4us single - send email to jane@segment.io -15:58:16.123 503ms 503ms single - sending mail -15:58:16.123 7us 7us single - send email to tobi@segment.io -15:58:16.123 4us 4us single - send email to loki@segment.io -15:58:16.123 4us 4us single - send email to jane@segment.io -15:58:16.625 501ms 501ms single - sending mail -15:58:16.625 4us 4us single - send email to tobi@segment.io -15:58:16.625 4us 4us single - send email to loki@segment.io -15:58:16.625 5us 5us single - send email to jane@segment.io -``` - -A timestamp and two deltas are displayed. The timestamp consists of hour, minute, second and microseconds. The left-most delta is relative to the previous debug call of any name, followed by a delta specific to that debug function. These may be useful to identify timing issues and potential bottlenecks. - -## The DEBUG environment variable - - Executables often support `--verbose` flags for conditional logging, however - libraries typically either require altering your code to enable logging, - or simply omit logging all together. go-debug allows conditional logging - to be enabled via the __DEBUG__ environment variable, where one or more - patterns may be specified. - - For example suppose your application has several models and you want - to output logs for users only, you might use `DEBUG=models:user`. In contrast - if you wanted to see what all database activity was you might use `DEBUG=models:*`, - or if you're love being swamped with logs: `DEBUG=*`. You may also specify a list of names delimited by a comma, for example `DEBUG=mongo,redis:*`. - - The name given _should_ be the package name, however you can use whatever you like. - -# License - -MIT \ No newline at end of file diff --git a/vendor/github.com/tj/go-debug/debug.go b/vendor/github.com/tj/go-debug/debug.go deleted file mode 100644 index 016ca46..0000000 --- a/vendor/github.com/tj/go-debug/debug.go +++ /dev/null @@ -1,128 +0,0 @@ -package debug - -import ( - "fmt" - "io" - "math/rand" - "os" - "regexp" - "strconv" - "strings" - "sync" - "time" -) - -var ( - writer io.Writer = os.Stderr - reg *regexp.Regexp - m sync.Mutex - enabled = false -) - -// Debugger function. -type DebugFunction func(string, ...interface{}) - -// Terminal colors used at random. -var colors []string = []string{ - "31", - "32", - "33", - "34", - "35", - "36", -} - -// Initialize with DEBUG environment variable. -func init() { - env := os.Getenv("DEBUG") - - if "" != env { - Enable(env) - } -} - -// SetWriter replaces the default of os.Stderr with `w`. -func SetWriter(w io.Writer) { - m.Lock() - defer m.Unlock() - writer = w -} - -// Disable all pattern matching. This function is thread-safe. -func Disable() { - m.Lock() - defer m.Unlock() - enabled = false -} - -// Enable the given debug `pattern`. Patterns take a glob-like form, -// for example if you wanted to enable everything, just use "*", or -// if you had a library named mongodb you could use "mongodb:connection", -// or "mongodb:*". Multiple matches can be made with a comma, for -// example "mongo*,redis*". -// -// This function is thread-safe. -func Enable(pattern string) { - m.Lock() - defer m.Unlock() - pattern = regexp.QuoteMeta(pattern) - pattern = strings.Replace(pattern, "\\*", ".*?", -1) - pattern = strings.Replace(pattern, ",", "|", -1) - pattern = "^(" + pattern + ")$" - reg = regexp.MustCompile(pattern) - enabled = true -} - -// Debug creates a debug function for `name` which you call -// with printf-style arguments in your application or library. -func Debug(name string) DebugFunction { - prevGlobal := time.Now() - color := colors[rand.Intn(len(colors))] - prev := time.Now() - - return func(format string, args ...interface{}) { - if !enabled { - return - } - - if !reg.MatchString(name) { - return - } - - d := deltas(prevGlobal, prev, color) - fmt.Fprintf(writer, d+" \033["+color+"m"+name+"\033[0m - "+format+"\n", args...) - prevGlobal = time.Now() - prev = time.Now() - } -} - -// Return formatting for deltas. -func deltas(prevGlobal, prev time.Time, color string) string { - now := time.Now() - global := now.Sub(prevGlobal).Nanoseconds() - delta := now.Sub(prev).Nanoseconds() - ts := now.UTC().Format("15:04:05.000") - deltas := fmt.Sprintf("%s %-6s \033["+color+"m%-6s", ts, humanizeNano(global), humanizeNano(delta)) - return deltas -} - -// Humanize nanoseconds to a string. -func humanizeNano(n int64) string { - var suffix string - - switch { - case n > 1e9: - n /= 1e9 - suffix = "s" - case n > 1e6: - n /= 1e6 - suffix = "ms" - case n > 1e3: - n /= 1e3 - suffix = "us" - default: - suffix = "ns" - } - - return strconv.Itoa(int(n)) + suffix -} diff --git a/vendor/github.com/tj/go-debug/debug_test.go b/vendor/github.com/tj/go-debug/debug_test.go deleted file mode 100644 index 7ce2764..0000000 --- a/vendor/github.com/tj/go-debug/debug_test.go +++ /dev/null @@ -1,152 +0,0 @@ -package debug - -import "testing" -import "strings" -import "bytes" -import "time" - -func assertContains(t *testing.T, str, substr string) { - if !strings.Contains(str, substr) { - t.Fatalf("expected %q to contain %q", str, substr) - } -} - -func assertNotContains(t *testing.T, str, substr string) { - if strings.Contains(str, substr) { - t.Fatalf("expected %q to not contain %q", str, substr) - } -} - -func TestDefault(t *testing.T) { - var b []byte - buf := bytes.NewBuffer(b) - SetWriter(buf) - - debug := Debug("foo") - debug("something") - debug("here") - debug("whoop") - - if buf.Len() != 0 { - t.Fatalf("buffer should be empty") - } -} - -func TestEnable(t *testing.T) { - var b []byte - buf := bytes.NewBuffer(b) - SetWriter(buf) - - Enable("foo") - - debug := Debug("foo") - debug("something") - debug("here") - debug("whoop") - - if buf.Len() == 0 { - t.Fatalf("buffer should have output") - } - - str := string(buf.Bytes()) - assertContains(t, str, "something") - assertContains(t, str, "here") - assertContains(t, str, "whoop") -} - -func TestMultipleOneEnabled(t *testing.T) { - var b []byte - buf := bytes.NewBuffer(b) - SetWriter(buf) - - Enable("foo") - - foo := Debug("foo") - foo("foo") - - bar := Debug("bar") - bar("bar") - - if buf.Len() == 0 { - t.Fatalf("buffer should have output") - } - - str := string(buf.Bytes()) - assertContains(t, str, "foo") - assertNotContains(t, str, "bar") -} - -func TestMultipleEnabled(t *testing.T) { - var b []byte - buf := bytes.NewBuffer(b) - SetWriter(buf) - - Enable("foo,bar") - - foo := Debug("foo") - foo("foo") - - bar := Debug("bar") - bar("bar") - - if buf.Len() == 0 { - t.Fatalf("buffer should have output") - } - - str := string(buf.Bytes()) - assertContains(t, str, "foo") - assertContains(t, str, "bar") -} - -func TestEnableDisable(t *testing.T) { - var b []byte - buf := bytes.NewBuffer(b) - SetWriter(buf) - - Enable("foo,bar") - Disable() - - foo := Debug("foo") - foo("foo") - - bar := Debug("bar") - bar("bar") - - if buf.Len() != 0 { - t.Fatalf("buffer should not have output") - } -} - -func ExampleEnable() { - Enable("mongo:connection") - Enable("mongo:*") - Enable("foo,bar,baz") - Enable("*") -} - -func ExampleDebug() { - var debug = Debug("single") - - for { - debug("sending mail") - debug("send email to %s", "tobi@segment.io") - debug("send email to %s", "loki@segment.io") - debug("send email to %s", "jane@segment.io") - time.Sleep(500 * time.Millisecond) - } -} - -func BenchmarkDisabled(b *testing.B) { - debug := Debug("something") - for i := 0; i < b.N; i++ { - debug("stuff") - } -} - -func BenchmarkNonMatch(b *testing.B) { - debug := Debug("something") - Enable("nonmatch") - for i := 0; i < b.N; i++ { - debug("stuff") - } -} diff --git a/vendor/github.com/tj/go-debug/example/multiple.go b/vendor/github.com/tj/go-debug/example/multiple.go deleted file mode 100644 index 81c3308..0000000 --- a/vendor/github.com/tj/go-debug/example/multiple.go +++ /dev/null @@ -1,25 +0,0 @@ -package main - -import . "github.com/visionmedia/go-debug" -import "time" - -var a = Debug("multiple:a") -var b = Debug("multiple:b") -var c = Debug("multiple:c") - -func work(debug DebugFunction, delay time.Duration) { - for { - debug("doing stuff") - time.Sleep(delay) - } -} - -func main() { - q := make(chan bool) - - go work(a, 1000*time.Millisecond) - go work(b, 250*time.Millisecond) - go work(c, 100*time.Millisecond) - - <-q -} diff --git a/vendor/github.com/tj/go-debug/example/single.go b/vendor/github.com/tj/go-debug/example/single.go deleted file mode 100644 index fccfe33..0000000 --- a/vendor/github.com/tj/go-debug/example/single.go +++ /dev/null @@ -1,16 +0,0 @@ -package main - -import . "github.com/visionmedia/go-debug" -import "time" - -var debug = Debug("single") - -func main() { - for { - debug("sending mail") - debug("send email to %s", "tobi@segment.io") - debug("send email to %s", "loki@segment.io") - debug("send email to %s", "jane@segment.io") - time.Sleep(500 * time.Millisecond) - } -} diff --git a/vips.go b/vips.go index ad54012..3261898 100644 --- a/vips.go +++ b/vips.go @@ -15,13 +15,8 @@ import ( "strings" "sync" "unsafe" - - d "github.com/tj/go-debug" ) -// debug is internally used to -var debug = d.Debug("bimg") - // VipsVersion exposes the current libvips semantic version const VipsVersion = string(C.VIPS_VERSION) @@ -386,7 +381,6 @@ func vipsPreSave(image *C.VipsImage, o *vipsSaveOptions) (*C.VipsImage, error) { } if o.OutputICC != "" && vipsHasProfile(image) { - debug("Embedded ICC profile found, trying to convert to %s", o.OutputICC) outputIccPath := C.CString(o.OutputICC) defer C.free(unsafe.Pointer(outputIccPath))