Mercurial > emacs
comparison lisp/image.el @ 109204:d1f39bab57ad
Merge from mainline.
| author | Katsumi Yamaoka <katsumi@flagship2> |
|---|---|
| date | Wed, 26 May 2010 12:12:13 +0000 |
| parents | 6c819187f088 |
| children | 5883fc00b976 68616bb3ae25 |
comparison
equal
deleted
inserted
replaced
| 109203:bd4b41db940e | 109204:d1f39bab57ad |
|---|---|
| 683 (cond | 683 (cond |
| 684 ((eq (plist-get (cdr image) :type) 'gif) | 684 ((eq (plist-get (cdr image) :type) 'gif) |
| 685 (let* ((metadata (image-metadata image)) | 685 (let* ((metadata (image-metadata image)) |
| 686 (images (plist-get metadata 'count)) | 686 (images (plist-get metadata 'count)) |
| 687 (extdata (plist-get metadata 'extension-data)) | 687 (extdata (plist-get metadata 'extension-data)) |
| 688 (anim (plist-get extdata #xF9))) | 688 (anim (plist-get extdata #xF9)) |
| 689 (and (integerp images) (> images 1) | 689 (tmo (and (integerp images) (> images 1) |
| 690 (stringp anim) (>= (length anim) 4) | 690 (stringp anim) (>= (length anim) 4) |
| 691 (cons images (+ (aref anim 1) (* (aref anim 2) 256)))))))) | 691 (+ (aref anim 1) (* (aref anim 2) 256))))) |
| 692 (when tmo | |
| 693 (if (eq tmo 0) (setq tmo 10)) | |
| 694 (cons images tmo)))))) | |
| 692 | 695 |
| 693 | 696 |
| 694 (provide 'image) | 697 (provide 'image) |
| 695 | 698 |
| 696 ;; arch-tag: 8e76a07b-eb48-4f3e-a7a0-1a7ba9f096b3 | 699 ;; arch-tag: 8e76a07b-eb48-4f3e-a7a0-1a7ba9f096b3 |