Merge origin/main - resolve conflicts

Resolved conflicts:
- api_integration_test.go: kept UserComment type as string (Bug #19 fix),
  accepted Canon ExactTagCount: -1 from main
- tiff.go: accepted fujifilm registration from main alongside canon

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: rpuneet

api_integration_test.go

@@ -282,8 +282,8 @@ func TestIntegration_CR2(t *testing.T) {
 				{Name: "MeteringMode", Value: "Multi-segment"},
 				{Name: "Flash", Value: "Off, Did not fire"},
 				{Name: "FocalLength", Value: "85/1"},
-				// MakerNote is now parsed into Canon directory (see below)
-				{Name: "UserComment", Type: "string"}, // Decoded comment text
+				// MakerNote is now parsed into Canon directory
+				{Name: "UserComment", Type: "string"}, // Decoded comment text (Bug #19 fix)
 				{Name: "FlashpixVersion", Value: "0100"},
 				{Name: "ColorSpace", Value: "sRGB"},
 				{Name: "PixelXDimension", Value: uint16(4992)},
@@ -306,40 +306,8 @@ func TestIntegration_CR2(t *testing.T) {
 			},
 		},
 		{
-			Name:          "Canon", // MakerNote parsed into manufacturer directory
-			ExactTagCount: 28,      // All Canon MakerNote tags
-			Tags: []imxtest.TagExpectation{
-				// Check key tags with exact values
-				{Name: "ImageType", Value: "Canon EOS-1Ds Mark II"},
-				{Name: "FirmwareVersion", Value: "Firmware Version 1.0.2"},
-				{Name: "SerialNumber", Value: uint32(304421)},
-				// All other Canon tags (presence check only)
-				{Name: "CameraSettings"},
-				{Name: "FocalLength"},
-				{Name: "FlashInfo"},
-				{Name: "ShotInfo"},
-				{Name: "OwnerName"},
-				{Name: "CameraInfo"},
-				{Name: "CustomFunctions"},
-				{Name: "ModelID"},
-				{Name: "AFInfo"},
-				{Name: "ThumbnailImageValidArea"},
-				{Name: "SerialNumberFormat"},
-				{Name: "0x0019"},
-				{Name: "OriginalDecisionDataOffset"},
-				{Name: "PersonalFunctions"},
-				{Name: "PersonalFunctionValues"},
-				{Name: "CanonFileInfo"},
-				{Name: "AFPointsInFocus1D"},
-				{Name: "ProcessingInfo"},
-				{Name: "MeasuredColor"},
-				{Name: "SensorInfo"},
-				{Name: "VRDOffset"},
-				{Name: "ColorData"},
-				{Name: "CRWParam"},
-				{Name: "ColorInfo"},
-				{Name: "0x4004"},
-			},
+			Name:          "Canon",
+			ExactTagCount: -1, // Presence check only - Canon MakerNote content varies by camera model
 		},
 	})
 	if result.Failed() {