Merge pull request #228 from jim-easterbrook/devel

Devel

CHANGELOG.txt

@@ -1,6 +1,6 @@
 Photini - a simple photo metadata editor.
 http://github.com/jim-easterbrook/Photini
-Copyright (C) 2012-23  Jim Easterbrook  [email protected]
+Copyright (C) 2012-24  Jim Easterbrook  [email protected]
 
 This program is free software: you can redistribute it and/or
 modify it under the terms of the GNU General Public License as
@@ -16,6 +16,11 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see
 <http://www.gnu.org/licenses/>.
 
+Changes in v2024.2.0:
+  1/ Improved lens model recognition.
+  2/ Fix hangup in Bing map.
+  3/ Other minor improvements and bug fixes.
+
 Changes in v2023.10.0:
   1/ Fix segfaults with some TIF files and some Qt versions. (#211)
   2/ Fix missing _version file when using run_photini.py. (#210)

src/photini/exiv2.py

@@ -417,7 +417,10 @@ def get_exif_value(self, tag):
                    'Exif.Sony1.LensID', 'Exif.Sony1.SonyModelID',
                    'Exif.Sony2.LensID', 'Exif.Sony2.SonyModelID'):
             # use Exiv2's "interpreted string"
-            return datum._print(self._exifData)
+            if exiv2.__version_tuple__ >= (0, 16, 2):
+                return datum.print(self._exifData)
+            else:
+                return datum._print(self._exifData)
         value = datum.value()
         if tag in ('Exif.Photo.UserComment',
                    'Exif.GPSInfo.GPSProcessingMethod'):

src/photini/types.py

@@ -1,6 +1,6 @@
 ##  Photini - a simple photo metadata editor.
 ##  http://github.com/jim-easterbrook/Photini
-##  Copyright (C) 2022-23  Jim Easterbrook  [email protected]
+##  Copyright (C) 2022-24  Jim Easterbrook  [email protected]
 ##
 ##  This program is free software: you can redistribute it and/or
 ##  modify it under the terms of the GNU General Public License as
@@ -1378,7 +1378,10 @@ def contains(self, this, other):
         return abs(float(other) - float(this)) < 0.0000005
 
     def compact_form(self):
-        return round(float(self), 6)
+        return float(self)
+
+    def __float__(self):
+        return round(super(MD_Coordinate, self).__float__(), 6)
 
     def __str__(self):
         return '{:.6f}'.format(float(self))