diff options
| author | Hubert Figuière <hub@figuiere.net> | 2018-04-26 22:52:34 -0400 |
|---|---|---|
| committer | Hubert Figuière <hub@figuiere.net> | 2018-04-26 22:52:34 -0400 |
| commit | 705f849f53eb048d28404d3913030555a6ec0d2e (patch) | |
| tree | 00664784298fc1d4b0f13d128cd90eeff7a109f6 | |
| parent | 491a46176c1d8446861224fc8bcfa063c0230f81 (diff) | |
rw2: Added Panasonic G9 and TZ110
| -rw-r--r-- | include/libopenraw/cameraids.h | 2 | ||||
| -rw-r--r-- | lib/rw2file.cpp | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/include/libopenraw/cameraids.h b/include/libopenraw/cameraids.h index c9b7d25..1707775 100644 --- a/include/libopenraw/cameraids.h +++ b/include/libopenraw/cameraids.h @@ -520,6 +520,8 @@ enum { OR_TYPEID_PANASONIC_GX9 = 48, OR_TYPEID_PANASONIC_GX800 = 49, OR_TYPEID_PANASONIC_TZ202 = 50, + OR_TYPEID_PANASONIC_TZ110 = 51, + OR_TYPEID_PANASONIC_G9 = 52, _OR_TYPEID_PANASONIC_LAST }; diff --git a/lib/rw2file.cpp b/lib/rw2file.cpp index 3624092..465af31 100644 --- a/lib/rw2file.cpp +++ b/lib/rw2file.cpp @@ -161,6 +161,10 @@ static const BuiltinColourMatrix s_matrices[] = { 15, 0, { 7610, -2780, -576, -4614, 12195, 2733, -1375, 2393, 6490 } }, + { OR_MAKE_PANASONIC_TYPEID(OR_TYPEID_PANASONIC_G9), + 0, + 0, + { 7685, -2375, -634, -3687, 11700, 2249, -748, 1546, 5111 } }, { OR_MAKE_PANASONIC_TYPEID(OR_TYPEID_PANASONIC_GH1), 15, 0xf92, @@ -221,6 +225,10 @@ static const BuiltinColourMatrix s_matrices[] = { 15, 0, { 7790, -2736, -755, -3452, 11870, 1769, -628, 1647, 4898 } }, + { OR_MAKE_PANASONIC_TYPEID(OR_TYPEID_PANASONIC_TZ110), + 15, + 0, + { 7790, -2736, -755, -3452, 11870, 1769, -628, 1647, 4898 } }, { OR_MAKE_PANASONIC_TYPEID(OR_TYPEID_PANASONIC_TZ202), 15, 0, @@ -281,6 +289,7 @@ const IfdFile::camera_ids_t Rw2File::s_def[] = { { "DMC-G5", OR_MAKE_PANASONIC_TYPEID(OR_TYPEID_PANASONIC_G5) }, { "DMC-G10", OR_MAKE_PANASONIC_TYPEID(OR_TYPEID_PANASONIC_G10) }, { "DMC-G80", OR_MAKE_PANASONIC_TYPEID(OR_TYPEID_PANASONIC_G80) }, + { "DC-G9", OR_MAKE_PANASONIC_TYPEID(OR_TYPEID_PANASONIC_G9) }, { "DMC-GH1", OR_MAKE_PANASONIC_TYPEID(OR_TYPEID_PANASONIC_GH1) }, { "DMC-GH2", OR_MAKE_PANASONIC_TYPEID(OR_TYPEID_PANASONIC_GH2) }, { "DMC-GH3", OR_MAKE_PANASONIC_TYPEID(OR_TYPEID_PANASONIC_GH3) }, @@ -297,6 +306,7 @@ const IfdFile::camera_ids_t Rw2File::s_def[] = { { "DMC-L1", OR_MAKE_PANASONIC_TYPEID(OR_TYPEID_PANASONIC_L1) }, { "DMC-L10", OR_MAKE_PANASONIC_TYPEID(OR_TYPEID_PANASONIC_L10) }, { "DMC-TZ100", OR_MAKE_PANASONIC_TYPEID(OR_TYPEID_PANASONIC_TZ100) }, + { "DMC-TZ110", OR_MAKE_PANASONIC_TYPEID(OR_TYPEID_PANASONIC_TZ110) }, { "DC-TZ202", OR_MAKE_PANASONIC_TYPEID(OR_TYPEID_PANASONIC_TZ202) }, { "DMC-TZ70", OR_MAKE_PANASONIC_TYPEID(OR_TYPEID_PANASONIC_TZ70) }, { "DMC-TZ80", OR_MAKE_PANASONIC_TYPEID(OR_TYPEID_PANASONIC_TZ80) }, |