--- a/libinterp/dldfcn/__tiff__.cc	Sun Jul 24 22:24:10 2022 +0200
+++ b/libinterp/dldfcn/__tiff__.cc	Mon Jul 25 04:15:18 2022 +0200
@@ -46,9 +46,11 @@
                                    &bits_per_sample))
         error ("Failed to read the BitsPerSample tag");
       
-      if (! TIFFGetFieldDefaulted (tif, TIFFTAG_PLANARCONFIG,
-                                   &planar_configuration))
-        error ("Failed to read the PlanarConfiguration tag");
+      if (! TIFFGetField (tif, TIFFTAG_PLANARCONFIG,
+                          &planar_configuration))
+        // LibTIFF has a bug where it incorrectly returns 0 as a default
+        // value for PlanarConfiguration although the default value is 1
+        planar_configuration = 1;
       
       is_tiled = TIFFIsTiled(tif);
     }
@@ -651,7 +653,16 @@
     int type_size = TIFFDataWidth (TIFFFieldDataType (fip));
     
     void *data = _TIFFmalloc (type_size);
-    validate_tiff_get_field (TIFFGetFieldDefaulted (tif, tag_id, data), data);
+    if (tag_id == TIFFTAG_PLANARCONFIG)
+      {
+        // Workaround for a bug in LibTIFF where it incorrectly returns
+        // zero as the default value for PlanaConfiguration
+        if (! TIFFGetField(tif, tag_id, data))
+          *reinterpret_cast<uint16_t *> (data) = 1;
+      }
+    else
+      validate_tiff_get_field (TIFFGetFieldDefaulted (tif, tag_id, data), data);
+    
     octave_value tag_data_ov = interpret_tag_data (data, 1,
                                                    TIFFFieldDataType (fip));
     _TIFFfree (data);
@@ -1216,14 +1227,17 @@
     switch (image_data.bits_per_sample)
       {
       case 1:
-        if (type_name == "bool matrix")
+        // Substrings are taken to support both the type and its matrix type
+        // i.e. "bool" and "bool matrix" to handle single element matrices
+        if (type_name.substr (0, 4) == "bool")
           write_strip<boolNDArray> (tif, strip_no, args(2), &image_data);
         else
           error ("Expected logical matrix for BiLevel image");
         break;
       case 4:
       case 8:
-        if (type_name == "uint8 matrix" || type_name == "int8 matrix")
+        if (type_name.substr (0, 5) == "uint8"
+            || type_name.substr (0, 4) == "int8")
           write_strip<uint8NDArray> (tif, strip_no, args(2), &image_data);
         else
           error ("Only uint8 and int8 data are allowed for images with bit depth of 8");
@@ -1232,31 +1246,36 @@
         // Type conversion from signed to unsigned is handled in the function
         // TODO(maged): what is the behavior if the input matrix has
         // negative numbers?
-        if (type_name == "uint16 matrix" || type_name == "int16 matrix")
+        if (type_name.substr (0, 6) == "uint16"
+            || type_name.substr (0, 5) == "int16")
           write_strip<uint16NDArray> (tif, strip_no, args(2), &image_data);
         else
           error ("Only uint16 and int16 data are allowed for images with bit depth of 16");
         break;
       case 32:
-        if (sample_format == 3)  
-          if (type_name == "float matrix" || type_name == "matrix")
+        if (sample_format == 3)
+          if (type_name.substr (0, 5) == "float" || type_name == "double"
+              || type_name == "matrix")
             write_strip<FloatNDArray> (tif, strip_no, args(2), &image_data);
           else
             error ("Only single and double data are allowed for floating-point images");
         else
-          if (type_name == "uint32 matrix" || type_name == "int32 matrix")
+          if (type_name.substr (0, 6) == "uint32"
+              || type_name.substr (0, 5) == "int32")
             write_strip<uint32NDArray> (tif, strip_no, args(2), &image_data);
           else
             error ("Only uint32 and int32 data are allowed for images with bit depth of 32");
         break;
       case 64:
-        if (sample_format == 3)          
-          if (type_name == "float matrix" || type_name == "matrix")
+        if (sample_format == 3)
+          if (type_name.substr (0, 5) == "float" || type_name == "double"
+              || type_name == "matrix")
             write_strip<NDArray> (tif, strip_no, args(2), &image_data);
           else
             error ("Only single and double data are allowed for floating-point images");
         else  
-          if (type_name == "uint64 matrix" || type_name == "int64 matrix")
+          if (type_name.substr (0, 6) == "uint64"
+              || type_name.substr (0, 5) == "int64")
             write_strip<uint64NDArray> (tif, strip_no, args(2), &image_data);
           else
             error ("Only uint64 and int64 data are allowed for images with bit depth of 64");