fixed.

[elisp/album.git] / www-page.el

diff --git a/www-page.el b/www-page.el
index 2c50727..30fe875 100644 (file)
--- a/www-page.el
+++ b/www-page.el
@@ -1,6 +1,6 @@
 ;;; www-page.el --- Album page generator for page.cgi.
 
-;; Copyright (C) 2005,2006,2007 MORIOKA Tomohiko
+;; Copyright (C) 2005,2006,2007,2009,2010 MORIOKA Tomohiko
 
 ;; Keywords: Photo, image, album, HTML, WWW
 
@@ -27,7 +27,7 @@
 
 ;;; Code:
 
-(defconst www-page-version "0.4")
+(defconst www-page-version "0.5")
 
 (defvar www-page-coding-system
   (if (featurep 'chise)
@@ -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)
+  (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
@@ -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
-             (or (when (and pivot-mode
+             (or (when (and (eq pivot-mode t)
                             (> 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))))
-    (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)))