diff options
| author | Hubert Figuiere <hub@figuiere.net> | 2010-11-10 22:14:10 -0800 |
|---|---|---|
| committer | Hubert Figuiere <hub@figuiere.net> | 2010-11-10 22:14:10 -0800 |
| commit | 6527f0a5ccd1c0c35f68915800a887fd8b9726d2 (patch) | |
| tree | 7f27a6bb6ea85c3e9fdef6a19b9a05ae5d35ff33 | |
| parent | a0edcb62e648fab75c25a521a691e70ac88c16f2 (diff) | |
Add support for Canon 60Dcurrent-backport-0.0.9
| -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 ee5500a..e2be81a 100644 --- a/include/libopenraw/consts.h +++ b/include/libopenraw/consts.h @@ -179,6 +179,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 ac15fe6..03fc117 100644 --- a/lib/cr2file.cpp +++ b/lib/cr2file.cpp @@ -74,6 +74,8 @@ const IfdFile::camera_ids_t Cr2File::s_def[] = { 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, |