Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update website docs #1905

Merged
merged 5 commits into from
Sep 22, 2021
Merged

Update website docs #1905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c4e7383
Add missing MpfInfo group to `taglist.exe Exif`
postscript-dev Sep 16, 2021
098283c
Merge branch 'Exiv2:main' into update_website_docs
postscript-dev Sep 16, 2021
e07451a
Add Python test for `taglist` program
postscript-dev Sep 16, 2021
486bf32
Merge branch 'update_website_docs' of https://github.com/postscript-d…
postscript-dev Sep 16, 2021
bb9fc40
Add missing Canon/Nikon/Samsung/Sony Groups to docs
postscript-dev Sep 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions doc/templates/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ TABLES = Exif \
CanonFi \
CanonPa \
CanonPr \
CanonTi \
Casio \
Casio2 \
Fujifilm \
Expand Down Expand Up @@ -89,6 +90,7 @@ TABLES = Exif \
NikonLd1 \
NikonLd2 \
NikonLd3 \
NikonLd4 \
Olympus \
OlympusCs \
OlympusEq \
Expand All @@ -108,6 +110,7 @@ TABLES = Exif \
SonyMinolta \
Sony1Cs \
Sony1Cs2 \
Sony2010e \
Sony1MltCs7D \
Sony1MltCsOld \
Sony1MltCsA100 \
Expand Down
5 changes: 5 additions & 0 deletions doc/templates/tags-canon.html.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ __CanonFi__
__CanonPr__
<br>

<h3>Canon TimeInfo Tags</h3>
<p>Click on a column header to sort the table.</p>
__CanonTi__
<br>

</div>
<!-- closes content -->

Expand Down
9 changes: 9 additions & 0 deletions doc/templates/tags-nikon.html.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,15 @@ __NikonLd2__
__NikonLd3__
<br>

<h3>Nikon Lens Data 4 Tags</h3>
<p>Click on a column header to sort the table.</p>
__NikonLd4__
<br>

<h3>Nikon Preview Tags</h3>
<p>These are the same as <a href="https://www.exiv2.org/tags.html">Exif.Image.*</a> but are accessed as Exif.NikonPv.*</p>
<br>

</div>
<!-- closes content -->

Expand Down
3 changes: 3 additions & 0 deletions doc/templates/tags-samsung.html.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ __Samsung2__
__SamsungPictureWizard__
<br>

<h3>Samsung Preview Tags</h3>
<p>These are the same as <a href="https://www.exiv2.org/tags.html">Exif.Image.*</a> but are accessed as Exif.SamsungPreview.*</p>
<br>
</div>
<!-- closes content -->

Expand Down
32 changes: 31 additions & 1 deletion doc/templates/tags-sony.html.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ __index1__
__index2__
<h2>Sony MakerNote Tags defined in Exiv2</h2>
<div>
<p>Tags found in the MakerNote of images taken with Sony cameras.</p>
<p>Tags found in the MakerNote of images taken with Sony cameras. Sony1 and Sony2 Groups share the same tagnames</p>
<p>Click on a column header to sort the table.</p>
</div>
__Sony1__
Expand All @@ -31,6 +31,11 @@ __Sony1Cs__
__Sony1Cs2__
<br>

<h3>Sony 2010e Camera Settings Tags</h3>
<p>Click on a column header to sort the table.</p>
__Sony2010e__
<br>

<h3>Sony Minolta Camera Settings Tags</h3>
<p>These are the same tags as the Minolta Camera Settings in the Minolta MakerNote.
In Sony images the group name is <b><code>Sony1MltCsOld</code></b> or <b><code>Sony1MltCsNew</code></b>.</p>
Expand All @@ -50,6 +55,31 @@ __Sony1MltCs7D__
__Sony1MltCsA100__
<br>

<h3>Sony Focus Position 2 Tags</h3>
<p>Click on a column header to sort the table.</p>
__Sony2Fp__
<br>

<h3>Sony Miscellaneous 1 Tags</h3>
<p>Click on a column header to sort the table.</p>
__SonyMisc1__
<br>

<h3>Sony Miscellaneous 2b Tags</h3>
<p>Click on a column header to sort the table.</p>
__SonyMisc2b__
<br>

<h3>Sony Miscellaneous 3c Tags</h3>
<p>Click on a column header to sort the table.</p>
__SonyMisc3c__
<br>

<h3>Sony Shot Info 1 Tags</h3>
<p>Click on a column header to sort the table.</p>
__SonySInfo1__
<br>

</div>
<!-- closes content -->

Expand Down
4 changes: 4 additions & 0 deletions src/tags.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ namespace Exiv2 {
const TagInfo* exif = exifTagList();
const TagInfo* gps = gpsTagList();
const TagInfo* iop = iopTagList();
const TagInfo* mpf = mpfTagList();

for (int i=0; ifd[i].tag_ != 0xffff; ++i) {
os << ifd[i] << "\n";
Expand All @@ -182,6 +183,9 @@ namespace Exiv2 {
for (int i=0; gps[i].tag_ != 0xffff; ++i) {
os << gps[i] << "\n";
}
for (int i=0; mpf[i].tag_ != 0xffff; ++i) {
os << mpf[i] << "\n";
}
} // ExifTags::taglist

void ExifTags::taglist(std::ostream& os, const std::string& groupName)
Expand Down
Loading