summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2020-01-28 09:57:32 +0100
committerGitHub <noreply@github.com>2020-01-28 09:57:32 +0100
commit19ecb40998101108d0b5fe984c84b7548ac9b7ef (patch)
treef7e1849676c83e61c3ceb25888346c8c27f7c03e
parentcd19a02e300b27db24194ccb82b787545260c4b6 (diff)
parent049f96cc01061be855da09a89f5b87c906deb25f (diff)
downloadlibgphoto2-19ecb40998101108d0b5fe984c84b7548ac9b7ef.tar.gz
Merge pull request #470 from knro/master
Add Nikon D7500 Image Quality
-rw-r--r--camlibs/ptp2/config.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c
index ef46fc86d..45f56432f 100644
--- a/camlibs/ptp2/config.c
+++ b/camlibs/ptp2/config.c
@@ -5261,8 +5261,7 @@ static struct deviceproptableu8 nikon_d7500_compression[] = {
{ N_("JPEG Normal*"), 0x03, PTP_VENDOR_NIKON },
{ N_("JPEG Fine"), 0x04, PTP_VENDOR_NIKON },
{ N_("JPEG Fine*"), 0x05, PTP_VENDOR_NIKON },
- { N_("TIFF"), 0x06, PTP_VENDOR_NIKON },
- { N_("NEF(RAW)"), 0x07, PTP_VENDOR_NIKON },
+ { N_("NEF (Raw)"), 0x07, PTP_VENDOR_NIKON },
{ N_("NEF+Basic"), 0x08, PTP_VENDOR_NIKON },
{ N_("NEF+Basic*"), 0x09, PTP_VENDOR_NIKON },
{ N_("NEF+Normal"), 0x0A, PTP_VENDOR_NIKON },
@@ -8621,9 +8620,9 @@ static struct menu menus[] = {
{ N_("Capture Settings"), "capturesettings", 0x4b0, 0x0426, nikon_d3s_capture_settings, NULL, NULL },
{ N_("Capture Settings"), "capturesettings", 0x4b0, 0x0429, nikon_d5100_capture_settings, NULL, NULL },
{ N_("Capture Settings"), "capturesettings", 0x4b0, 0x0430, nikon_d7100_capture_settings, NULL, NULL },
- { N_("Capture Settings"), "capturesettings", 0x4b0, 0x0414, nikon_d40_capture_settings, NULL, NULL },
- { N_("Capture Settings"), "capturesettings", 0x4b0, 0x0441, nikon_d850_capture_settings, NULL, NULL },
{ N_("Capture Settings"), "capturesettings", 0x4b0, 0x0440, nikon_d7500_capture_settings, NULL, NULL },
+ { N_("Capture Settings"), "capturesettings", 0x4b0, 0x0414, nikon_d40_capture_settings, NULL, NULL },
+ { N_("Capture Settings"), "capturesettings", 0x4b0, 0x0441, nikon_d850_capture_settings, NULL, NULL },
{ N_("Capture Settings"), "capturesettings", 0x4b0, 0x0442, nikon_z6_capture_settings, NULL, NULL }, /* Z7 */
{ N_("Capture Settings"), "capturesettings", 0x4b0, 0x0443, nikon_z6_capture_settings, NULL, NULL }, /* Z6 */
{ N_("Capture Settings"), "capturesettings", 0x4b0, 0, nikon_generic_capture_settings, NULL, NULL },