convert const TagInfo returns to constexpr

Signed-off-by: Rosen Penev <[email protected]>

Author: neheb

src/canonmn_int.cpp

@@ -681,10 +681,6 @@ constexpr TagInfo CanonMakerNote::tagInfo_[] = {
      IfdId::canonId, SectionId::makerTags, asciiString, -1, printValue},
 };
 
-const TagInfo* CanonMakerNote::tagList() {
-  return tagInfo_;
-}
-
 // Canon Movie Info Tag
 constexpr TagInfo CanonMakerNote::tagInfoMv_[] = {
     {0x0001, "FrameRate", N_("FrameRate"), N_("FrameRate"), IfdId::canonMvId, SectionId::makerTags, unsignedShort, -1,
@@ -707,10 +703,6 @@ constexpr TagInfo CanonMakerNote::tagInfoMv_[] = {
      -1, printValue},
 };
 
-const TagInfo* CanonMakerNote::tagListMv() {
-  return tagInfoMv_;
-}
-
 // MyColors, tag 0x001d
 constexpr TagDetails canonMyColors[] = {
     {0, N_("Off")},        {1, N_("Positive Film")}, {2, N_("Light Skin Tone")}, {3, N_("Dark Skin Tone")},
@@ -725,10 +717,6 @@ constexpr TagInfo CanonMakerNote::tagInfoMc_[] = {
      unsignedShort, -1, EXV_PRINT_TAG(canonMyColors)},
 };
 
-const TagInfo* CanonMakerNote::tagListMc() {
-  return tagInfoMc_;
-}
-
 // Canon FaceDetect 1 Info Tag
 constexpr TagInfo CanonMakerNote::tagInfoFcd1_[] = {
     {0x0002, "FacesDetected", N_("Faces Detected"), N_("Faces Detected"), IfdId::canonFcd1Id, SectionId::makerTags,
@@ -755,10 +743,6 @@ constexpr TagInfo CanonMakerNote::tagInfoFcd1_[] = {
      signedShort, -1, printValue},
 };
 
-const TagInfo* CanonMakerNote::tagListFcd1() {
-  return tagInfoFcd1_;
-}
-
 // Canon FaceDetect 2 Info Tag
 constexpr TagInfo CanonMakerNote::tagInfoFcd2_[] = {
     {0x0001, "FaceWidth", N_("Face Width"), N_("Faces Width"), IfdId::canonFcd2Id, SectionId::makerTags, unsignedByte,
@@ -767,10 +751,6 @@ constexpr TagInfo CanonMakerNote::tagInfoFcd2_[] = {
      unsignedByte, -1, printValue},
 };
 
-const TagInfo* CanonMakerNote::tagListFcd2() {
-  return tagInfoFcd2_;
-}
-
 // Canon ContrastInfo, tag 0x001d
 constexpr TagDetails canonContrastInfo[] = {
     {0x0, N_("Off")},
@@ -784,10 +764,6 @@ constexpr TagInfo CanonMakerNote::tagInfoCo_[] = {
      SectionId::makerTags, unsignedShort, -1, EXV_PRINT_TAG(canonContrastInfo)},
 };
 
-const TagInfo* CanonMakerNote::tagListCo() {
-  return tagInfoCo_;
-}
-
 // Canon WhiteBalance Info Tag
 constexpr TagInfo CanonMakerNote::tagInfoWbi_[] = {
     {0x0002, "WB_GRGBLevelsAuto", N_("WB_G RGB Levels Auto"), N_("WB_G RGB Levels Auto"), IfdId::canonWbId,
@@ -812,20 +788,12 @@ constexpr TagInfo CanonMakerNote::tagInfoWbi_[] = {
      SectionId::makerTags, unsignedLong, -1, printValue},
 };
 
-const TagInfo* CanonMakerNote::tagListWbi() {
-  return tagInfoWbi_;
-}
-
 // Canon FaceDetect 3 Info Tag
 constexpr TagInfo CanonMakerNote::tagInfoFcd3_[] = {
     {0x0003, "FacesDetected", N_("Face Detected"), N_("Faces Detected"), IfdId::canonFcd3Id, SectionId::makerTags,
      unsignedShort, -1, printValue},
 };
 
-const TagInfo* CanonMakerNote::tagListFcd3() {
-  return tagInfoFcd3_;
-}
-
 /*
 // Canon Aspect Info, tag 0x001d
 constexpr TagDetails canonAspectInfo[] = {
@@ -853,10 +821,6 @@ constexpr TagInfo CanonMakerNote::tagInfoAs_[] = {
      SectionId::makerTags, unsignedLong, -1, printValue},
 };
 
-const TagInfo* CanonMakerNote::tagListAs() {
-  return tagInfoAs_;
-}
-
 // Canon Color Balance Info Tag
 constexpr TagInfo CanonMakerNote::tagInfoCbi_[] = {
     {0x0001, "WB_RGGBLevelsAuto", N_("WB_RGGB Levels Auto"), N_("WB_RGGB Levels Auto"), IfdId::canonCbId,
@@ -881,20 +845,12 @@ constexpr TagInfo CanonMakerNote::tagInfoCbi_[] = {
      SectionId::makerTags, signedShort, -1, printValue},
 };
 
-const TagInfo* CanonMakerNote::tagListCbi() {
-  return tagInfoCbi_;
-}
-
 // Canon Flags Tag
 constexpr TagInfo CanonMakerNote::tagInfoFl_[] = {
     {0x0001, "ModifiedParamFlag", N_("Modified Param Flag"), N_("Modified Param Flag"), IfdId::canonFlId,
      SectionId::makerTags, signedShort, -1, printValue},
 };
 
-const TagInfo* CanonMakerNote::tagListFl() {
-  return tagInfoFl_;
-}
-
 // Canon Modified ToneCurve Info, tag 0x0001
 constexpr TagDetails canonModifiedToneCurve[] = {
     {0, N_("Standard")},
@@ -933,10 +889,6 @@ constexpr TagInfo CanonMakerNote::tagInfoMo_[] = {
      SectionId::makerTags, signedShort, -1, printValue},
 };
 
-const TagInfo* CanonMakerNote::tagListMo() {
-  return tagInfoMo_;
-}
-
 // Canon Preview Quality Info, tag 0x0001
 constexpr TagDetails canonPreviewQuality[] = {
     {-1, N_("n/a")},      {1, N_("Economy")}, {2, N_("Normal")},         {3, N_("Fine")},        {4, N_("RAW")},
@@ -957,10 +909,6 @@ constexpr TagInfo CanonMakerNote::tagInfoPreI_[] = {
      SectionId::makerTags, unsignedLong, -1, printValue},
 };
 
-const TagInfo* CanonMakerNote::tagListPreI() {
-  return tagInfoPreI_;
-}
-
 // Canon Color Info Tag
 constexpr TagInfo CanonMakerNote::tagInfoCi_[] = {
     {0x0001, "Saturation", N_("Saturation"), N_("Saturation"), IfdId::canonCiId, SectionId::makerTags, signedShort, -1,
@@ -971,10 +919,6 @@ constexpr TagInfo CanonMakerNote::tagInfoCi_[] = {
      -1, EXV_PRINT_TAG(canonColorSpace)},
 };
 
-const TagInfo* CanonMakerNote::tagListCi() {
-  return tagInfoCi_;
-}
-
 // Canon AFMicroAdjMode Quality Info, tag 0x0001
 constexpr TagDetails canonAFMicroAdjMode[] = {
     {0, N_("Disable")},
@@ -992,10 +936,6 @@ constexpr TagInfo CanonMakerNote::tagInfoAfMiAdj_[] = {
      IfdId::canonAfMiAdjId, SectionId::makerTags, signedShort, 1, printValue},
 };
 
-const TagInfo* CanonMakerNote::tagListAfMiAdj() {
-  return tagInfoAfMiAdj_;
-}
-
 // Canon VignettingCorr Tag
 constexpr TagInfo CanonMakerNote::tagInfoVigCor_[] = {
     {0x0000, "VignettingCorrVersion", N_("Vignetting Corr Version"), N_("Vignetting Corr Version"),
@@ -1018,10 +958,6 @@ constexpr TagInfo CanonMakerNote::tagInfoVigCor_[] = {
      SectionId::makerTags, signedShort, -1, printValue},
 };
 
-const TagInfo* CanonMakerNote::tagListVigCor() {
-  return tagInfoVigCor_;
-}
-
 // Canon VignettingCorr2 Tag
 constexpr TagInfo CanonMakerNote::tagInfoVigCor2_[] = {
     {0x0005, "PeripheralLightingSetting", N_("Peripheral Lighting Setting"), N_("Peripheral Lighting Setting"),
@@ -1034,10 +970,6 @@ constexpr TagInfo CanonMakerNote::tagInfoVigCor2_[] = {
      IfdId::canonVigCor2Id, SectionId::makerTags, signedLong, 1, printValue}  // important to add end of tag
 };
 
-const TagInfo* CanonMakerNote::tagListVigCor2() {
-  return tagInfoVigCor2_;
-}
-
 // Canon AutoLightingOptimizer, tag 0x0002
 constexpr TagDetails canonAutoLightingOptimizer[] = {
     {0, N_("Standard")},
@@ -1095,10 +1027,6 @@ constexpr TagInfo CanonMakerNote::tagInfoLiOp_[] = {
      printValue}  // important to add end of tag
 };
 
-const TagInfo* CanonMakerNote::tagListLiOp() {
-  return tagInfoLiOp_;
-}
-
 // Canon LensInfo Tag
 constexpr TagInfo CanonMakerNote::tagInfoLe_[] = {
     {0x0000, "LensSerialNumber", N_("Lens Serial Number"),
@@ -1109,10 +1037,6 @@ constexpr TagInfo CanonMakerNote::tagInfoLe_[] = {
      SectionId::makerTags, undefined, 1, printValue}  // important to add end of tag
 };
 
-const TagInfo* CanonMakerNote::tagListLe() {
-  return tagInfoLe_;
-}
-
 // Canon AmbienceSelection, tag 0x0001
 constexpr TagDetails canonAmbienceSelection[] = {
     {0, N_("Standard")}, {1, N_("Vivid")},    {2, N_("Warm")},   {3, N_("Soft")},       {4, N_("Cool")},
@@ -1127,10 +1051,6 @@ constexpr TagInfo CanonMakerNote::tagInfoAm_[] = {
      SectionId::makerTags, signedLong, 1, printValue}  // important to add end of tag
 };
 
-const TagInfo* CanonMakerNote::tagListAm() {
-  return tagInfoAm_;
-}
-
 // Canon MultiExposure, tag 0x0001
 constexpr TagDetails canonMultiExposure[] = {
     {0, N_("Off")},
@@ -1158,10 +1078,6 @@ constexpr TagInfo CanonMakerNote::tagInfoMe_[] = {
      SectionId::makerTags, signedLong, 1, printValue}  // important to add end of tag
 };
 
-const TagInfo* CanonMakerNote::tagListMe() {
-  return tagInfoMe_;
-}
-
 // Canon FilterInfo, tag 0x0001
 constexpr TagDetails canonFilterInfo[] = {
     {-1, N_("Off")},
@@ -1199,10 +1115,6 @@ constexpr TagInfo CanonMakerNote::tagInfoFil_[] = {
      SectionId::makerTags, signedLong, 1, printValue}  // important to add end of tag
 };
 
-const TagInfo* CanonMakerNote::tagListFil() {
-  return tagInfoFil_;
-}
-
 // Canon HDR, tag 0x0001
 constexpr TagDetails canonHdr[] = {
     {0, N_("Off")},
@@ -1226,10 +1138,6 @@ constexpr TagInfo CanonMakerNote::tagInfoHdr_[] = {
      signedLong, 1, printValue},
 };
 
-const TagInfo* CanonMakerNote::tagListHdr() {
-  return tagInfoHdr_;
-}
-
 // Canon AIServoFirstImage, tag 0x0001
 constexpr TagDetails canonAIServoFirstImage[] = {
     {0, N_("Equal Priority")},
@@ -1372,10 +1280,6 @@ constexpr TagInfo CanonMakerNote::tagInfoAfC_[] = {
      SectionId::makerTags, signedLong, 1, printValue}  // important to add end of tag
 };
 
-const TagInfo* CanonMakerNote::tagListAfC() {
-  return tagInfoAfC_;
-}
-
 // Canon RawBurstInfo Info Tag
 constexpr TagInfo CanonMakerNote::tagInfoRawB_[] = {
     {0x0001, "RawBurstImageNum", N_("Raw Burst Image Num"), N_("Raw Burst Image Num"), IfdId::canonRawBId,
@@ -1386,10 +1290,6 @@ constexpr TagInfo CanonMakerNote::tagInfoRawB_[] = {
      SectionId::makerTags, signedLong, 1, printValue}  // important to add end of tag
 };
 
-const TagInfo* CanonMakerNote::tagListRawB() {
-  return tagInfoRawB_;
-}
-
 //! Macro, tag 0x0001
 constexpr TagDetails canonCsMacro[] = {
     {1, N_("On")},
@@ -2279,10 +2179,6 @@ constexpr TagInfo CanonMakerNote::tagInfoCs_[] = {
      SectionId::makerTags, signedShort, 1, printValue},
 };
 
-const TagInfo* CanonMakerNote::tagListCs() {
-  return tagInfoCs_;
-}
-
 //! AFPointUsed, tag 0x000e
 constexpr TagDetailsBitmask canonSiAFPointUsed[] = {
     {0x0004, N_("left")},
@@ -2390,10 +2286,6 @@ constexpr TagInfo CanonMakerNote::tagInfoSi_[] = {
      SectionId::makerTags, unsignedShort, 1, printValue},
 };
 
-const TagInfo* CanonMakerNote::tagListSi() {
-  return tagInfoSi_;
-}
-
 //! PanoramaDirection, tag 0x0005
 constexpr TagDetails canonPaDirection[] = {
     {0, N_("Left to right")}, {1, N_("Right to left")},          {2, N_("Bottom to top")},
@@ -2411,10 +2303,6 @@ constexpr TagInfo CanonMakerNote::tagInfoPa_[] = {
      SectionId::makerTags, unsignedShort, 1, printValue},
 };
 
-const TagInfo* CanonMakerNote::tagListPa() {
-  return tagInfoPa_;
-}
-
 // Canon Custom Function Tag Info
 constexpr TagInfo CanonMakerNote::tagInfoCf_[] = {
     {0x0001, "NoiseReduction", N_("Noise Reduction"), N_("Long exposure noise reduction"), IfdId::canonCfId,
@@ -2452,10 +2340,6 @@ constexpr TagInfo CanonMakerNote::tagInfoCf_[] = {
      SectionId::makerTags, unsignedShort, 1, printValue},
 };
 
-const TagInfo* CanonMakerNote::tagListCf() {
-  return tagInfoCf_;
-}
-
 //! AFPointsUsed, tag 0x0016
 constexpr TagDetailsBitmask canonPiAFPointsUsed[] = {
     {0x01, N_("right")}, {0x02, N_("mid-right")}, {0x04, N_("bottom")}, {0x08, N_("center")},
@@ -2488,10 +2372,6 @@ constexpr TagInfo CanonMakerNote::tagInfoPi_[] = {
      SectionId::makerTags, unsignedShort, 1, printValue},
 };
 
-const TagInfo* CanonMakerNote::tagListPi() {
-  return tagInfoPi_;
-}
-
 //! BracketMode, tag 0x0003
 constexpr TagDetails canonBracketMode[] = {
     {0, N_("Off")}, {1, N_("AEB")}, {2, N_("FEB")}, {3, N_("ISO")}, {4, N_("WB")},
@@ -2661,10 +2541,6 @@ constexpr TagInfo CanonMakerNote::tagInfoFi_[] = {
      SectionId::makerTags, signedShort, 1, printValue},
 };
 
-const TagInfo* CanonMakerNote::tagListFi() {
-  return tagInfoFi_;
-}
-
 //! Tone Curve Values
 constexpr TagDetails canonToneCurve[] = {
     {0, N_("Standard")},
@@ -2709,10 +2585,6 @@ constexpr TagInfo CanonMakerNote::tagInfoPr_[] = {
      SectionId::makerTags, signedShort, 1, printValue},
 };
 
-const TagInfo* CanonMakerNote::tagListPr() {
-  return tagInfoPr_;
-}
-
 //! canonTimeZoneCity - array of cityID/cityName used by Canon
 constexpr TagDetails canonTimeZoneCity[] = {
     {0x0000, N_("n/a")},
@@ -2764,10 +2636,6 @@ constexpr TagInfo CanonMakerNote::tagInfoTi_[] = {
      SectionId::makerTags, signedLong, 1, printValue},
 };
 
-const TagInfo* CanonMakerNote::tagListTi() {
-  return tagInfoTi_;
-}
-
 std::ostream& CanonMakerNote::printFiFileNumber(std::ostream& os, const Value& value, const ExifData* metadata) {
   if (!metadata || value.typeId() != unsignedLong || value.count() == 0) {
     return os << "(" << value << ")";