GridUI: fix exif data parser

ArduPilot · Jun 26, 2023 · 0e83990 · 0e83990
1 parent 74eb729
commit 0e83990
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/Grid/GridUI.cs b/Grid/GridUI.cs
@@ -20,6 +20,7 @@
 using System.Text;
 using System.Windows.Forms;
 using System.Xml;
+using com.drew.metadata.jpeg;
 using GeoAPI.CoordinateSystems;
 using GeoAPI.CoordinateSystems.Transformations;
 using MissionPlanner.Controls;
@@ -1502,16 +1503,26 @@ private void BUT_samplephoto_Click(object sender, EventArgs e)
                             Console.WriteLine(lcDirectory.GetName() + " - " + tag.GetTagName() + " " + tag.GetTagValue().ToString());
                         }
 
-                        if (lcDirectory.ContainsTag(ExifDirectory.TAG_EXIF_IMAGE_HEIGHT))
+                        if (lcDirectory is ExifDirectory && lcDirectory.ContainsTag(ExifDirectory.TAG_EXIF_IMAGE_HEIGHT))
                         {
                             TXT_imgheight.Text = lcDirectory.GetInt(ExifDirectory.TAG_EXIF_IMAGE_HEIGHT).ToString();
                         }
 
-                        if (lcDirectory.ContainsTag(ExifDirectory.TAG_EXIF_IMAGE_WIDTH))
+                        if (lcDirectory is ExifDirectory && lcDirectory.ContainsTag(ExifDirectory.TAG_EXIF_IMAGE_WIDTH))
                         {
                             TXT_imgwidth.Text = lcDirectory.GetInt(ExifDirectory.TAG_EXIF_IMAGE_WIDTH).ToString();
                         }
 
+                        if (lcDirectory is JpegDirectory && lcDirectory.ContainsTag(JpegDirectory.TAG_JPEG_IMAGE_HEIGHT))
+                        {
+                            TXT_imgheight.Text = lcDirectory.GetInt(JpegDirectory.TAG_JPEG_IMAGE_HEIGHT).ToString();
+                        }
+
+                        if (lcDirectory is JpegDirectory && lcDirectory.ContainsTag(JpegDirectory.TAG_JPEG_IMAGE_WIDTH))
+                        {
+                            TXT_imgwidth.Text = lcDirectory.GetInt(JpegDirectory.TAG_JPEG_IMAGE_WIDTH).ToString();
+                        }
+
                         if (lcDirectory.ContainsTag(ExifDirectory.TAG_FOCAL_PLANE_X_RES))
                         {
                             var unit = lcDirectory.GetFloat(ExifDirectory.TAG_FOCAL_PLANE_UNIT);