From c5967cb4e40c50ef480ca64cc40911510c2349ee Mon Sep 17 00:00:00 2001
From: Lawrence Lee <45837045+Lawrence37@users.noreply.github.com>
Date: Thu, 21 Mar 2024 21:45:35 -0700
Subject: [PATCH] Add initial support for OM TG-7

Read CFA pattern for OM Digital Solutions cameras.
Use Olympus TG-6 camconst for the TG-7, since the dcraw matrix and raw
crop are the same.
---
 rtengine/camconst.json | 2 +-
 rtengine/dcraw.cc      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rtengine/camconst.json b/rtengine/camconst.json
index f834acdbd..ce7eabe71 100644
--- a/rtengine/camconst.json
+++ b/rtengine/camconst.json
@@ -2206,7 +2206,7 @@ Camera constants:
     },
 
     { // Quality B
-        "make_model": "OLYMPUS TG-6",
+        "make_model": [ "OLYMPUS TG-6", "OM Digital Solutions TG-7" ],
         "dcraw_matrix" : [10899, -3833, -1082, -2112, 10736, 1575, -267, 1452, 5269], // DNG v13.2
         "raw_crop": [ 0, 0, -24, 0 ] // 24 pixels at right are garbage
     },
diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc
index 65343e906..621473589 100644
--- a/rtengine/dcraw.cc
+++ b/rtengine/dcraw.cc
@@ -10434,7 +10434,7 @@ konica_400z:
     filters = 0x16161616;
     load_raw = &CLASS packed_load_raw;
     load_flags = 30;
-  } else if (!strcmp(make,"Olympus")) {
+  } else if (!strcmp(make,"Olympus") || !strncmp(make, "OM Digi", 7)) {
     height += height & 1;
     if (exif_cfa) filters = exif_cfa;
     if (width == 4100) width -= 4;