diff --git a/README.md b/README.md index bd40eeff7..c9ff0211b 100755 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ The typical use case for this high speed Node.js module is to convert large images of many formats to smaller, web-friendly JPEG, PNG and WebP images of varying dimensions. This module supports reading and writing JPEG, PNG and WebP images to and from Streams, Buffer objects and the filesystem. -It also supports reading images of many other types from the filesystem via libmagick or libgraphicsmagick if present. +It also supports reading images of many other types from the filesystem via libmagick, libgraphicsmagick or [OpenSlide](http://openslide.org/) if present and writing Deep Zoom images. Colour spaces, embedded ICC profiles and alpha transparency channels are all handled correctly. Only small regions of uncompressed image data are held in memory and processed at a time, taking full advantage of multiple CPU cores and L1/L2/L3 cache. Resizing an image is typically 4x faster than using the quickest ImageMagick and GraphicsMagick settings. @@ -34,6 +34,7 @@ This module is powered by the blazingly fast [libvips](https://github.com/jcupit * Node.js v0.10+ or io.js * [libvips](https://github.com/jcupitt/libvips) v7.40.0+ (7.42.0+ recommended) * C++11 compatible compiler such as gcc 4.6+ or clang 3.0+ +* [OpenSlide](http://openslide.org/) 3.4.0+ for reading OpenSlide images (optional) To install the most suitable version of libvips on the following Operating Systems: @@ -48,6 +49,8 @@ To install the most suitable version of libvips on the following Operating Syste * RHEL/Centos/Scientific 6, 7 * Fedora 21, 22 * Amazon Linux 2014.09 +* OpenSuse Linux + * OpenSuse 13.1, 13.2 run the following as a user with `sudo` access: @@ -57,6 +60,14 @@ or run the following as `root`: curl -s https://raw.githubusercontent.com/lovell/sharp/master/preinstall.sh | bash - +To enable OpenSlide, add the --with-openslide argument: + +> curl -s https://raw.githubusercontent.com/lovell/sharp/master/preinstall.sh | sudo bash -s -- --with-openslide + +or run the following as `root`: + + curl -s https://raw.githubusercontent.com/lovell/sharp/master/preinstall.sh | bash -s -- --with-openslide + The [preinstall.sh](https://github.com/lovell/sharp/blob/master/preinstall.sh) script requires `curl` and `pkg-config`. ### Mac OS tips @@ -508,11 +519,17 @@ _Requires libvips 7.42.0+_ An advanced setting to disable adaptive row filtering for the lossless PNG output format. +#### tileSize(tileSize) +Setting the tile_size when DZI output format is selected. Default is 256. + +#### tileOverlap(tileOverlap) +Setting the overlap when DZI output format is selected. Default is 0. + ### Output methods #### toFile(filename, [callback]) -`filename` is a String containing the filename to write the image data to. The format is inferred from the extension, with JPEG, PNG, WebP and TIFF supported. +`filename` is a String containing the filename to write the image data to. The format is inferred from the extension, with JPEG, PNG, WebP, TIFF and DZI supported. `callback`, if present, is called with two arguments `(err, info)` where: diff --git a/index.js b/index.js index 531bc687e..d83b00f6e 100755 --- a/index.js +++ b/index.js @@ -66,7 +66,9 @@ var Sharp = function(input) { withoutAdaptiveFiltering: false, withoutChromaSubsampling: false, streamOut: false, - withMetadata: false + withMetadata: false, + tileSize: 256, + tileOverlap: 0 }; if (typeof input === 'string') { // input=file @@ -377,6 +379,32 @@ Sharp.prototype.withMetadata = function(withMetadata) { return this; }; +/* + dz tile size for DZ output + max is 8192 since 7.36.5 (1024 before) +*/ +Sharp.prototype.tileSize = function(tileSize) { + if (!Number.isNaN(tileSize) && tileSize >= 1 && tileSize <= 8192) { + this.options.tileSize = tileSize; + } else { + throw new Error('Invalid tileSize (1 to 8192) ' + tileSize); + } + return this; +}; + +/* + dz overlap for DZ output +*/ +Sharp.prototype.tileOverlap = function(tileOverlap) { + if (!Number.isNaN(tileOverlap) && tileOverlap >=0 && tileOverlap <= 8192) { + this.options.tileOverlap = tileOverlap; + } else { + throw new Error('Invalid tileOverlap (0 to 8192) ' + tileOverlap); + } + + return this; +}; + Sharp.prototype.resize = function(width, height) { if (!width) { this.options.width = -1; @@ -483,6 +511,14 @@ Sharp.prototype.raw = function() { return this; }; +/* + Force DZI output +*/ +Sharp.prototype.dz = function() { + this.options.output = '__dzi'; + return this; +}; + /* Force output to a given format @param format is either the id as a String or an Object with an 'id' attribute diff --git a/package.json b/package.json index e99f80836..dc4cbb711 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,8 @@ "Brandon Aaron ", "Andreas Lind ", "Maurus Cuelenaere ", - "Linus Unnebäck " + "Linus Unnebäck ", + "Victor Mateevitsi " ], "description": "High performance Node.js module to resize JPEG, PNG, WebP and TIFF images using the libvips library", "scripts": { diff --git a/preinstall.sh b/preinstall.sh index c6b5e79bc..daf09fb89 100755 --- a/preinstall.sh +++ b/preinstall.sh @@ -16,6 +16,10 @@ vips_version_minimum=7.40.0 vips_version_latest_major_minor=7.42 vips_version_latest_patch=3 +openslide_version_minimum=3.4.0 +openslide_version_latest_major_minor=3.4 +openslide_version_latest_patch=0 + install_libvips_from_source() { echo "Compiling libvips $vips_version_latest_major_minor.$vips_version_latest_patch from source" curl -O http://www.vips.ecs.soton.ac.uk/supported/$vips_version_latest_major_minor/vips-$vips_version_latest_major_minor.$vips_version_latest_patch.tar.gz @@ -31,32 +35,82 @@ install_libvips_from_source() { echo "Installed libvips $vips_version_latest_major_minor.$vips_version_latest_patch" } +install_libopenslide_from_source() { + echo "Compiling openslide $openslide_version_latest_major_minor.$openslide_version_latest_patch from source" + curl -O -L https://github.com/openslide/openslide/releases/download/v$openslide_version_latest_major_minor.$openslide_version_latest_patch/openslide-$openslide_version_latest_major_minor.$openslide_version_latest_patch.tar.gz + tar xzvf openslide-$openslide_version_latest_major_minor.$openslide_version_latest_patch.tar.gz + cd openslide-$openslide_version_latest_major_minor.$openslide_version_latest_patch + PKG_CONFIG_PATH=$pkg_config_path ./configure $1 + make + make install + cd .. + rm -rf openslide-$openslide_version_latest_major_minor.$openslide_version_latest_patch + rm openslide-$openslide_version_latest_major_minor.$openslide_version_latest_patch.tar.gz + ldconfig + echo "Installed libopenslide $openslide_version_latest_major_minor.$openslide_version_latest_patch" +} + sorry() { - echo "Sorry, I don't yet know how to install libvips on $1" + echo "Sorry, I don't yet know how to install lib$1 on $2" exit 1 } +pkg_config_path_homebrew=`which brew >/dev/null 2>&1 && eval $(brew --env) && echo $PKG_CONFIG_LIBDIR || true` +pkg_config_path="$pkg_config_path_homebrew:$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig" + +check_if_library_exists() { + PKG_CONFIG_PATH=$pkg_config_path pkg-config --exists $1 + if [ $? -eq 0 ]; then + version_found=$(PKG_CONFIG_PATH=$pkg_config_path pkg-config --modversion $1) + PKG_CONFIG_PATH=$pkg_config_path pkg-config --atleast-version=$2 $1 + if [ $? -eq 0 ]; then + # Found suitable version of libvips + echo "Found lib$1 $version_found" + return 1 + fi + echo "Found lib$1 $version_found but require $2" + else + echo "Could not find lib$1 using a PKG_CONFIG_PATH of '$pkg_config_path'" + fi + return 0 +} + +enable_openslide=0 # Is libvips already installed, and is it at least the minimum required version? +if [ $# -eq 1 ]; then + if [ "$1" = "--with-openslide" ]; then + echo "Installing vips with openslide support" + enable_openslide=1 + else + echo "Sorry, $1 is not supported. Did you mean --with-openslide?" + exit 1 + fi +fi if ! type pkg-config >/dev/null; then - sorry "a system without pkg-config" + sorry "vips" "a system without pkg-config" fi -pkg_config_path_homebrew=`which brew >/dev/null 2>&1 && eval $(brew --env) && echo $PKG_CONFIG_LIBDIR || true` -pkg_config_path="$pkg_config_path_homebrew:$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig" +openslide_exists=0 +if [ $enable_openslide -eq 1 ]; then + check_if_library_exists "openslide" "$openslide_version_minimum" + openslide_exists=$? +fi -PKG_CONFIG_PATH=$pkg_config_path pkg-config --exists vips -if [ $? -eq 0 ]; then - vips_version_found=$(PKG_CONFIG_PATH=$pkg_config_path pkg-config --modversion vips) - pkg-config --atleast-version=$vips_version_minimum vips - if [ $? -eq 0 ]; then - # Found suitable version of libvips - echo "Found libvips $vips_version_found" - exit 0 +check_if_library_exists "vips" "$vips_version_minimum" +vips_exists=$? +if [ $vips_exists -eq 1 ] && [ $enable_openslide -eq 1 ]; then + if [ $openslide_exists -eq 1 ]; then + # Check if vips compiled with openslide support + vips_with_openslide=`vips list classes | grep -i opensli` + if [ -z $vips_with_openslide ]; then + echo "Vips compiled without openslide support." + else + exit 0 + fi fi - echo "Found libvips $vips_version_found but require $vips_version_minimum" -else - echo "Could not find libvips using a PKG_CONFIG_PATH of '$pkg_config_path'" +elif [ $vips_exists -eq 1 ] && [ $enable_openslide -eq 0 ]; then + exit 0 fi # Verify root/sudo access @@ -65,6 +119,108 @@ if [ "$(id -u)" -ne "0" ]; then exit 1 fi +# OS-specific installations of libopenslide follows +# Either openslide does not exist, or vips is installed without openslide support +if [ $enable_openslide -eq 1 ] && [ -z $vips_with_openslide ] && [ $openslide_exists -eq 0 ]; then + case $(uname -s) in + *[Dd]arwin*) + # Mac OS + echo "Detected Mac OS" + if type "brew" > /dev/null; then + echo "Installing libopenslide via homebrew" + brew install openslide + elif type "port" > /dev/null; then + echo "Installing libopenslide via MacPorts" + port install openslide + else + sorry "openslide" "Mac OS without homebrew or MacPorts" + fi + ;; + *) + if [ -f /etc/debian_version ]; then + # Debian Linux + DISTRO=$(lsb_release -c -s) + echo "Detected Debian Linux '$DISTRO'" + case "$DISTRO" in + jessie|vivid) + # Debian 8, Ubuntu 15 + echo "Installing libopenslide via apt-get" + apt-get install -y libopenslide-dev + ;; + trusty|utopic|qiana|rebecca) + # Ubuntu 14, Mint 17 + echo "Installing libopenslide dependencies via apt-get" + apt-get install -y automake build-essential curl zlib1g-dev libopenjpeg-dev libpng12-dev libjpeg-dev libtiff5-dev libgdk-pixbuf2.0-dev libxml2-dev libsqlite3-dev libcairo2-dev libglib2.0-dev sqlite3 libsqlite3-dev + install_libopenslide_from_source + ;; + precise|wheezy|maya) + # Debian 7, Ubuntu 12.04, Mint 13 + echo "Installing libopenslide dependencies via apt-get" + apt-get install -y automake build-essential curl zlib1g-dev libopenjpeg-dev libpng12-dev libjpeg-dev libtiff5-dev libgdk-pixbuf2.0-dev libxml2-dev libsqlite3-dev libcairo2-dev libglib2.0-dev sqlite3 libsqlite3-dev + install_libopenslide_from_source + ;; + *) + # Unsupported Debian-based OS + sorry "openslide" "Debian-based $DISTRO" + ;; + esac + elif [ -f /etc/redhat-release ]; then + # Red Hat Linux + RELEASE=$(cat /etc/redhat-release) + echo "Detected Red Hat Linux '$RELEASE'" + case $RELEASE in + "Red Hat Enterprise Linux release 7."*|"CentOS Linux release 7."*|"Scientific Linux release 7."*) + # RHEL/CentOS 7 + echo "Installing libopenslide dependencies via yum" + yum groupinstall -y "Development Tools" + yum install -y tar curl libpng-devel libjpeg-devel libxml2-devel zlib-devel openjpeg-devel libtiff-devel gdk-pixbuf2-devel sqlite-devel cairo-devel glib2-devel + install_libopenslide_from_source "--prefix=/usr" + ;; + "Red Hat Enterprise Linux release 6."*|"CentOS release 6."*|"Scientific Linux release 6."*) + # RHEL/CentOS 6 + echo "Installing libopenslide dependencies via yum" + yum groupinstall -y "Development Tools" + yum install -y tar curl libpng-devel libjpeg-devel libxml2-devel zlib-devel openjpeg-devel libtiff-devel gdk-pixbuf2-devel sqlite-devel cairo-devel glib2-devel + install_libopenslide_from_source "--prefix=/usr" + ;; + "Fedora release 21 "*|"Fedora release 22 "*) + # Fedora 21, 22 + echo "Installing libopenslide via yum" + yum install -y openslide-devel + ;; + *) + # Unsupported RHEL-based OS + sorry "openslide" "$RELEASE" + ;; + esac + elif [ -f /etc/os-release ]; then + RELEASE=$(cat /etc/os-release | grep VERSION) + echo "Detected OpenSuse Linux '$RELEASE'" + case $RELEASE in + *"13.2"*) + echo "Installing libopenslide via zypper" + zypper --gpg-auto-import-keys install -y libopenslide-devel + ;; + esac + elif [ -f /etc/SuSE-brand ]; then + RELEASE=$(cat /etc/SuSE-brand | grep VERSION) + echo "Detected OpenSuse Linux '$RELEASE'" + case $RELEASE in + *"13.1") + echo "Installing libopenslide dependencies via zypper" + zypper --gpg-auto-import-keys install -y --type pattern devel_basis + zypper --gpg-auto-import-keys install -y tar curl libpng16-devel libjpeg-turbo libjpeg8-devel libxml2-devel zlib-devel openjpeg-devel libtiff-devel libgdk_pixbuf-2_0-0 sqlite3-devel cairo-devel glib2-devel + install_libopenslide_from_source + ;; + esac + else + # Unsupported OS + sorry "openslide" "$(uname -a)" + fi + ;; + esac +fi + # OS-specific installations of libvips follows case $(uname -s) in @@ -73,12 +229,16 @@ case $(uname -s) in echo "Detected Mac OS" if type "brew" > /dev/null; then echo "Installing libvips via homebrew" - brew install homebrew/science/vips --with-webp --with-graphicsmagick + if [ $enable_openslide -eq 1 ]; then + brew install homebrew/science/vips --with-webp --with-graphicsmagick --with-openslide + else + brew install homebrew/science/vips --with-webp --with-graphicsmagick + fi elif type "port" > /dev/null; then echo "Installing libvips via MacPorts" port install vips else - sorry "Mac OS without homebrew or MacPorts" + sorry "vips" "Mac OS without homebrew or MacPorts" fi ;; *) @@ -89,8 +249,13 @@ case $(uname -s) in case "$DISTRO" in jessie|vivid) # Debian 8, Ubuntu 15 - echo "Installing libvips via apt-get" - apt-get install -y libvips-dev libgsf-1-dev + if [ $enable_openslide -eq 1 ]; then + echo "Installing libvips via apt-get" + apt-get install -y libvips-dev libgsf-1-dev + else + echo "Recompiling vips with openslide support" + install_libvips_from_source + fi ;; trusty|utopic|qiana|rebecca) # Ubuntu 14, Mint 17 @@ -108,7 +273,7 @@ case $(uname -s) in ;; *) # Unsupported Debian-based OS - sorry "Debian-based $DISTRO" + sorry "vips" "Debian-based $DISTRO" ;; esac elif [ -f /etc/redhat-release ]; then @@ -136,12 +301,20 @@ case $(uname -s) in ;; "Fedora release 21 "*|"Fedora release 22 "*) # Fedora 21, 22 - echo "Installing libvips via yum" - yum install -y vips-devel + if [ $enable_openslide -eq 1 ]; then + echo "Installing libvips dependencies via yum" + yum groupinstall -y "Development Tools" + yum install -y gcc-c++ gtk-doc libxml2-devel libjpeg-turbo-devel libpng-devel libtiff-devel libexif-devel lcms-devel ImageMagick-devel gobject-introspection-devel libwebp-devel curl + echo "Compiling vips with openslide support" + install_libvips_from_source "--prefix=/usr" + else + echo "Installing libvips via yum" + yum install -y vips-devel + fi ;; *) # Unsupported RHEL-based OS - sorry "$RELEASE" + sorry "vips" "$RELEASE" ;; esac elif [ -f /etc/system-release ]; then @@ -157,9 +330,31 @@ case $(uname -s) in install_libvips_from_source "--prefix=/usr" ;; esac + elif [ -f /etc/os-release ]; then + RELEASE=$(cat /etc/os-release | grep VERSION) + echo "Detected OpenSuse Linux '$RELEASE'" + case $RELEASE in + *"13.2"*) + echo "Installing libvips dependencies via zypper" + zypper --gpg-auto-import-keys install -y --type pattern devel_basis + zypper --gpg-auto-import-keys install -y tar curl gtk-doc libxml2-devel libjpeg-turbo libjpeg8-devel libpng16-devel libtiff-devel libexif-devel liblcms2-devel ImageMagick-devel gobject-introspection-devel libwebp-devel + install_libvips_from_source + ;; + esac + elif [ -f /etc/SuSE-brand ]; then + RELEASE=$(cat /etc/SuSE-brand | grep VERSION) + echo "Detected OpenSuse Linux '$RELEASE'" + case $RELEASE in + *"13.1") + echo "Installing libvips dependencies via zypper" + zypper --gpg-auto-import-keys install -y --type pattern devel_basis + zypper --gpg-auto-import-keys install -y tar curl gtk-doc libxml2-devel libjpeg-turbo libjpeg8-devel libpng16-devel libtiff-devel libexif-devel liblcms2-devel ImageMagick-devel gobject-introspection-devel libwebp-devel + install_libvips_from_source + ;; + esac else # Unsupported OS - sorry "$(uname -a)" + sorry "vips" "$(uname -a)" fi ;; esac diff --git a/src/common.cc b/src/common.cc index 62567b386..0f6c345cf 100755 --- a/src/common.cc +++ b/src/common.cc @@ -28,6 +28,9 @@ namespace sharp { bool IsTiff(std::string const &str) { return EndsWith(str, ".tif") || EndsWith(str, ".tiff") || EndsWith(str, ".TIF") || EndsWith(str, ".TIFF"); } + bool IsDz(std::string const &str) { + return EndsWith(str, ".dzi") || EndsWith(str, ".DZI"); + } /* Determine image format of a buffer. @@ -103,6 +106,7 @@ namespace sharp { } else if(vips_foreign_is_a("magickload", file)) { imageType = ImageType::MAGICK; } + return imageType; } diff --git a/src/common.h b/src/common.h index cd2dd1ae8..0712ef153 100755 --- a/src/common.h +++ b/src/common.h @@ -9,7 +9,8 @@ namespace sharp { PNG, WEBP, TIFF, - MAGICK + MAGICK, + DZ }; // How many tasks are in the queue? @@ -23,6 +24,7 @@ namespace sharp { bool IsPng(std::string const &str); bool IsWebp(std::string const &str); bool IsTiff(std::string const &str); + bool IsDz(std::string const &str); /* Determine image format of a buffer. diff --git a/src/metadata.cc b/src/metadata.cc index c6e00a001..204730589 100755 --- a/src/metadata.cc +++ b/src/metadata.cc @@ -90,6 +90,7 @@ class MetadataWorker : public NanAsyncWorker { case ImageType::WEBP: baton->format = "webp"; break; case ImageType::TIFF: baton->format = "tiff"; break; case ImageType::MAGICK: baton->format = "magick"; break; + case ImageType::DZ: baton->format = "dzi"; break; case ImageType::UNKNOWN: break; } // VipsImage attributes diff --git a/src/resize.cc b/src/resize.cc index 57dbc591e..b37eeacac 100755 --- a/src/resize.cc +++ b/src/resize.cc @@ -32,6 +32,7 @@ using sharp::IsJpeg; using sharp::IsPng; using sharp::IsWebp; using sharp::IsTiff; +using sharp::IsDz; using sharp::counterProcess; using sharp::counterQueue; @@ -94,6 +95,8 @@ struct ResizeBaton { bool withoutChromaSubsampling; std::string err; bool withMetadata; + int tileSize; + int tileOverlap; ResizeBaton(): bufferInLength(0), @@ -120,7 +123,9 @@ struct ResizeBaton { compressionLevel(6), withoutAdaptiveFiltering(false), withoutChromaSubsampling(false), - withMetadata(false) { + withMetadata(false), + tileSize(256), + tileOverlap(0) { background[0] = 0.0; background[1] = 0.0; background[2] = 0.0; @@ -755,7 +760,8 @@ class ResizeWorker : public NanAsyncWorker { bool outputPng = IsPng(baton->output); bool outputWebp = IsWebp(baton->output); bool outputTiff = IsTiff(baton->output); - bool matchInput = !(outputJpeg || outputPng || outputWebp || outputTiff); + bool outputDz = IsDz(baton->output); + bool matchInput = !(outputJpeg || outputPng || outputWebp || outputTiff || outputDz); if (outputJpeg || (matchInput && inputImageType == ImageType::JPEG)) { // Write JPEG to file if (vips_jpegsave(image, baton->output.c_str(), "strip", !baton->withMetadata, @@ -795,6 +801,14 @@ class ResizeWorker : public NanAsyncWorker { return Error(baton, hook); } baton->outputFormat = "tiff"; + } else if (outputDz || matchInput) { + // Write DZ to file + std::string filename_no_extension = baton->output.substr(0, baton->output.length() - 4); + if (vips_dzsave(image, filename_no_extension.c_str(), "strip", !baton->withMetadata, + "tile_size", baton->tileSize, "overlap", baton->tileOverlap, NULL)) { + return Error(baton, hook); + } + baton->outputFormat = "dz"; } else { (baton->err).append("Unsupported output " + baton->output); return Error(baton, hook); @@ -828,8 +842,13 @@ class ResizeWorker : public NanAsyncWorker { // Info Object Local info = NanNew(); info->Set(NanNew("format"), NanNew(baton->outputFormat)); - info->Set(NanNew("width"), NanNew(width)); - info->Set(NanNew("height"), NanNew(height)); + info->Set(NanNew("width"), NanNew(static_cast(width))); + info->Set(NanNew("height"), NanNew(static_cast(height))); + + if (baton->outputFormat == "dz" ) { + info->Set(NanNew("tileSize"), NanNew(static_cast(baton->tileSize))); + info->Set(NanNew("tileOverlap"), NanNew(static_cast(baton->tileOverlap))); + } if (baton->bufferOutLength > 0) { // Copy data to new Buffer @@ -1017,6 +1036,8 @@ NAN_METHOD(resize) { baton->withMetadata = options->Get(NanNew("withMetadata"))->BooleanValue(); // Output filename or __format for Buffer baton->output = *String::Utf8Value(options->Get(NanNew("output"))->ToString()); + baton->tileSize = options->Get(NanNew("tileSize"))->Int32Value(); + baton->tileOverlap = options->Get(NanNew("tileOverlap"))->Int32Value(); // Join queue for worker thread NanCallback *callback = new NanCallback(args[1].As()); diff --git a/test/fixtures/CMU-1-Small-Region.svs b/test/fixtures/CMU-1-Small-Region.svs new file mode 100644 index 000000000..1125dcd03 Binary files /dev/null and b/test/fixtures/CMU-1-Small-Region.svs differ diff --git a/test/fixtures/index.js b/test/fixtures/index.js index d497430c3..a0daf0c3b 100755 --- a/test/fixtures/index.js +++ b/test/fixtures/index.js @@ -25,6 +25,8 @@ module.exports = { inputSvg: getPath('Wikimedia-logo.svg'), // http://commons.wikimedia.org/wiki/File:Wikimedia-logo.svg inputPsd: getPath('free-gearhead-pack.psd'), // https://dribbble.com/shots/1624241-Free-Gearhead-Vector-Pack + inputSvs: getPath('CMU-1-Small-Region.svs'), // http://openslide.cs.cmu.edu/download/openslide-testdata/Aperio/CMU-1-Small-Region.svs + outputJpg: getPath('output.jpg'), outputPng: getPath('output.png'), outputWebP: getPath('output.webp'), diff --git a/test/unit/io.js b/test/unit/io.js index 4ee5e809e..4b490161b 100755 --- a/test/unit/io.js +++ b/test/unit/io.js @@ -519,6 +519,42 @@ describe('Input/output', function() { }); } + if (sharp.format.dz.output.file) { + it('Convert JPEG to DZ', function(done) { + sharp(fixtures.inputJpg) + .resize(320, 240) + .toFormat(sharp.format.dz) + .toFile(fixtures.path('output.jpg.dzi'), function(err, info) { + if (err) throw err; + assert.strictEqual(true, info.size > 0); + assert.strictEqual('dz', info.format); + assert.strictEqual(320, info.width); + assert.strictEqual(240, info.height); + assert.strictEqual(256, info.tileSize); + assert.strictEqual(0, info.tileOverlap); + done(); + }); + }); + + it('Convert JPEG to DZ (test tileSize and tileOverlap)', function(done) { + sharp(fixtures.inputJpg) + .resize(320, 240) + .toFormat(sharp.format.dz) + .tileSize(512) + .tileOverlap(10) + .toFile(fixtures.path('output.tileTest.jpg.dzi'), function(err, info) { + if (err) throw err; + assert.strictEqual(true, info.size > 0); + assert.strictEqual('dz', info.format); + assert.strictEqual(320, info.width); + assert.strictEqual(240, info.height); + assert.strictEqual(512, info.tileSize); + assert.strictEqual(10, info.tileOverlap); + done(); + }); + }); +} + if (sharp.format.tiff.input.buffer) { it('Load TIFF from Buffer', function(done) { var inputTiffBuffer = fs.readFileSync(fixtures.inputTiff); @@ -668,4 +704,65 @@ describe('Input/output', function() { }); + if(sharp.format.openslide.input.file) { + describe('Openslide output', function() { + it('Aperio - convert SVS to PNG', function(done) { + sharp(fixtures.inputSvs) + .toFile(fixtures.path('output.svs.png'), function(err, info) { + if (err) throw err; + assert.strictEqual(true, info.size > 0); + assert.strictEqual('png', info.format); + assert.strictEqual(2220, info.width); + assert.strictEqual(2967, info.height); + done(); + }); + }); + it('Aperio - convert SVS to JPEG', function(done) { + sharp(fixtures.inputSvs) + .toFile(fixtures.path('output.svs.jpeg'), function(err, info) { + if (err) throw err; + assert.strictEqual(true, info.size > 0); + assert.strictEqual('jpeg', info.format); + assert.strictEqual(2220, info.width); + assert.strictEqual(2967, info.height); + done(); + }); + }); + it('Aperio - convert SVS to TIFF', function(done) { + sharp(fixtures.inputSvs) + .toFile(fixtures.path('output.svs.tiff'), function(err, info) { + if (err) throw err; + assert.strictEqual(true, info.size > 0); + assert.strictEqual('tiff', info.format); + assert.strictEqual(2220, info.width); + assert.strictEqual(2967, info.height); + done(); + }); + }); + it('Aperio - convert SVS to WEBP', function(done) { + sharp(fixtures.inputSvs) + .toFile(fixtures.path('output.svs.webp'), function(err, info) { + if (err) throw err; + assert.strictEqual(true, info.size > 0); + assert.strictEqual('webp', info.format); + assert.strictEqual(2220, info.width); + assert.strictEqual(2967, info.height); + done(); + }); + }); + it('Aperio - convert SVS to DZI', function(done) { + sharp(fixtures.inputSvs) + .toFile(fixtures.path('output.aperio.svs.dzi'), function(err, info) { + if (err) throw err; + assert.strictEqual(true, info.size > 0); + assert.strictEqual('dz', info.format); + assert.strictEqual(2220, info.width); + assert.strictEqual(2967, info.height); + assert.strictEqual(256, info.tileSize); + assert.strictEqual(0, info.tileOverlap); + done(); + }); + }); + }); + } });