Index: exif.class.php
===================================================================
RCS file: /cvs/drupal/contributions/modules/exif/Attic/exif.class.php,v
retrieving revision 1.1.2.18
diff -u -p -r1.1.2.18 exif.class.php
--- exif.class.php	8 Oct 2010 17:47:16 -0000	1.1.2.18
+++ exif.class.php	2 Feb 2011 18:17:34 -0000
@@ -77,13 +77,18 @@ Class Exif {
     foreach ($arTagNames as $tagName) {
       if ($tagName['section'] != 'iptc') {
         if (!empty($arSmallExif[$tagName['tag']])) {
-          $info[$tagName['section'] .'_'. $tagName['tag']] = utf8_encode($arSmallExif[$tagName['tag']]);
+          $info[$tagName['section'] .'_'. $tagName['tag']] = $arSmallExif[$tagName['tag']];
         } 
         elseif (!empty($arSmallExif[$tagName['section']][$tagName['tag']])) {
-          $info[$tagName['section'] .'_'. $tagName['tag']] = utf8_encode($arSmallExif[$tagName['section']][$tagName['tag']]);
+          $info[$tagName['section'] .'_'. $tagName['tag']] = $arSmallExif[$tagName['section']][$tagName['tag']];
         }
       }
     }
+    foreach ($info as $tag => $value) {
+      if (!is_array($value)) {
+        $info[$tag] = utf8_encode($value);
+      }
+    }
     
     return $info;
   }