[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#24317: 25.1.50; image-dired-rotate-original: regexp doesn't match .j

From: Tino Calancha
Subject: bug#24317: 25.1.50; image-dired-rotate-original: regexp doesn't match .jpeg suffix
Date: Sun, 28 Aug 2016 21:26:23 +0900 (JST)
User-agent: Alpine 2.20 (DEB 67 2015-01-07)

On Sat, 27 Aug 2016, Eli Zaretskii wrote:

I think we should indeed use image-type instead of having yet another
function that recognizes JPEG.  The problem I pointed out should be
fixed in image-type-from-file-name, regardless.
I see.  I have prepared following new patch:

From b953d600a295e4e0aa58b85126296663e7f02472 Mon Sep 17 00:00:00 2001
From: Tino Calancha <address@hidden>
Date: Sun, 28 Aug 2016 21:20:22 +0900
Subject: [PATCH] image-type-from-file-name: Perform a case insensitive match

Fix Bug#24317
* lisp/image.el (image-type-from-file-name): Bind case-fold-search
to a non-nil value to force a case insensitive match.
* lisp/image-dired.el (image-dired-rotate-original):
Use image-type (Bug#24317).
(image-dired-get-exif-file-name): Idem.
Set 'no-exif-data-found' and 'data' in same setq call.
Use file-attribute-modification-time.
 lisp/image-dired.el | 19 +++++++++----------
 lisp/image.el       |  2 +-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/lisp/image-dired.el b/lisp/image-dired.el
index 67b023d..34e4eae 100644
--- a/lisp/image-dired.el
+++ b/lisp/image-dired.el
@@ -1912,8 +1912,8 @@ image-dired-rotate-original
       (message "No image at point")
     (let ((file (image-dired-original-file-name))
-      (if (not (string-match "\\.[jJ][pP[eE]?[gG]$" file))
-          (error "Only JPEG images can be rotated!"))
+      (unless (eq 'jpeg (image-type file))
+        (error "Only JPEG images can be rotated!"))
       (setq command (format-spec
@@ -1952,15 +1952,14 @@ image-dired-get-exif-file-name
   (let (data no-exif-data-found)
- (if (not (string-match "\\.[Jj][Pp][Ee]?[Gg]$" (expand-file-name file)))
-        (progn
-          (setq no-exif-data-found t)
-          (setq data
-                (format-time-string
-                 "%Y:%m:%d %H:%M:%S"
-                 (nth 5 (file-attributes (expand-file-name file))))))
+    (if (not (eq 'jpeg (image-type (expand-file-name file))))
+        (setq no-exif-data-found t
+              data (format-time-string
+                    "%Y:%m:%d %H:%M:%S"
+                    (file-attribute-modification-time
+                     (file-attributes (expand-file-name file)))))
       (setq data (image-dired-get-exif-data (expand-file-name file)
-                                     "DateTimeOriginal")))
+                                            "DateTimeOriginal")))
     (while (string-match "[ :]" data)
       (setq data (replace-match "_" nil nil data)))
     (format "%s%s%s" data
diff --git a/lisp/image.el b/lisp/image.el
index 272cee5..d1cdc44 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -343,7 +343,7 @@ image-type-from-file-name
   "Determine the type of image file FILE from its name.
 Value is a symbol specifying the image type, or nil if type cannot
 be determined."
-  (let (type first)
+  (let (type first (case-fold-search t))
     (catch 'found
       (dolist (elem image-type-file-name-regexps first)
        (when (string-match-p (car elem) file)


In GNU Emacs (x86_64-pc-linux-gnu, GTK+ Version 3.20.9)
 of 2016-08-27
Repository revision: 7fcce24e75b8281621a0b8816dc58cbdc05fdc91

reply via email to

[Prev in Thread] Current Thread [Next in Thread]