Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "images: make cr2 and tiff decoding work together."

This commit is contained in:
Mathieu Lonjaret 2015-07-21 14:35:58 +00:00 committed by Gerrit Code Review
parent d1f6e62321 472d59600d
commit a6896a6c36
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/images/images.go
View File

@ -30,12 +30,15 @@ import (
_ "image/gif"
_ "image/png"
_ "camlistore.org/third_party/golang.org/x/image/tiff"
"camlistore.org/pkg/images/fastjpeg"
"camlistore.org/pkg/images/resize"
"camlistore.org/third_party/github.com/nf/cr2"
"camlistore.org/third_party/github.com/rwcarlsen/goexif/exif"
// tiff package must be imported after any image packages that decode
// tiff-like formats, i.e. CR2 or DNG
_ "camlistore.org/third_party/golang.org/x/image/tiff"
)
var disableThumbCache, _ = strconv.ParseBool(os.Getenv("CAMLI_DISABLE_THUMB_CACHE"))