From eb2d99be3daaac5340add148c08d8c514b79b777 Mon Sep 17 00:00:00 2001
From: Jacob Boerema <jgboerema@gmail.com>
Date: Mon, 2 May 2022 17:24:09 -0400
Subject: [PATCH] plug-ins: support loading DDS with two 16-bit channels.

We have some examples of DDS images that have two 16-bit channels that
we could not load.

This commit adds checks to see if we need 16-bit channels, and conversion
of the input to a correct 16-bit red, green, blue or alpha channel.
---
 plug-ins/file-dds/ddsread.c | 65 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 64 insertions(+), 1 deletion(-)

diff --git a/plug-ins/file-dds/ddsread.c b/plug-ins/file-dds/ddsread.c
index a57e57bdda..cac62abb3e 100644
--- a/plug-ins/file-dds/ddsread.c
+++ b/plug-ins/file-dds/ddsread.c
@@ -319,6 +319,19 @@ read_dds (GFile          *file,
               type = GIMP_RGB;
               d.gimp_bpp = 3;
             }
+          else if (d.bpp == 4)
+            {
+              type = GIMP_RGB;
+              if (d.rbits > 8 || d.gbits > 8 || d.bbits > 8 || d.abits > 8)
+                {
+                  d.gimp_bps = 2;
+                  d.gimp_bpp = 8;
+                }
+              else
+                {
+                  d.gimp_bpp = d.bpp;
+                }
+            }
           else
             {
               /* test alpha only image */
@@ -782,6 +795,7 @@ validate_header (dds_header_t  *hdr,
             case 16:
             case 24:
             case 32:
+            case 64:
               hdr->pixelfmt.flags |= DDPF_RGB;
               break;
             default:
@@ -1058,7 +1072,16 @@ load_layer (FILE             *fp,
         }
       break;
     case 3: type = GIMP_RGB_IMAGE;  bablfmt = babl_format ("R'G'B' u8");  break;
-    case 4: type = GIMP_RGBA_IMAGE; bablfmt = babl_format ("R'G'B'A u8"); break;
+    case 4:
+    case 8:
+      {
+        type = GIMP_RGBA_IMAGE;
+        if (d->gimp_bps == 1)
+          bablfmt = babl_format ("R'G'B'A u8");
+        else if (d->gimp_bps == 2)
+          bablfmt = babl_format ("R'G'B'A u16");
+      }
+      break;
     }
 
   layer_name = (level) ? g_strdup_printf ("mipmap %d %s", level, prefix) :
@@ -1192,6 +1215,46 @@ load_layer (FILE             *fp,
                             pixels[pos + 3] = 255;
                         }
                     }
+                  else if (d->bpp == 4)
+                    {
+                      if (d->gimp_bps == 2)
+                        {
+                          guint16 *pixels16 = (guint16 *) &pixels[pos];
+
+                          if (d->rbits == 16) /* red */
+                            {
+                              pixels16[0] = (guint16) (pixel >> d->rshift & d->rmask);
+                            }
+                          else
+                            {
+                              pixels16[0] = 0;
+                            }
+                          if (d->gbits == 16) /* green */
+                            {
+                              pixels16[1] = (guint16) (pixel >> d->gshift & d->gmask);
+                            }
+                          else
+                            {
+                              pixels16[1] = 0;
+                            }
+                          if (d->bbits == 16) /* blue */
+                            {
+                              pixels16[2] = (guint16) (pixel >> d->bshift & d->bmask);
+                            }
+                          else
+                            {
+                              pixels16[2] = 0;
+                            }
+                          if (d->abits == 16) /* alpha */
+                            {
+                              pixels16[3] = (guint16) (pixel >> d->ashift & d->amask);
+                            }
+                          else
+                            {
+                              pixels16[3] = 0xffff;
+                            }
+                        }
+                    }
                 }
               else if (d->bpp == 2)
                 {