[Emacs-diffs] /srv/bzr/emacs/trunk r110101: * lisp/doc-view.el (doc-view-guess-paper-size)

[Stefan Monnier]

------------------------------------------------------------
revno: 110101
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2012-09-19 13:54:59 -0400
message:
  * lisp/doc-view.el (doc-view-guess-paper-size)
  (doc-view-scale-bounding-box): Fix unbound `caddr'.
modified:
  lisp/ChangeLog
  lisp/doc-view.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-19 17:35:18 +0000
+++ b/lisp/ChangeLog    2012-09-19 17:54:59 +0000
@@ -1,3 +1,8 @@
+2012-09-19  Stefan Monnier  <address@hidden>
+
+       * doc-view.el (doc-view-guess-paper-size)
+       (doc-view-scale-bounding-box): Fix unbound `caddr'.
+
 2012-09-19  Tassilo Horn  <address@hidden>
 
        New feature: set optimal slice from BoundingBox information.

=== modified file 'lisp/doc-view.el'
--- a/lisp/doc-view.el  2012-09-19 17:35:18 +0000
+++ b/lisp/doc-view.el  2012-09-19 17:54:59 +0000
@@ -1068,15 +1068,15 @@
                   (round (/ (* 100.0 x) y))))
     (let ((ar (div iw ih))
          (al (mapcar (lambda (l)
-                       (list (div (cadr l) (caddr l)) (car l)))
+                       (list (div (nth 1 l) (nth 2 l)) (car l)))
                      doc-view-paper-sizes)))
       (cadr (assoc ar al)))))
 
 (defun doc-view-scale-bounding-box (ps iw ih bb)
-  (list (/ (* (nth 0 bb) iw) (cadr (assoc ps doc-view-paper-sizes)))
-       (/ (* (nth 1 bb) ih) (caddr (assoc ps doc-view-paper-sizes)))
-       (/ (* (nth 2 bb) iw) (cadr (assoc ps doc-view-paper-sizes)))
-       (/ (* (nth 3 bb) ih) (caddr (assoc ps doc-view-paper-sizes)))))
+  (list (/ (* (nth 0 bb) iw) (nth 1 (assoc ps doc-view-paper-sizes)))
+       (/ (* (nth 1 bb) ih) (nth 2 (assoc ps doc-view-paper-sizes)))
+       (/ (* (nth 2 bb) iw) (nth 1 (assoc ps doc-view-paper-sizes)))
+       (/ (* (nth 3 bb) ih) (nth 2 (assoc ps doc-view-paper-sizes)))))
 
 (defun doc-view-set-slice-from-bounding-box (&optional force-paper-size)
   "Set the slice from the document's BoundingBox information.