third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #317 from danileo/canon_m100_support

Browse Source 
Support Canon M100
This commit is contained in:
D4N 2018-05-21 23:46:33 +02:00 committed by GitHub
commit 96f03ea096
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/canonmn_int.cpp
View File

@ -289,6 +289,7 @@ namespace Exiv2 {
{ (long int)0x3940000, "EOS M5" },
{ (long int)0x3950000, "PowerShot G5 X" },
{ (long int)0x3970000, "PowerShot G7 X Mark II" },
{ (long int)0x3980000, "EOS M100" },
{ (long int)0x3990000, "PowerShot ELPH 360 HS / IXUS 285 HS / IXY 650" },
{ (long int)0x4010000, "PowerShot SX540 HS" },
{ (long int)0x4020000, "PowerShot SX420 IS" },

BIN
test/data/exiv2-pr317.exv Normal file
View File

Binary file not shown.

17
tests/bugfixes/github/test_pr_317.py Normal file
View File

@ -0,0 +1,17 @@
# -*- coding: utf-8 -*-
import system_tests
class CanonEOSM100(metaclass=system_tests.CaseMeta):
filename = "$data_path/exiv2-pr317.exv"
commands = ["$exiv2 -pa --grep model/i $filename"]
stdout = ["""Exif.Image.Model Ascii 15 Canon EOS M100
Exif.Canon.ModelID Long 1 EOS M100
Exif.Photo.LensModel Ascii 29 EF-M15-45mm f/3.5-6.3 IS STM
"""
]
stderr = [""]
retval = [0]