mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-20 23:28:06 +02:00
Code Activity

Merge pull request #9586 from Snuffleupagus/pageSize-api-rotate

Browse source 
Ensure that `PDFPageProxy.pageSizeInches` handles non-default /Rotate entries correctly
This commit is contained in:
Tim van der Meij 2018-03-25 18:03:32 +02:00 • committed by GitHub
commit 5c1a16ba6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 56 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
web/pdf_document_properties.js
View file

@ -13,7 +13,9 @@
* limitations under the License.
*/
import { cloneObj, getPDFFileNameFromURL, NullL10n } from './ui_utils';
import {
cloneObj, getPageSizeInches, getPDFFileNameFromURL, NullL10n
} from './ui_utils';
import { createPromiseCapability } from 'pdfjs-lib';
const DEFAULT_FIELD_CONTENT = '-';
@ -92,7 +94,7 @@ class PDFDocumentProperties {
this._parseDate(info.CreationDate),
this._parseDate(info.ModDate),
this.pdfDocument.getPage(currentPageNumber).then((pdfPage) => {
return this._parsePageSize(pdfPage.pageSizeInches);
return this._parsePageSize(getPageSizeInches(pdfPage));
}),
]);
}).then(([info, metadata, fileName, fileSize, creationDate, modDate,

22
web/ui_utils.js
View file

@ -269,6 +269,27 @@ function roundToDivide(x, div) {
return r === 0 ? x : Math.round(x - r + div);
}
/**
* Gets the size of the specified page, converted from PDF units to inches.
* @param {Object} An Object containing the properties: {Array} `view`,
* {number} `userUnit`, and {number} `rotate`.
* @return {Object} An Object containing the properties: {number} `width`
* and {number} `height`, given in inches.
*/
function getPageSizeInches({ view, userUnit, rotate, }) {
const [x1, y1, x2, y2] = view;
// We need to take the page rotation into account as well.
const changeOrientation = rotate % 180 !== 0;
const width = (x2 - x1) / 72 * userUnit;
const height = (y2 - y1) / 72 * userUnit;
return {
width: (changeOrientation ? height : width),
height: (changeOrientation ? width : height),
};
}
/**
* Generic helper to find out what elements are visible within a scroll pane.
*/
@ -634,6 +655,7 @@ export {
parseQueryString,
getVisibleElements,
roundToDivide,
getPageSizeInches,
approximateFraction,
getOutputScale,
scrollIntoView,