Browse Source

Move scale out of pdf.js

notmasteryet 14 years ago
parent
commit
c2eaa55cd9
  1. 10
      pdf.js
  2. 4
      web/viewer.js

10
pdf.js

@ -3340,7 +3340,7 @@ var Page = (function() {
return {x: y, y: x}; return {x: y, y: x};
} }
}, },
getLinks: function(scale) { getLinks: function() {
var xref = this.xref; var xref = this.xref;
var annotations = xref.fetchIfRef(this.annotations); var annotations = xref.fetchIfRef(this.annotations);
var i, n = annotations.length; var i, n = annotations.length;
@ -3357,10 +3357,10 @@ var Page = (function() {
var bottomRightCorner = this.rotatePoint(rect[2], rect[3]); var bottomRightCorner = this.rotatePoint(rect[2], rect[3]);
var link = {}; var link = {};
link.x = scale * Math.min(topLeftCorner.x, bottomRightCorner.x); link.x = Math.min(topLeftCorner.x, bottomRightCorner.x);
link.y = scale * Math.min(topLeftCorner.y, bottomRightCorner.y); link.y = Math.min(topLeftCorner.y, bottomRightCorner.y);
link.width = scale * Math.abs(topLeftCorner.x - bottomRightCorner.x); link.width = Math.abs(topLeftCorner.x - bottomRightCorner.x);
link.height = scale * Math.abs(topLeftCorner.y - bottomRightCorner.y); link.height = Math.abs(topLeftCorner.y - bottomRightCorner.y);
var a = annotation.get("A"); var a = annotation.get("A");
if (a) { if (a) {
switch(a.get("S").name) { switch(a.get("S").name) {

4
web/viewer.js

@ -166,7 +166,7 @@ var PageView = function(container, content, id, width, height, stats) {
}; };
function setupLinks(canvas, content, scale) { function setupLinks(canvas, content, scale) {
var links = content.getLinks(scale); var links = content.getLinks();
var currentLink = null; var currentLink = null;
if (links.length > 0) if (links.length > 0)
{ {
@ -177,6 +177,8 @@ var PageView = function(container, content, id, width, height, stats) {
x -= p.offsetLeft; x -= p.offsetLeft;
y -= p.offsetTop; y -= p.offsetTop;
} }
x /= scale;
y /= scale;
for (var i = 0; i < links.length; i++) { for (var i = 0; i < links.length; i++) {
var link = links[i]; var link = links[i];
if (!link.url) if (!link.url)

Loading…
Cancel
Save