Support info.size on wide-char systems via upgrade to C++17 #3943

This commit is contained in:
Lovell Fuller
2024-11-04 18:16:29 +00:00
parent 7bdf419eb1
commit 06b08bf10f
8 changed files with 43 additions and 48 deletions

View File

@@ -483,7 +483,7 @@ describe('Tile', function () {
assert.strictEqual(2725, info.width);
assert.strictEqual(2225, info.height);
assert.strictEqual(3, info.channels);
assert.strictEqual('number', typeof info.size);
assert.strictEqual(undefined, info.size);
fs.stat(path.join(directory, 'ImageProperties.xml'), function (err, stat) {
if (err) throw err;
assert.strictEqual(true, stat.isFile());
@@ -509,7 +509,7 @@ describe('Tile', function () {
assert.strictEqual(2725, info.width);
assert.strictEqual(2225, info.height);
assert.strictEqual(3, info.channels);
assert.strictEqual('number', typeof info.size);
assert.strictEqual(undefined, info.size);
assertZoomifyTiles(directory, 256, 1, done);
});
});
@@ -530,7 +530,7 @@ describe('Tile', function () {
assert.strictEqual(2725, info.width);
assert.strictEqual(2225, info.height);
assert.strictEqual(3, info.channels);
assert.strictEqual('number', typeof info.size);
assert.strictEqual(undefined, info.size);
assertZoomifyTiles(directory, 256, 5, done);
});
});
@@ -551,7 +551,7 @@ describe('Tile', function () {
assert.strictEqual(2725, info.width);
assert.strictEqual(2225, info.height);
assert.strictEqual(3, info.channels);
assert.strictEqual('number', typeof info.size);
assert.strictEqual(undefined, info.size);
assertZoomifyTiles(directory, 256, 13, done);
});
});
@@ -575,7 +575,7 @@ describe('Tile', function () {
assert.strictEqual(2048, info.width);
assert.strictEqual(1536, info.height);
assert.strictEqual(3, info.channels);
assert.strictEqual('number', typeof info.size);
assert.strictEqual(undefined, info.size);
assertZoomifyTiles(directory, 256, 4, done);
});
});
@@ -594,7 +594,7 @@ describe('Tile', function () {
assert.strictEqual(2725, info.width);
assert.strictEqual(2225, info.height);
assert.strictEqual(3, info.channels);
assert.strictEqual('number', typeof info.size);
assert.strictEqual(undefined, info.size);
fs.stat(path.join(directory, '0', '0', '0.jpg'), function (err, stat) {
if (err) throw err;
assert.strictEqual(true, stat.isFile());
@@ -621,7 +621,7 @@ describe('Tile', function () {
assert.strictEqual(2725, info.width);
assert.strictEqual(2225, info.height);
assert.strictEqual(3, info.channels);
assert.strictEqual('number', typeof info.size);
assert.strictEqual(undefined, info.size);
const sample = path.join(directory, '0', '0', '0.jpg');
sharp(sample).metadata(function (err, metadata) {
if (err) throw err;
@@ -658,7 +658,7 @@ describe('Tile', function () {
assert.strictEqual(2725, info.width);
assert.strictEqual(2225, info.height);
assert.strictEqual(3, info.channels);
assert.strictEqual('number', typeof info.size);
assert.strictEqual(undefined, info.size);
const sample = path.join(directory, '0', '0', '0.png');
sharp(sample).metadata(function (err, metadata) {
if (err) throw err;
@@ -696,7 +696,7 @@ describe('Tile', function () {
assert.strictEqual(2725, info.width);
assert.strictEqual(2225, info.height);
assert.strictEqual(3, info.channels);
assert.strictEqual('number', typeof info.size);
assert.strictEqual(undefined, info.size);
const sample = path.join(directory, '0', '0', '0.webp');
sharp(sample).metadata(function (err, metadata) {
if (err) throw err;
@@ -732,8 +732,7 @@ describe('Tile', function () {
assert.strictEqual(2725, info.width);
assert.strictEqual(2225, info.height);
assert.strictEqual(3, info.channels);
assert.strictEqual('number', typeof info.size);
assert.strictEqual(undefined, info.size);
assertGoogleTiles(directory, 256, 1, done);
});
});
@@ -754,8 +753,7 @@ describe('Tile', function () {
assert.strictEqual(2725, info.width);
assert.strictEqual(2225, info.height);
assert.strictEqual(3, info.channels);
assert.strictEqual('number', typeof info.size);
assert.strictEqual(undefined, info.size);
assertGoogleTiles(directory, 256, 5, done);
});
});
@@ -779,8 +777,7 @@ describe('Tile', function () {
assert.strictEqual(2809, info.width);
assert.strictEqual(2074, info.height);
assert.strictEqual(3, info.channels);
assert.strictEqual('number', typeof info.size);
assert.strictEqual(undefined, info.size);
assertGoogleTiles(directory, 256, 5, done);
});
});
@@ -800,7 +797,7 @@ describe('Tile', function () {
assert.strictEqual(2725, info.width);
assert.strictEqual(2225, info.height);
assert.strictEqual(3, info.channels);
assert.strictEqual('number', typeof info.size);
assert.strictEqual(undefined, info.size);
fixtures.assertSimilar(fixtures.expected('tile_centered.jpg'), fs.readFileSync(path.join(directory, '0', '0', '0.jpg')), done);
});
});
@@ -820,7 +817,7 @@ describe('Tile', function () {
assert.strictEqual(2725, info.width);
assert.strictEqual(2225, info.height);
assert.strictEqual(3, info.channels);
assert.strictEqual('number', typeof info.size);
assert.strictEqual(undefined, info.size);
fixtures.assertSimilar(fixtures.expected('tile_centered.jpg'), fs.readFileSync(path.join(directory, '0', '0', '0.jpg')), done);
});
});
@@ -842,7 +839,7 @@ describe('Tile', function () {
assert.strictEqual(2725, info.width);
assert.strictEqual(2225, info.height);
assert.strictEqual(3, info.channels);
assert.strictEqual('number', typeof info.size);
assert.strictEqual(undefined, info.size);
const infoJson = require(path.join(directory, 'info.json'));
assert.strictEqual('http://iiif.io/api/image/2/context.json', infoJson['@context']);
assert.strictEqual(`${id}/${name}`, infoJson['@id']);
@@ -872,7 +869,7 @@ describe('Tile', function () {
assert.strictEqual(2725, info.width);
assert.strictEqual(2225, info.height);
assert.strictEqual(3, info.channels);
assert.strictEqual('number', typeof info.size);
assert.strictEqual(undefined, info.size);
const infoJson = require(path.join(directory, 'info.json'));
assert.strictEqual('http://iiif.io/api/image/3/context.json', infoJson['@context']);
assert.strictEqual('ImageService3', infoJson.type);