Mathis/sharp
1
0
Fork 0
mirror of https://github.com/lovell/sharp.git synced 2025-07-09 10:30:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

No need to remove dzi file extension

Browse Source 
libvips handles this - ensures filenames containing . work
This commit is contained in:
Lovell Fuller 2015-04-19 21:08:15 +01:00
parent 3614d14f83
commit a0655806de
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/resize.cc
View File

@ -934,8 +934,7 @@ class ResizeWorker : public NanAsyncWorker {
baton->outputFormat = "tiff"; baton->outputFormat = "tiff";
} else if (outputDz) { } else if (outputDz) {
// Write DZ to file // Write DZ to file
std::string filename_no_extension = baton->output.substr(0, baton->output.length() - 4); if (vips_dzsave(image, baton->output.c_str(), "strip", !baton->withMetadata,
if (vips_dzsave(image, filename_no_extension.c_str(), "strip", !baton->withMetadata,
"tile_size", baton->tileSize, "overlap", baton->tileOverlap, NULL)) { "tile_size", baton->tileSize, "overlap", baton->tileOverlap, NULL)) {
return Error(); return Error();
} }

8
test/unit/tile.js
View File

@ -177,9 +177,9 @@ describe('Tile', function() {
describe('Deep Zoom output', function() { describe('Deep Zoom output', function() {
it('Tile size - 256px default', function(done) { it('Tile size - 256px default', function(done) {
var directory = fixtures.path('output256_files'); var directory = fixtures.path('output.256_files');
rimraf(directory, function() { rimraf(directory, function() {
sharp(fixtures.inputJpg).toFile(fixtures.path('output256.dzi'), function(err, info) { sharp(fixtures.inputJpg).toFile(fixtures.path('output.256.dzi'), function(err, info) {
if (err) throw err; if (err) throw err;
assert.strictEqual('dz', info.format); assert.strictEqual('dz', info.format);
assertDeepZoomTiles(directory, 256, 13, done); assertDeepZoomTiles(directory, 256, 13, done);
@ -188,9 +188,9 @@ describe('Tile', function() {
}); });
it('Tile size/overlap - 512/16px', function(done) { it('Tile size/overlap - 512/16px', function(done) {
var directory = fixtures.path('output512_files'); var directory = fixtures.path('output.512_files');
rimraf(directory, function() { rimraf(directory, function() {
sharp(fixtures.inputJpg).tile(512, 16).toFile(fixtures.path('output512.dzi'), function(err, info) { sharp(fixtures.inputJpg).tile(512, 16).toFile(fixtures.path('output.512.dzi'), function(err, info) {
if (err) throw err; if (err) throw err;
assert.strictEqual('dz', info.format); assert.strictEqual('dz', info.format);
assertDeepZoomTiles(directory, 512 + 2 * 16, 13, done); assertDeepZoomTiles(directory, 512 + 2 * 16, 13, done);