jenkins-bot has submitted this change and it was merged.
Change subject: Fix "image size too big" check.
......................................................................
Fix "image size too big" check.
The result of `n < undefined` for any number `n` is `false`, so we were in
effect never scaling images (unless a `--size` option was explicitly passed
on the command line).
We can bump the default resolution back up to 300dpi now that we're
actually scaling images.
Bug: 72377
Change-Id: I1bac1f32e35b58d284a685a480018c528602f881
---
M lib/image.js
M lib/metabook.js
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/image.js b/lib/image.js
index fd35442..b1e47af 100644
--- a/lib/image.js
+++ b/lib/image.js
@@ -94,7 +94,7 @@
var isVector = (img.imageinfo.mediatype === 'DRAWING' ||
img.imageinfo.mime === 'application/pdf');
var isVideo = (img.imageinfo.mediatype === 'VIDEO');
- var isTooBig = (img.imageinfo.width > img.imagesize);
+ var isTooBig = (img.imageinfo.width > maxRes);
var proposedName = img.short;
if ((!isVector) && (isTooBig || isVideo) &&
/\/\d+(px-[^\/]+)$/.test(img.src)) {
diff --git a/lib/metabook.js b/lib/metabook.js
index d99f297..fde11a7 100644
--- a/lib/metabook.js
+++ b/lib/metabook.js
@@ -7,7 +7,7 @@
var P = require('./p');
var SiteInfo = require('./siteinfo');
-var DEFAULT_IMAGESIZE = 600; // pixels = 150dpi * 4" wide image
+var DEFAULT_IMAGESIZE = 1200; // pixels = 300dpi * 4" wide image
var DEFAULT_METABOOK = {
type: "collection",
--
To view, visit https://gerrit.wikimedia.org/r/168169
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1bac1f32e35b58d284a685a480018c528602f881
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection/OfflineContentGenerator/bundler
Gerrit-Branch: master
Gerrit-Owner: Cscott <[email protected]>
Gerrit-Reviewer: Arlolra <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
