Remove resize library to fix bug in png upscale

VoycerAG · May 20, 2015 · 5fa3ace · 5fa3ace
1 parent 3b8a78d
commit 5fa3ace
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/server/image.go b/server/image.go
@@ -14,7 +14,6 @@ import (
 	"syscall"
 
 	"github.com/disintegration/imaging"
-	"github.com/nfnt/resize"
 	"gopkg.in/mgo.v2"
 )
 
@@ -108,7 +107,7 @@ func ResizeImage(originalImageData image.Image, imageFormat string, entry *Entry
 			targetHeight = 0
 		}
 
-		dst = resize.Resize(uint(targetWidth), uint(targetHeight), originalImageData, resize.Lanczos3)
+		dst = imaging.Resize(originalImageData, int(targetWidth), int(targetHeight), imaging.Lanczos)
 	} else if entry.Type == TypeFit {
 		if targetWidth < 0 || targetHeight < 0 {
 			return nil, "", fmt.Errorf("When using type fit, both height and width must be specified")
@@ -122,7 +121,7 @@ func ResizeImage(originalImageData image.Image, imageFormat string, entry *Entry
 			targetWidth = targetHeight * originalRatio
 		}
 
-		dst = resize.Resize(uint(targetWidth), uint(targetHeight), originalImageData, resize.Lanczos3)
+		dst = imaging.Resize(originalImageData, int(targetWidth), int(targetHeight), imaging.Lanczos)
 	} else {
 		// typeCut
 		if targetWidth < 0 {

diff --git a/server/image_test.go b/server/image_test.go
@@ -99,7 +99,7 @@ func (s *ImageTestSuite) TestValidEntryTypeResizeAndFormatForwardingWidthMissing
 
 	c.Assert(imageFormat, Equals, "i do not care")
 	c.Assert(imageError, IsNil)
-	c.Assert((*imageData).Bounds().Dx(), Equals, 534)
+	c.Assert((*imageData).Bounds().Dx(), Equals, 533)
 	c.Assert((*imageData).Bounds().Dy(), Equals, 400)
 }