diff options
| author | Hubert Figuiere <hub@figuiere.net> | 2010-11-10 22:14:10 -0800 |
|---|---|---|
| committer | Hub Figuiere <hub@figuiere.net> | 2011-11-12 09:49:27 -0800 |
| commit | f7cfa008eb1c2d1c44934adaff8d955860dd4d3c (patch) | |
| tree | b60ef3fca8fe4b3bbdc413ca06a3f249903fe377 | |
| parent | b1a31f0e5dd5d18b127fc95cc4629cf281082436 (diff) | |
Add support for Canon 60D
Conflicts:
lib/cr2file.cpp
| -rw-r--r-- | include/libopenraw/consts.h | 1 | ||||
| -rw-r--r-- | lib/cr2file.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/libopenraw/consts.h b/include/libopenraw/consts.h index 940cc51..0f7d329 100644 --- a/include/libopenraw/consts.h +++ b/include/libopenraw/consts.h @@ -177,6 +177,7 @@ extern "C" { OR_TYPEID_CANON_1000D, OR_TYPEID_CANON_G10, OR_TYPEID_CANON_50D, + OR_TYPEID_CANON_60D, _OR_TYPEID_CANON_LAST }; diff --git a/lib/cr2file.cpp b/lib/cr2file.cpp index 2cf6a99..c965829 100644 --- a/lib/cr2file.cpp +++ b/lib/cr2file.cpp @@ -73,6 +73,8 @@ namespace OpenRaw { OR_TYPEID_CANON_500D) }, { "Canon EOS 550D", OR_MAKE_FILE_TYPEID(OR_TYPEID_VENDOR_CANON, OR_TYPEID_CANON_550D) }, + { "Canon EOS 60D", OR_MAKE_FILE_TYPEID(OR_TYPEID_VENDOR_CANON, + OR_TYPEID_CANON_60D) }, { "Canon EOS 1000D", OR_MAKE_FILE_TYPEID(OR_TYPEID_VENDOR_CANON, OR_TYPEID_CANON_1000D) }, { "Canon EOS 5D", OR_MAKE_FILE_TYPEID(OR_TYPEID_VENDOR_CANON, |