Mercurial > hg > mgallery

changeset 304:da150fe627b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Collect dimension/size (width/height) information of thumbnail and medium images into the cache.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 03 Apr 2020 16:24:06 +0300
parents 6bb434968623
children b816e80bc002
files mgtool.php
diffstat 1 files changed, 28 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mgtool.php	Fri Apr 03 16:22:51 2020 +0300
+++ b/mgtool.php	Fri Apr 03 16:24:06 2020 +0300
@@ -977,12 +977,35 @@
         }
 
         // Check for EXIF info
-        if (($updFlags & GUPD_EXIF_INFO) &&
-            ($exif = @exif_read_data($efilename)) !== FALSE)
+        if ($updFlags & GUPD_EXIF_INFO)
         {
-          echo "%";
-          foreach ($galExifConversions as $conv)
-            mgCopyEntryData($edata, $exif, $conv[GEC_TYPE], $conv[GEC_NAME], $conv[GEC_FIELDS]);
+          if (($exif = @exif_read_data($efilename)) !== FALSE)
+          {
+            echo "%";
+            foreach ($galExifConversions as $conv)
+              mgCopyEntryData($edata, $exif, $conv[GEC_TYPE], $conv[GEC_NAME], $conv[GEC_FIELDS]);
+          }
+
+          // Get width/height information for thumbnails and mediums
+          $edata["med"] = [];
+          if (($info = getimagesize($medFilename)) !== FALSE && count($info) >= 2)
+          {
+            $edata["med"]["width"] = $info[0];
+            $edata["med"]["height"] = $info[1];
+            echo "+";
+          }
+          else
+            echo "-";
+
+          $edata["tn"] = [];
+          if (($info = @getimagesize($tnFilename)) !== FALSE && count($info) > 0)
+          {
+            $edata["tn"]["width"] = $info[0];
+            $edata["tn"]["height"] = $info[1];
+            echo "+";
+          }
+          else
+            echo "-";
         }
         else
         {