From 6e2cb00008cbf09e556b00f87603797fcaa47e09 Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Mon, 16 Apr 2018 05:37:14 -0700
Subject: Depenancy upgrades and movign to dep. (#8630)

---
 vendor/golang.org/x/image/bmp/reader_test.go | 75 -----------------------
 vendor/golang.org/x/image/bmp/writer_test.go | 91 ----------------------------
 2 files changed, 166 deletions(-)
 delete mode 100644 vendor/golang.org/x/image/bmp/reader_test.go
 delete mode 100644 vendor/golang.org/x/image/bmp/writer_test.go

(limited to 'vendor/golang.org/x/image/bmp')

diff --git a/vendor/golang.org/x/image/bmp/reader_test.go b/vendor/golang.org/x/image/bmp/reader_test.go
deleted file mode 100644
index fd6ff64f6..000000000
--- a/vendor/golang.org/x/image/bmp/reader_test.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bmp
-
-import (
-	"fmt"
-	"image"
-	"os"
-	"testing"
-
-	_ "image/png"
-)
-
-const testdataDir = "../testdata/"
-
-func compare(t *testing.T, img0, img1 image.Image) error {
-	b := img1.Bounds()
-	if !b.Eq(img0.Bounds()) {
-		return fmt.Errorf("wrong image size: want %s, got %s", img0.Bounds(), b)
-	}
-	for y := b.Min.Y; y < b.Max.Y; y++ {
-		for x := b.Min.X; x < b.Max.X; x++ {
-			c0 := img0.At(x, y)
-			c1 := img1.At(x, y)
-			r0, g0, b0, a0 := c0.RGBA()
-			r1, g1, b1, a1 := c1.RGBA()
-			if r0 != r1 || g0 != g1 || b0 != b1 || a0 != a1 {
-				return fmt.Errorf("pixel at (%d, %d) has wrong color: want %v, got %v", x, y, c0, c1)
-			}
-		}
-	}
-	return nil
-}
-
-// TestDecode tests that decoding a PNG image and a BMP image result in the
-// same pixel data.
-func TestDecode(t *testing.T) {
-	testCases := []string{
-		"video-001",
-		"yellow_rose-small",
-	}
-
-	for _, tc := range testCases {
-		f0, err := os.Open(testdataDir + tc + ".png")
-		if err != nil {
-			t.Errorf("%s: Open PNG: %v", tc, err)
-			continue
-		}
-		defer f0.Close()
-		img0, _, err := image.Decode(f0)
-		if err != nil {
-			t.Errorf("%s: Decode PNG: %v", tc, err)
-			continue
-		}
-
-		f1, err := os.Open(testdataDir + tc + ".bmp")
-		if err != nil {
-			t.Errorf("%s: Open BMP: %v", tc, err)
-			continue
-		}
-		defer f1.Close()
-		img1, _, err := image.Decode(f1)
-		if err != nil {
-			t.Errorf("%s: Decode BMP: %v", tc, err)
-			continue
-		}
-
-		if err := compare(t, img0, img1); err != nil {
-			t.Errorf("%s: %v", tc, err)
-			continue
-		}
-	}
-}
diff --git a/vendor/golang.org/x/image/bmp/writer_test.go b/vendor/golang.org/x/image/bmp/writer_test.go
deleted file mode 100644
index 9e5a32741..000000000
--- a/vendor/golang.org/x/image/bmp/writer_test.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bmp
-
-import (
-	"bytes"
-	"fmt"
-	"image"
-	"io/ioutil"
-	"os"
-	"testing"
-	"time"
-)
-
-func openImage(filename string) (image.Image, error) {
-	f, err := os.Open(testdataDir + filename)
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-	return Decode(f)
-}
-
-func TestEncode(t *testing.T) {
-	img0, err := openImage("video-001.bmp")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	buf := new(bytes.Buffer)
-	err = Encode(buf, img0)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	img1, err := Decode(buf)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	compare(t, img0, img1)
-}
-
-// TestZeroWidthVeryLargeHeight tests that encoding and decoding a degenerate
-// image with zero width but over one billion pixels in height is faster than
-// naively calling an io.Reader or io.Writer method once per row.
-func TestZeroWidthVeryLargeHeight(t *testing.T) {
-	c := make(chan error, 1)
-	go func() {
-		b := image.Rect(0, 0, 0, 0x3fffffff)
-		var buf bytes.Buffer
-		if err := Encode(&buf, image.NewRGBA(b)); err != nil {
-			c <- err
-			return
-		}
-		m, err := Decode(&buf)
-		if err != nil {
-			c <- err
-			return
-		}
-		if got := m.Bounds(); got != b {
-			c <- fmt.Errorf("bounds: got %v, want %v", got, b)
-			return
-		}
-		c <- nil
-	}()
-	select {
-	case err := <-c:
-		if err != nil {
-			t.Fatal(err)
-		}
-	case <-time.After(3 * time.Second):
-		t.Fatalf("timed out")
-	}
-}
-
-// BenchmarkEncode benchmarks the encoding of an image.
-func BenchmarkEncode(b *testing.B) {
-	img, err := openImage("video-001.bmp")
-	if err != nil {
-		b.Fatal(err)
-	}
-	s := img.Bounds().Size()
-	b.SetBytes(int64(s.X * s.Y * 4))
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		Encode(ioutil.Discard, img)
-	}
-}
-- 
cgit v1.2.3-1-g7c22