projects
/
elisp
/
album.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(exif-image-file-date-time-original): New implementation for
[elisp/album.git]
/
www-page.el
diff --git
a/www-page.el
b/www-page.el
index
2c50727
..
0b29a41
100644
(file)
--- a/
www-page.el
+++ b/
www-page.el
@@
-468,6
+468,8
@@
Powered by MnjAlbum WWW-Page Version %s." www-page-version))
))
(defun www-page-display-image (file &optional size image-root pivot-mode)
))
(defun www-page-display-image (file &optional size image-root pivot-mode)
+ (if (stringp pivot-mode)
+ (setq pivot-mode (intern pivot-mode)))
(setq file (expand-file-name file image-root))
(when (file-exists-p file)
(let (file-dir file-name
(setq file (expand-file-name file image-root))
(when (file-exists-p file)
(let (file-dir file-name
@@
-484,7
+486,7
@@
Powered by MnjAlbum WWW-Page Version %s." www-page-version))
(setq file-dir (file-name-directory file)
file-name (file-name-nondirectory file))
(setq size-opt
(setq file-dir (file-name-directory file)
file-name (file-name-nondirectory file))
(setq size-opt
- (or (when (and pivot-mode
+ (or (when (and (eq pivot-mode t)
(> width height))
(with-temp-buffer
(call-process "identify" nil t nil file)
(> width height))
(with-temp-buffer
(call-process "identify" nil t nil file)
@@
-581,7
+583,8
@@
Powered by MnjAlbum WWW-Page Version %s." www-page-version))
(null (file-name-extension target)))
'dir)))
;; (setq file (car (cdr (assoc "file" params))))
(null (file-name-extension target)))
'dir)))
;; (setq file (car (cdr (assoc "file" params))))
- (setq size (car (cdr (assoc "size" params))))
+ (setq size (or (car (cdr (assoc "size" params)))
+ 'VGA))
(setq pivot-mode t)
(if (setq ret (cdr (assoc "p" params)))
(setq pivot-mode (car ret)))
(setq pivot-mode t)
(if (setq ret (cdr (assoc "p" params)))
(setq pivot-mode (car ret)))