Skip to content

Commit b7a2142

Browse files
clanmillsclanmills
authored
Merge pull request #1451 from Exiv2/add_cr_tags
Add cr3 tags
2 parents 19decc1 + 0889b45 commit b7a2142

File tree

9 files changed

+1106
-159
lines changed

9 files changed

+1106
-159
lines changed

‎src/canonmn_int.cpp‎

Lines changed: 889 additions & 63 deletions
Large diffs are not rendered by default.

‎src/canonmn_int.hpp‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,65 @@ namespace Exiv2 {
7373
static const TagInfo* tagListFi();
7474
//! Return read-only list of built-in Canon Processing Info tags
7575
static const TagInfo* tagListPr();
76+
//! Return read-only list of built-in Canon Movie Info tags
77+
static const TagInfo* tagListMv();
78+
//! Return read-only list of built-in Canon My Colors Info tags
79+
static const TagInfo* tagListMc();
80+
//! Return read-only list of built-in Canon AFInfo3 Info tags
81+
static const TagInfo* tagListAf3();
82+
//! Return read-only list of built-in Canon Face detection Info tags
83+
static const TagInfo* tagListFcd3();
84+
//! Return read-only list of built-in Canon White balance Info tags
85+
static const TagInfo* tagListWbi();
86+
//! Return read-only list of built-in Canon Contrast Info tags
87+
static const TagInfo* tagListCo();
88+
//! Return read-only list of built-in Canon Face detection 1 Info tags
89+
static const TagInfo* tagListFcd2();
90+
//! Return read-only list of built-in Canon Face detection 2 Info tags
91+
static const TagInfo* tagListFcd1();
92+
//! Return read-only list of built-in Canon Aspect Info tags
93+
static const TagInfo* tagListAs();
94+
//! Return read-only list of built-in Canon Balance Info tags
95+
static const TagInfo* tagListCbi();
96+
//! Return read-only list of built-in Canon Flags Info tags
97+
static const TagInfo* tagListFl();
98+
//! Return read-only list of built-in Canon Modified On Info tags
99+
static const TagInfo* tagListMo();
100+
//! Return read-only list of built-in Canon Preview Image Info tags
101+
static const TagInfo* tagListPreI();
102+
//! Return read-only list of built-in Canon Color Info tags
103+
static const TagInfo* tagListCi();
104+
//! Return read-only list of built-in Canon AFMicroAdjMode Quality Info tags
105+
static const TagInfo* tagListAfMiAdj();
106+
//! Return read-only list of built-in Canon VignettingCorr Info tags
107+
static const TagInfo* tagListVigCor();
108+
//! Return read-only list of built-in Canon VignettingCorr2 Info tags
109+
static const TagInfo* tagListVigCor2();
110+
//! Return read-only list of built-in Canon LightingOpt Info tags
111+
static const TagInfo* tagListLiOp();
112+
//! Return read-only list of built-in Canon LensInfo Info tags
113+
static const TagInfo* tagListLe();
114+
//! Return read-only list of built-in Canon Ambience Info tags
115+
static const TagInfo* tagListAm();
116+
//! Return read-only list of built-in Canon MultiExposureControl Info tags
117+
static const TagInfo* tagListMe();
118+
//! Return read-only list of built-in Canon Filter Info tags
119+
static const TagInfo* tagListFil();
120+
//! Return read-only list of built-in Canon HDR Info tags
121+
static const TagInfo* tagListHdr();
122+
//! Return read-only list of built-in Canon AFConfig Info tags
123+
static const TagInfo* tagListAfC();
124+
//! Return read-only list of built-in Canon RawBurstInfo Info tags
125+
static const TagInfo* tagListRawB();
126+
//! Return read-only list of built-in Canon AFInfo2 Info tags
127+
static const TagInfo* tagListAf2();
128+
129+
130+
131+
132+
133+
134+
76135

77136
//! @name Print functions for Canon %MakerNote tags
78137
//@{
@@ -123,14 +182,41 @@ namespace Exiv2 {
123182

124183
//! Tag information
125184
static const TagInfo tagInfo_[];
185+
static const TagInfo tagInfoAf2_[];
186+
static const TagInfo tagInfoAf3_[];
187+
static const TagInfo tagInfoAfC_[];
188+
static const TagInfo tagInfoAfMiAdj_[];
189+
static const TagInfo tagInfoAm_[];
190+
static const TagInfo tagInfoAs_[];
126191
static const TagInfo tagInfoCs_[];
192+
static const TagInfo tagInfoCbi_[];
127193
static const TagInfo tagInfoSi_[];
128194
static const TagInfo tagInfoCf_[];
195+
static const TagInfo tagInfoCi_[];
196+
static const TagInfo tagInfoCo_[];
197+
static const TagInfo tagInfoFl_[];
198+
static const TagInfo tagInfoFil_[];
199+
static const TagInfo tagInfoLiOp_[];
200+
static const TagInfo tagInfoLe_[];
201+
static const TagInfo tagInfoHdr_[];
202+
static const TagInfo tagInfoMe_[];
203+
static const TagInfo tagInfoMo_[];
204+
static const TagInfo tagInfoMv_[];
205+
static const TagInfo tagInfoMc_[];
206+
static const TagInfo tagInfoFcd1_[];
207+
static const TagInfo tagInfoFcd2_[];
208+
static const TagInfo tagInfoFcd3_[];
129209
static const TagInfo tagInfoPi_[];
130210
static const TagInfo tagInfoTi_[];
131211
static const TagInfo tagInfoFi_[];
132212
static const TagInfo tagInfoPa_[];
133213
static const TagInfo tagInfoPr_[];
214+
static const TagInfo tagInfoPreI_[];
215+
static const TagInfo tagInfoVigCor_[];
216+
static const TagInfo tagInfoVigCor2_[];
217+
static const TagInfo tagInfoWbi_[];
218+
static const TagInfo tagInfoRawB_ [];
219+
134220

135221
}; // class CanonMakerNote
136222

@@ -157,3 +243,5 @@ namespace Exiv2 {
157243
}} // namespace Internal, Exiv2
158244

159245
#endif // #ifndef CANONMN_INT_HPP_
246+
247+

‎src/tags_int.hpp‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,40 @@ namespace Exiv2 {
7474
panaRawId,
7575
mnId,
7676
canonId,
77+
canonAf2Id,
78+
canonAf3Id,
79+
canonAfCId,
80+
canonAfMiAdjId,
81+
canonAmId,
82+
canonAsId,
83+
canonCbId,
84+
canonCiId,
7785
canonCsId,
86+
canonFilId,
87+
canonFlId,
88+
canonHdrId,
89+
canonLeId,
90+
canonMeId,
91+
canonMoID,
92+
canonMvId,
93+
canonRawBId,
7894
canonSiId,
79-
canonCfId,
95+
canonCfId,
96+
canonContrastId,
97+
canonFcd1Id,
98+
canonFcd2Id,
99+
canonFcd3Id,
100+
canonLiOpId,
101+
canonMyColorID,
80102
canonPiId,
81103
canonPaId,
82104
canonTiId,
83105
canonFiId,
84106
canonPrId,
107+
canonPreID,
108+
canonVigCorId,
109+
canonVigCor2Id,
110+
canonWbId,
85111
casioId,
86112
casio2Id,
87113
fujiId,
@@ -161,6 +187,7 @@ namespace Exiv2 {
161187
sony1MltCsOldId,
162188
sony1MltCsNewId,
163189
sony1MltCsA100Id,
190+
tagInfoMvId,
164191
lastId,
165192
ignoreId = lastId
166193
};

‎test/data/crw-test.out‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ Exif.CanonCs.Quality Short 1 RAW
4141
Exif.CanonCs.FlashMode Short 1 Off
4242
Exif.CanonCs.DriveMode Short 1 Single / timer
4343
Exif.CanonCs.FocusMode Short 1 AI servo AF
44+
Exif.CanonCs.RecordMode Short 1 CRW+THM
4445
Exif.CanonCs.ImageSize Short 1 Large
4546
Exif.CanonCs.EasyMode Short 1 Manual
4647
Exif.CanonCs.DigitalZoom Short 1 None
@@ -155,6 +156,7 @@ Exif.CanonCs.Quality Short 1 RAW
155156
Exif.CanonCs.FlashMode Short 1 Off
156157
Exif.CanonCs.DriveMode Short 1 Single / timer
157158
Exif.CanonCs.FocusMode Short 1 AI servo AF
159+
Exif.CanonCs.RecordMode Short 1 CRW+THM
158160
Exif.CanonCs.ImageSize Short 1 Large
159161
Exif.CanonCs.EasyMode Short 1 Manual
160162
Exif.CanonCs.DigitalZoom Short 1 None
@@ -223,6 +225,7 @@ Exif.CanonCs.Quality Short 1 RAW
223225
Exif.CanonCs.FlashMode Short 1 Off
224226
Exif.CanonCs.DriveMode Short 1 Single / timer
225227
Exif.CanonCs.FocusMode Short 1 AI servo AF
228+
Exif.CanonCs.RecordMode Short 1 CRW+THM
226229
Exif.CanonCs.ImageSize Short 1 Large
227230
Exif.CanonCs.EasyMode Short 1 Manual
228231
Exif.CanonCs.DigitalZoom Short 1 None

‎test/data/exifdata-test.out‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ Exif.CanonCs.DriveMode 0x0005 Makernote Short 1
201201
Exif.CanonCs.0x0006 0x0006 Makernote Short 1 0
202202
Exif.CanonCs.FocusMode 0x0007 Makernote Short 1 4
203203
Exif.CanonCs.0x0008 0x0008 Makernote Short 1 0
204-
Exif.CanonCs.0x0009 0x0009 Makernote Short 1 1
204+
Exif.CanonCs.RecordMode 0x0009 Makernote Short 1 1
205205
Exif.CanonCs.ImageSize 0x000a Makernote Short 1 0
206206
Exif.CanonCs.EasyMode 0x000b Makernote Short 1 1
207207
Exif.CanonCs.DigitalZoom 0x000c Makernote Short 1 0
@@ -330,7 +330,7 @@ Exif.CanonCs.DriveMode 0x0005 Makernote Short 1
330330
Exif.CanonCs.0x0006 0x0006 Makernote Short 1 0
331331
Exif.CanonCs.FocusMode 0x0007 Makernote Short 1 4
332332
Exif.CanonCs.0x0008 0x0008 Makernote Short 1 0
333-
Exif.CanonCs.0x0009 0x0009 Makernote Short 1 1
333+
Exif.CanonCs.RecordMode 0x0009 Makernote Short 1 1
334334
Exif.CanonCs.ImageSize 0x000a Makernote Short 1 0
335335
Exif.CanonCs.EasyMode 0x000b Makernote Short 1 1
336336
Exif.CanonCs.DigitalZoom 0x000c Makernote Short 1 0
@@ -460,7 +460,7 @@ Exif.CanonCs.DriveMode 0x0005 Makernote Short 1
460460
Exif.CanonCs.0x0006 0x0006 Makernote Short 1 0
461461
Exif.CanonCs.FocusMode 0x0007 Makernote Short 1 4
462462
Exif.CanonCs.0x0008 0x0008 Makernote Short 1 0
463-
Exif.CanonCs.0x0009 0x0009 Makernote Short 1 1
463+
Exif.CanonCs.RecordMode 0x0009 Makernote Short 1 1
464464
Exif.CanonCs.ImageSize 0x000a Makernote Short 1 0
465465
Exif.CanonCs.EasyMode 0x000b Makernote Short 1 1
466466
Exif.CanonCs.DigitalZoom 0x000c Makernote Short 1 0
@@ -590,7 +590,7 @@ Exif.CanonCs.DriveMode 0x0005 Makernote Short 1
590590
Exif.CanonCs.0x0006 0x0006 Makernote Short 1 0
591591
Exif.CanonCs.FocusMode 0x0007 Makernote Short 1 4
592592
Exif.CanonCs.0x0008 0x0008 Makernote Short 1 0
593-
Exif.CanonCs.0x0009 0x0009 Makernote Short 1 1
593+
Exif.CanonCs.RecordMode 0x0009 Makernote Short 1 1
594594
Exif.CanonCs.ImageSize 0x000a Makernote Short 1 0
595595
Exif.CanonCs.EasyMode 0x000b Makernote Short 1 1
596596
Exif.CanonCs.DigitalZoom 0x000c Makernote Short 1 0

0 commit comments

Comments
 (0)