exif is faster and more reliable

diff --git a/INSTALL b/INSTALL
index 56c28ed320569c07bbdd48fbc0b58f9cab58b986..361c85260b45ce488e3834d8c42f3a564dca39e6 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -20,6 +20,7 @@ And for runtime:
 For runtime, not strictly needed but nice to have:
 
 - transcode and mencoder (not strictly needed if you won't manipulate any video)
 For runtime, not strictly needed but nice to have:
 
 - transcode and mencoder (not strictly needed if you won't manipulate any video)

+- exif (to be able to show all EXIF data of a picture)

 
 
         Compiling and Installing Quick Start
 
 
         Compiling and Installing Quick Start

diff --git a/bin/booh b/bin/booh
index 26be6d96cb3a774c7ffd63bd97abe3f77e32682d..4cd0b3493cfa215944b7f250b309bae092293353 100755 (executable)
--- a/bin/booh
+++ b/bin/booh
@@ -857,7 +857,7 @@ def popup_thumbnail_menu(event, optionals, fullpath, type, xmldir, attributes_pr
             menu.append(exif = Gtk::ImageMenuItem.new(utf8(_("View EXIF data"))))
             exif.image = Gtk::Image.new("#{$FPATH}/images/stock-list-16.png")
             exif.signal_connect('activate') { show_popup($main_window,
             menu.append(exif = Gtk::ImageMenuItem.new(utf8(_("View EXIF data"))))
             exif.image = Gtk::Image.new("#{$FPATH}/images/stock-list-16.png")
             exif.signal_connect('activate') { show_popup($main_window,

-                                                         utf8(`identify -format "%[EXIF:*]" #{fullpath}`.sub(/MakerNote.*\n/, '')),
+                                                         utf8(`exif -m #{fullpath}`),

                                                          { :title => utf8(_("EXIF data of %s") % File.basename(fullpath)), :nomarkup => true, :scrolled => true }) }
             menu.append(Gtk::SeparatorMenuItem.new)
         end
                                                          { :title => utf8(_("EXIF data of %s") % File.basename(fullpath)), :nomarkup => true, :scrolled => true }) }
             menu.append(Gtk::SeparatorMenuItem.new)
         end