Skip to content

Commit 62c418c

Browse files
committed
Deprecate duplicate tag definition
1 parent f3f02b9 commit 62c418c

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

MetadataExtractor/Formats/Exif/ExifDirectoryBase.cs

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
22

3+
using System;
34
using System.Collections.Generic;
45
using System.Diagnostics.CodeAnalysis;
56

@@ -253,10 +254,17 @@ public abstract class ExifDirectoryBase : Directory
253254

254255
public const int TagInterlace = 0x8829;
255256

257+
[Obsolete("Use TagTimeZoneOffset instead.")]
256258
public const int TagTimeZoneOffsetTiffEp = 0x882A;
257259

260+
[Obsolete("Use TagSelfTimerMode instead.")]
258261
public const int TagSelfTimerModeTiffEp = 0x882B;
259262

263+
/// <summary>Non-standard, but in use.</summary>
264+
public const int TagTimeZoneOffset = 0x882A;
265+
266+
public const int TagSelfTimerMode = 0x882B;
267+
260268
/// <summary>Applies to ISO tag.</summary>
261269
/// <remarks>
262270
/// 0 = Unknown
@@ -274,11 +282,6 @@ public abstract class ExifDirectoryBase : Directory
274282

275283
public const int TagRecommendedExposureIndex = 0x8832;
276284

277-
/// <summary>Non-standard, but in use.</summary>
278-
public const int TagTimeZoneOffset = 0x882A;
279-
280-
public const int TagSelfTimerMode = 0x882B;
281-
282285
public const int TagExifVersion = 0x9000;
283286

284287
public const int TagDateTimeOriginal = 0x9003;
@@ -813,13 +816,11 @@ protected static void AddExifTagNames(Dictionary<int, string> map)
813816
map[TagIsoEquivalent] = "ISO Speed Ratings";
814817
map[TagOptoElectricConversionFunction] = "Opto-electric Conversion Function (OECF)";
815818
map[TagInterlace] = "Interlace";
816-
map[TagTimeZoneOffsetTiffEp] = "Time Zone Offset";
817-
map[TagSelfTimerModeTiffEp] = "Self Timer Mode";
819+
map[TagTimeZoneOffset] = "Time Zone Offset";
820+
map[TagSelfTimerMode] = "Self Timer Mode";
818821
map[TagSensitivityType] = "Sensitivity Type";
819822
map[TagStandardOutputSensitivity] = "Standard Output Sensitivity";
820823
map[TagRecommendedExposureIndex] = "Recommended Exposure Index";
821-
map[TagTimeZoneOffset] = "Time Zone Offset";
822-
map[TagSelfTimerMode] = "Self Timer Mode";
823824
map[TagExifVersion] = "Exif Version";
824825
map[TagDateTimeOriginal] = "Date/Time Original";
825826
map[TagDateTimeDigitized] = "Date/Time Digitized";

0 commit comments

Comments
 (0)