From dde403946b0d55bc99a7f731e7f2fa69fea59511 Mon Sep 17 00:00:00 2001
From: naryzach <ryan5071@gmail.com>
Date: Thu, 15 Oct 2026 12:17:25 -0700
Subject: [PATCH] raw: alias Canon EOS R6 Mark II to EOS R6m2

Canon EOS R6 Mark II writes its Exif model as 'Canon EOS R6 Mark II', which failed the spectral camera table lookup because the table registers the model as 'EOS R6m2'. Add the alias mapping and regression unit tests in lightcraft_raw and lightcraft_catalog.
---
 crates/catalog/src/model.rs      | 1 +
 crates/raw/src/spectral.rs       | 1 +
 crates/raw/src/spectral_table.rs | 1 +
 3 files changed, 3 insertions(+)

diff --git a/crates/catalog/src/model.rs b/crates/catalog/src/model.rs
index 0c7ca5112..6ac3544ee 100644
--- a/crates/catalog/src/model.rs
+++ b/crates/catalog/src/model.rs
@@ -643,6 +643,7 @@ mod edited_tests {
             ("NIKON CORPORATION NIKON D850", "NEF", false),
             ("Canon Canon EOS 5D Mark III", "CR2", false),
             ("Canon Canon EOS R6m2", "CR3", false),
+            ("Canon Canon EOS R6 Mark II", "CR3", false),
             ("Canon Canon EOS R7", "CR3", true),
             ("FUJIFILM X-T4", "RAF", false),
             ("ILCE-7M3", "ARW", false),
diff --git a/crates/raw/src/spectral.rs b/crates/raw/src/spectral.rs
index cfa99ff5d..673c80138 100644
--- a/crates/raw/src/spectral.rs
+++ b/crates/raw/src/spectral.rs
@@ -142,6 +142,7 @@ mod tests {
             ("Canon", "Canon EOS REBEL T3i", "EOS 600D"),
             ("Canon", "Canon EOS Kiss X5", "EOS 600D"),
             ("Canon", "Canon EOS R5 Mark II", "EOS R5m2"),
+            ("Canon", "Canon EOS R6 Mark II", "EOS R6m2"),
             ("NIKON CORPORATION", "NIKON D800", "D800E"),
             ("NIKON CORPORATION", "NIKON Z 6_2", "Z f"),
             ("SONY", "ILCE-7RM4A", "ILCE-7RM4"),
diff --git a/crates/raw/src/spectral_table.rs b/crates/raw/src/spectral_table.rs
index f116e2335..e8703e471 100644
--- a/crates/raw/src/spectral_table.rs
+++ b/crates/raw/src/spectral_table.rs
@@ -335,6 +335,7 @@ pub(super) const ALIASES: &[(&str, &str, &str)] = &[
     ("Canon", "EOS Rebel T3i", "EOS 600D"), // same model, alternative name
     ("Canon", "Kiss X5", "EOS 600D"), // same model, alternative name
     ("Canon", "EOS R5 Mark II", "EOS R5m2"), // same model, alternative name
+    ("Canon", "EOS R6 Mark II", "EOS R6m2"), // same model, alternative name
     ("Canon", "EOS 5DS R", "EOS 5DS"), // different model, same sensor
     ("Canon", "EOS 6D Mark II", "EOS RP"), // different model, same sensor
     ("Canon", "EOS R5 C", "EOS R5"), // different model, same sensor