comparison lisp/thumbs.el @ 91302:56a72e2bd635

Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-306
author Miles Bader <miles@gnu.org>
date Sat, 29 Dec 2007 02:39:17 +0000
parents f55f9811f5d7 350032476821
children c938ab6810a4
comparison
equal deleted inserted replaced
91301:7774e5860c70 91302:56a72e2bd635
246 Optional arguments are: 246 Optional arguments are:
247 ARG any arguments to the ACTION command, 247 ARG any arguments to the ACTION command,
248 OUTPUT-FORMAT is the file format to output (default is jpeg), 248 OUTPUT-FORMAT is the file format to output (default is jpeg),
249 ACTION-PREFIX is the symbol to place before the ACTION command 249 ACTION-PREFIX is the symbol to place before the ACTION command
250 (defaults to '-' but can sometimes be '+')." 250 (defaults to '-' but can sometimes be '+')."
251 (let ((command (format "%s %s%s %s \"%s\" \"%s:%s\"" 251 (call-process thumbs-conversion-program nil nil nil
252 thumbs-conversion-program 252 (or action-prefix "-")
253 (or action-prefix "-") 253 action
254 action 254 (or arg "")
255 (or arg "") 255 filein
256 filein 256 (format "%s:%s" (or output-format "jpeg") fileout)))
257 (or output-format "jpeg")
258 fileout)))
259 (call-process shell-file-name nil nil nil shell-command-switch command)))
260 257
261 (defun thumbs-new-image-size (s increment) 258 (defun thumbs-new-image-size (s increment)
262 "New image (a cons of width x height)." 259 "New image (a cons of width x height)."
263 (let ((d (* increment thumbs-image-resizing-step))) 260 (let ((d (* increment thumbs-image-resizing-step)))
264 (cons 261 (cons