>From b4a0d5d8b37a5e0164c33346688c7a54fc53b913 Mon Sep 17 00:00:00 2001 From: Markus Klotzbuecher Date: Tue, 21 Aug 2012 08:48:56 +0200 Subject: [PATCH] remove epeg dependency from phoghorn --- release/4/phoghorn/trunk/phoghorn.meta | 2 +- release/4/phoghorn/trunk/phoghorn.scm | 31 ++++++------------------------- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/release/4/phoghorn/trunk/phoghorn.meta b/release/4/phoghorn/trunk/phoghorn.meta index a3432d4..aaba3ea 100644 --- a/release/4/phoghorn/trunk/phoghorn.meta +++ b/release/4/phoghorn/trunk/phoghorn.meta @@ -7,5 +7,5 @@ (category web) (license "BSD") (doc-from-wiki) - (needs spiffy uri-common epeg imlib2 sxml-transforms) + (needs spiffy uri-common imlib2 sxml-transforms sxml-fu) (files "phoghorn.scm" "phoghorn.meta" "phoghorn.release-info" "phoghorn.setup")) diff --git a/release/4/phoghorn/trunk/phoghorn.scm b/release/4/phoghorn/trunk/phoghorn.scm index 957dfb7..c0fae2f 100644 --- a/release/4/phoghorn/trunk/phoghorn.scm +++ b/release/4/phoghorn/trunk/phoghorn.scm @@ -33,14 +33,12 @@ (gallery-dir gallery-var entry-var root-gallery-name max-thumb-dimensions thumb-dir gallery-url zoomed-url movie-image current-gallery current-entry-filename gallery-contents - thumbnail thumbnail/epeg thumbnail/imlib2 - galleries-up-to prev-entry next-entry phoghorn-rules) + thumbnail thumbnail/imlib2 galleries-up-to prev-entry + next-entry phoghorn-rules) (import chicken scheme extras data-structures files posix) (require-extension srfi-1 srfi-13 spiffy intarweb uri-common sxml-transforms) -(require-library epeg) -(import (prefix epeg epeg:)) (require-library imlib2) (import (prefix imlib2 imlib2:)) @@ -56,13 +54,11 @@ ;; #f if you want the filename displayed (define movie-image (make-parameter "/pics/movie.jpg")) -(define epeg-extensions '("jpeg" "jpg")) - ;; This really is dependent on the loaders imlib2 has. Mebbe make it ;; a parameter as well? -(define imlib-extensions '("gif" "bmp" "xpm" "png" "mng" "pbm" "tif" "tiff" - "tga" "pic" "pcx" "dxf" "cgm" "cdr" "wmf" "eps" - "emf" "pict" "yuv")) +(define imlib-extensions '("jpeg" "jpg" "gif" "bmp" "xpm" "png" "mng" "pbm" + "tif" "tiff" "tga" "pic" "pcx" "dxf" "cgm" "cdr" + "wmf" "eps" "emf" "pict" "yuv")) (define movie-extensions '("mpg" "mpeg" "avi" "ogg" "ogm" "vob" "asf" "wma" "wmv" "qt" "mov" "mp4" "vivo" "fli" "flc" "ani" @@ -71,7 +67,7 @@ ;; XXX: use extensions or file magic/mimetypes? (define (allowed-filetype? filename) (any (cut string-ci=? (or (pathname-extension filename) "") <>) - (append epeg-extensions imlib-extensions movie-extensions))) + (append imlib-extensions movie-extensions))) ;; Either the thumbs subdirectory is ok, or it can be created (define (thumbs-ok? dir) @@ -112,8 +108,6 @@ (let* ((ext (pathname-extension entry)) (match? (lambda (s) (string-ci=? ext s)))) (cond - ((any match? epeg-extensions) - (thumbnail/epeg gallery entry)) ((any match? imlib-extensions) (thumbnail/imlib2 gallery entry)) ((any match? movie-extensions) @@ -163,19 +157,6 @@ (define (gallery-thumbs gallery) (make-pathname gallery (thumb-dir))) -(define (thumbnail/epeg gallery entry) - (let ((target-file (local-file (gallery-thumbs gallery) entry))) - (unless (file-exists? target-file) - (let ((img (epeg:image-open (local-file gallery entry)))) - (receive (width height) - (epeg:image-size img) - (epeg:image-size-set! img - (thumb-width width height) - (thumb-height width height)) - (epeg:image-file-output-set! img target-file) - (epeg:image-encode img))))) - (remote-file (gallery-thumbs gallery) entry)) - ;; Imlib doesn't have loaders to save every type it can read, so we have ;; to pick some kind of standardised output format. Png is probably the ;; most suitable one because it is portable and supports alpha channels. -- 1.7.10.4