Changeset 4972 for extensions/AMetaData/JpegMetaData/Common/ConvertData.class.php

Timestamp:

Feb 27, 2010, 12:44:30 AM (14 years ago)

Author:

grum

Message:

Canon camera's maker note implementation + extended Xmp segments managed

File:

• extensions/AMetaData/JpegMetaData/Common/ConvertData.class.php (modified) (2 diffs)

extensions/AMetaData/JpegMetaData/Common/ConvertData.class.php

@@ -346 +346 @@
      * or
      * Convert multiples null terminated string into an array of string
+     *    ==> if strings are null (eq. "\x00") nothing is added to the array
      *
      * Example:
@@ -365 +366 @@
         return("");
       }
-      elseif($occurs==1)
-      {
-        return($result[1][0]);
-      }
-      else
-      {
-        return($result[1]);
+      else
+      {
+        $returned=Array();
+        foreach($result[1] as $pop)
+        {
+          if($pop!="")
+          {
+            $returned[]=$pop;
+          }
+        }
+        if(count($returned)==1)
+        {
+          return($returned[0]);
+        }
+        elseif(count($returned)==0)
+        {
+          return("");
+        }
+        else
+        {
+          return($returned);
+        }
       }
     }