merge master, resolve conflicts

1 files changed, 23 insertions, 0 deletions

diff --git a/weed/images/resizing_test.go b/weed/images/resizing_test.go
new file mode 100644
index 000000000..d12f799d8
--- /dev/null
+++ b/weed/images/resizing_test.go
@@ -0,0 +1,23 @@
+package images
+
+import (
+	"bytes"
+	"io/ioutil"
+	"os"
+	"testing"
+)
+
+func TestResizing(t *testing.T) {
+	fname := "sample2.webp"
+
+	dat, _ := ioutil.ReadFile(fname)
+
+	resized, _, _ := Resized(".webp", bytes.NewReader(dat), 100, 30, "")
+	buf := new(bytes.Buffer)
+	buf.ReadFrom(resized)
+
+	ioutil.WriteFile("resized1.png", buf.Bytes(), 0644)
+
+	os.Remove("resized1.png")
+
+}