From 99409a0190812155f2a3d7e1123e0f72d42770c9 Mon Sep 17 00:00:00 2001 From: johannes hanika Date: Mon, 16 May 2016 07:57:07 +1200 Subject: [PATCH 01/36] Fix for gcc6 compilation --- RawSpeed/OrfDecoder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RawSpeed/OrfDecoder.cpp b/RawSpeed/OrfDecoder.cpp index f1b7bdd..4e29f90 100644 --- a/RawSpeed/OrfDecoder.cpp +++ b/RawSpeed/OrfDecoder.cpp @@ -125,7 +125,7 @@ void OrfDecoder::decodeCompressed(ByteStream& s, uint32 w, uint32 h) { for (high = 0; high < 12; high++) if ((b>>(11-high))&1) break; - bittable[i] = min(12,high); + bittable[i] = min(12,high); } left0 = nw0 = left1 = nw1 = 0; From e18afa4bfbb0fa6519c660f0e7197dfde65e8898 Mon Sep 17 00:00:00 2001 From: johannes hanika Date: Tue, 17 May 2016 01:05:51 +1200 Subject: [PATCH 02/36] Another try to get the fuji black levels right --- RawSpeed/RafDecoder.cpp | 11 +++++++++++ RawSpeed/TiffTag.h | 1 + 2 files changed, 12 insertions(+) diff --git a/RawSpeed/RafDecoder.cpp b/RawSpeed/RafDecoder.cpp index 5cca581..f8ab236 100644 --- a/RawSpeed/RafDecoder.cpp +++ b/RawSpeed/RafDecoder.cpp @@ -215,6 +215,17 @@ void RafDecoder::decodeMetaDataInternal(CameraMetaData *meta) { const CameraSensorInfo *sensor = cam->getSensorInfo(iso); mRaw->blackLevel = sensor->mBlackLevel; + + // at least the (bayer sensor) X100 comes with a tag like this: + if (mRootIFD->hasEntryRecursive(FUJI_RGGBLEVELSBLACK)) + { + TiffEntry *sep_black = mRootIFD->getEntryRecursive(FUJI_RGGBLEVELSBLACK); + if (sep_black->count == 4) + { + for(int k=0;k<4;k++) + mRaw->blackLevelSeparate[k] = sep_black->getInt(k); + } + } mRaw->whitePoint = sensor->mWhiteLevel; mRaw->blackAreas = cam->blackAreas; mRaw->cfa = cam->cfa; diff --git a/RawSpeed/TiffTag.h b/RawSpeed/TiffTag.h index 7dbad0f..2c550cf 100644 --- a/RawSpeed/TiffTag.h +++ b/RawSpeed/TiffTag.h @@ -201,6 +201,7 @@ typedef enum { INTEROPERABILITYIFDPOINTER = 0xA005, SAMSUNG_WB_RGGBLEVELSUNCORRECTED = 0xa021, SAMSUNG_WB_RGGBLEVELSBLACK = 0xa028, + FUJI_RGGBLEVELSBLACK = 0xf00a, FLASHENERGY = 0xA20B, SPATIALFREQUENCYRESPONSE = 0xA20C, FOCALPLANEXRESOLUTION = 0xA20E, From 4bb6b9b9076e1d7269f3219c023c99d674011f9d Mon Sep 17 00:00:00 2001 From: Ryan Gillette Date: Wed, 25 May 2016 18:49:59 -0700 Subject: [PATCH 03/36] Added Canon 80D support Added basic support for Canon 80D --- data/cameras.xml | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/data/cameras.xml b/data/cameras.xml index f9820d9..0e2711d 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -352,6 +352,46 @@ + + Canon EOS 80D + + RED + GREEN + GREEN + BLUE + + + + + + + + + + + + + + + + + Canon EOS 80D + + + + + + + + + Canon EOS 80D + + + + + + + Canon EOS 700D From 8e4db5f40ba0e87c103d4c34f268892c9152d864 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Sch=C3=B6fegger?= Date: Mon, 25 Jul 2016 15:32:17 +0200 Subject: [PATCH 04/36] Add Sony a380 support --- data/cameras.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/data/cameras.xml b/data/cameras.xml index 0e2711d..0ed9269 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -6249,6 +6249,17 @@ + + Sony DSLR-A380 + + RED + GREEN + GREEN + BLUE + + + + Sony DSLR-A390 From 4451f1d78846f3f031d769373be7530c2368ca30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Sch=C3=B6fegger?= Date: Mon, 25 Jul 2016 15:27:08 +0200 Subject: [PATCH 05/36] Add SONY ILCE-6300 support --- data/cameras.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/data/cameras.xml b/data/cameras.xml index 0ed9269..6eac028 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -6525,6 +6525,17 @@ + + Sony ILCE-6300 + + RED + GREEN + GREEN + BLUE + + + + Sony ILCE-7 From 3df1eacc4bedbb5031d35320ac27b3bc8bf28f37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Sch=C3=B6fegger?= Date: Thu, 28 Jul 2016 15:12:13 +0200 Subject: [PATCH 06/36] Add 16:9 and 3:2 mode to Panasonic DMC-FZ18 --- data/cameras.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/data/cameras.xml b/data/cameras.xml index 6eac028..8542241 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -5005,6 +5005,28 @@ + + Panasonic DMC-FZ18 + + BLUE + GREEN + GREEN + RED + + + + + + Panasonic DMC-FZ18 + + BLUE + GREEN + GREEN + RED + + + + Panasonic DMC-L1 From 8afe8913c4c52e50c9052e2d6724008e4d70a76d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Sch=C3=B6fegger?= Date: Sun, 31 Jul 2016 20:52:22 +0200 Subject: [PATCH 07/36] Add basic CANON PowerShot G9 X support --- data/cameras.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/data/cameras.xml b/data/cameras.xml index 8542241..fca71f7 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -1326,6 +1326,24 @@ + + Canon PowerShot G9 X + + RED + GREEN + GREEN + BLUE + + + + + + + + + + + Canon PowerShot G15 From 12d89ff53e81c33d629e3a099bd37c8b9d35cab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Sch=C3=B6fegger?= Date: Sun, 31 Jul 2016 15:25:27 +0200 Subject: [PATCH 08/36] Add CANON EOS M10 support --- data/cameras.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/data/cameras.xml b/data/cameras.xml index fca71f7..cb1fac1 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -866,6 +866,24 @@ + + Canon EOS M10 + + RED + GREEN + GREEN + BLUE + + + + + + + + + + + Canon EOS-1D From 3c5e396278d1e1cb9496301ce42be1933475c7fc Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Thu, 28 Jul 2016 22:19:24 +0300 Subject: [PATCH 09/36] Canon EOS 1300D - basic support. --- data/cameras.xml | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/data/cameras.xml b/data/cameras.xml index cb1fac1..1931e71 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -777,8 +777,28 @@ Canon EOS REBEL T3 - - Canon EOS 1200D + + Canon EOS 1200D + + GREEN + BLUE + RED + GREEN + + + + + + + + + + Canon EOS REBEL T5 + Canon EOS Kiss X70 + + + + Canon EOS 1300D GREEN BLUE @@ -786,15 +806,17 @@ GREEN - - + + + + - Canon EOS REBEL T5 - Canon EOS Kiss X70 + Canon EOS REBEL T6 + Canon EOS Kiss X80 From e6ccc03e0ee7dddbd7677381ff85daa6e8899df2 Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Thu, 4 Aug 2016 22:26:01 +0300 Subject: [PATCH 10/36] Canon EOS-1D X Mark II: basic support. --- data/cameras.xml | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/data/cameras.xml b/data/cameras.xml index 1931e71..c6c274a 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -1108,6 +1108,45 @@ + + Canon EOS-1D X Mark II + + RED + GREEN + GREEN + BLUE + + + + + + + + + + + + + + + + Canon EOS-1D X Mark II + + + + + + + + + Canon EOS-1D X Mark II + + + + + + + Canon PowerShot Pro1 @@ -9075,3 +9114,8 @@ + From d35e7b8874bf4d0034f948d3f581765d2897b145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Sch=C3=B6fegger?= Date: Sun, 7 Aug 2016 15:39:03 +0200 Subject: [PATCH 11/36] Canon PowerShot S95: Add white balance hint --- data/cameras.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/cameras.xml b/data/cameras.xml index c6c274a..133c1ce 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -1614,6 +1614,9 @@ + + + Canon PowerShot S100 From 0fa4f08d0bbf77c29f59a0c5ac793d1517729c25 Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Sun, 7 Aug 2016 17:41:22 +0300 Subject: [PATCH 12/36] TiffEntry::TiffEntry(): avoid unintentional integer overflow overflow_before_widen: Potentially overflowing expression _count << RawSpeed::datashifts[_type] with type RawSpeed::uint32 (32 bits, unsigned) is evaluated using 32-bit arithmetic, and then used in a context that expects an expression of type uint64 (64 bits, unsigned). Coverity CID 1357657 --- RawSpeed/TiffEntry.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RawSpeed/TiffEntry.cpp b/RawSpeed/TiffEntry.cpp index d3483d9..d164070 100644 --- a/RawSpeed/TiffEntry.cpp +++ b/RawSpeed/TiffEntry.cpp @@ -85,7 +85,7 @@ TiffEntry::TiffEntry(TiffTag _tag, TiffDataType _type, uint32 _count, const ucha type = _type; count = _count; data_offset = -1; // Set nonsense value in case someone tries to use it - bytesize = _count << datashifts[_type]; + bytesize = (size_t)_count << (size_t)datashifts[_type]; if (NULL == _data) { own_data = new uchar8[bytesize]; memset(own_data,0,bytesize); From d14d67e4659293bf75f1f8ca255e0b81b0bd259c Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Wed, 10 Aug 2016 22:03:09 +0300 Subject: [PATCH 13/36] Nikon D500 - basic support (only 12bit / 14bit compressed raws!) All iso levels have the same black/white levels... --- data/cameras.xml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/data/cameras.xml b/data/cameras.xml index 133c1ce..52b7fcf 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -1989,6 +1989,40 @@ + + Nikon D500 + + RED + GREEN + GREEN + BLUE + + + + + + + + + Nikon D500 + + + Nikon D500 + + RED + GREEN + GREEN + BLUE + + + + + + + + + Nikon D500 + Nikon D5000 From 45cc8e45830ce978528f1cc810569a402dd4c661 Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Thu, 11 Aug 2016 21:00:49 +0300 Subject: [PATCH 14/36] Canon PowerShot G7 X Mark II - basic support --- data/cameras.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/data/cameras.xml b/data/cameras.xml index 52b7fcf..ae39950 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -1298,6 +1298,28 @@ + + Canon PowerShot G7 X Mark II + + RED + GREEN + GREEN + BLUE + + + + + + + + + + + + + + + Canon PowerShot G1 X From 59af3959a28b19cd015ffe18dcf718d7c17252e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Sch=C3=B6fegger?= Date: Thu, 11 Aug 2016 20:16:56 +0200 Subject: [PATCH 15/36] Panasonic DMC-FZ50: Basic support added --- data/cameras.xml | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/data/cameras.xml b/data/cameras.xml index ae39950..7b45fb2 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -5114,8 +5114,30 @@ GREEN RED - - + + + + + Panasonic DMC-FZ50 + + BLUE + GREEN + GREEN + RED + + + + + + Panasonic DMC-FZ50 + + BLUE + GREEN + GREEN + RED + + + Panasonic DMC-FZ8 From 73db1b368064671c17df825703d56af676bd9571 Mon Sep 17 00:00:00 2001 From: Matthieu Date: Sat, 18 Jun 2016 14:44:43 +0200 Subject: [PATCH 16/36] Add the K-1 entry to rawspeed's camera.xml --- data/cameras.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/data/cameras.xml b/data/cameras.xml index 7b45fb2..1cc5e1a 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -5884,6 +5884,17 @@ + + Pentax K-1 + + RED + GREEN + GREEN + BLUE + + + + Pentax K-3 From 18e1033349a7f0a32d7cf65d0d4e86e1ddb84818 Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Fri, 12 Aug 2016 13:14:21 +0300 Subject: [PATCH 17/36] PENTAX K-1: fix crop --- data/cameras.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/cameras.xml b/data/cameras.xml index 1cc5e1a..699f84c 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -5892,7 +5892,7 @@ GREEN BLUE - + From 1234f2d44a3c79af6f82365290ae1c79235c3431 Mon Sep 17 00:00:00 2001 From: aferrero2707 Date: Fri, 12 Aug 2016 09:56:39 +0200 Subject: [PATCH 18/36] Olympus SP570UZ - proper bayer pattern https://github.com/aferrero2707/PhotoFlow/issues/95 (cherry picked from commit aferrero2707/PhotoFlow@523c5c440248401ba59f53f9b073c232d6543c0f) --- data/cameras.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/cameras.xml b/data/cameras.xml index 699f84c..f11c62c 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -3340,10 +3340,10 @@ Olympus SP570UZ - GREEN - RED - BLUE - GREEN + BLUE + GREEN + GREEN + RED From d3c9928607c5b60be310118a12339f481b0390bf Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Mon, 15 Aug 2016 15:32:30 +0300 Subject: [PATCH 19/36] NIKON D300: all the 12bit/14bit modes. Reported by Jack Massey on IRC, with a sample. The sample looked very dark, but had purple highlights. We should probably just stop loading NEF's unless that specific mode is listed in cameras.xml, else we are quite likely to be providing broken images. Especially since that is what we do for the cameras that are entirely not listed in cameras.xml --- data/cameras.xml | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/data/cameras.xml b/data/cameras.xml index f11c62c..1fe3e44 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -1859,7 +1859,7 @@ - + Nikon D300 RED @@ -1870,6 +1870,39 @@ + + Nikon D300 + + RED + GREEN + GREEN + BLUE + + + + + + Nikon D300 + + RED + GREEN + GREEN + BLUE + + + + + + Nikon D300 + + RED + GREEN + GREEN + BLUE + + + + Nikon D300S From 1ffaf955dc033596ec2529d0f9b2166776e973b4 Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Mon, 15 Aug 2016 19:34:54 +0300 Subject: [PATCH 20/36] NefDecoder: stop providing the rope for users to hang themselves. This is basically the same problem as with Rw2Decoder. It looks like all the nikon cameras has different modes - 14-bit compressed, 12-bit compressed, 14-bit uncompressed, 12-bit uncompressed. And the problem here is that 14-bit and 12-bit have different white levels. Since NefDecoder::checkSupportInternal() just silently fallbacks to the generic entry, if present (with mode=""), this has result in silently-garbled images. Let's not do that. --- RawSpeed/NefDecoder.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/RawSpeed/NefDecoder.cpp b/RawSpeed/NefDecoder.cpp index b11a87d..b299702 100644 --- a/RawSpeed/NefDecoder.cpp +++ b/RawSpeed/NefDecoder.cpp @@ -372,10 +372,7 @@ void NefDecoder::checkSupportInternal(CameraMetaData *meta) { if (meta->hasCamera(make, model, extended_mode)) this->checkCameraSupported(meta, make, model, extended_mode); - else if (meta->hasCamera(make, model, mode)) - this->checkCameraSupported(meta, make, model, mode); - else - this->checkCameraSupported(meta, make, model, ""); + else this->checkCameraSupported(meta, make, model, mode); } string NefDecoder::getMode() { From dba9e4f9ea8fbeecac7402275994f59c3e43f23a Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Mon, 15 Aug 2016 20:50:17 +0300 Subject: [PATCH 21/36] nikon modes inventory check :( For all the nikon cameras, if only the entry for 14-bit mode are present, this *will* finally break support for 12-bit modes. (as in, rawspeed will stop silently producing subtly broken images) Same for 12-bit modes. This will probably break following cameras: (these have white="0", so i can't guess what they are) (these are apparently actually 16bit, but report as (?)-bit) The basic idea for this commit: $ grep -ri " entries for nikon cameras with missing / empty mode tag. --- data/cameras.xml | 843 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 785 insertions(+), 58 deletions(-) diff --git a/data/cameras.xml b/data/cameras.xml index 1fe3e44..1557063 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -1732,7 +1732,7 @@ - + Nikon D100 GREEN @@ -1743,7 +1743,32 @@ - + + Nikon D100 + + GREEN + RED + BLUE + GREEN + + + + + + Nikon D1 + + BLUE + GREEN + GREEN + RED + + + + + + + + Nikon D1 BLUE @@ -1757,7 +1782,18 @@ - + + Nikon D1H + + BLUE + GREEN + GREEN + RED + + + + + Nikon D1H BLUE @@ -1768,7 +1804,21 @@ - + + Nikon D1X + + BLUE + GREEN + GREEN + RED + + + + + + + + Nikon D1X BLUE @@ -1782,7 +1832,18 @@ - + + Nikon D200 + + GREEN + RED + BLUE + GREEN + + + + + Nikon D200 GREEN @@ -1793,7 +1854,18 @@ - + + Nikon D2H + + GREEN + BLUE + RED + GREEN + + + + + Nikon D2H GREEN @@ -1804,7 +1876,7 @@ - + Nikon D2Hs GREEN @@ -1815,7 +1887,29 @@ - + + Nikon D2Hs + + GREEN + BLUE + RED + GREEN + + + + + + Nikon D2X + + RED + GREEN + GREEN + BLUE + + + + + Nikon D2X RED @@ -1826,7 +1920,18 @@ - + + Nikon D3 + + RED + GREEN + GREEN + BLUE + + + + + Nikon D3 RED @@ -1837,7 +1942,18 @@ - + + Nikon D3S + + RED + GREEN + GREEN + BLUE + + + + + Nikon D3S RED @@ -1848,7 +1964,18 @@ - + + Nikon D3X + + RED + GREEN + GREEN + BLUE + + + + + Nikon D3X RED @@ -1903,7 +2030,18 @@ - + + Nikon D300S + + RED + GREEN + GREEN + BLUE + + + + + Nikon D300S RED @@ -1914,7 +2052,18 @@ - + + Nikon D3000 + + GREEN + BLUE + RED + GREEN + + + + + Nikon D3000 GREEN @@ -1925,7 +2074,18 @@ - + + Nikon D3200 + + RED + GREEN + GREEN + BLUE + + + + + Nikon D3200 RED @@ -1936,7 +2096,21 @@ - + + Nikon D3300 + + RED + GREEN + GREEN + BLUE + + + + + + + + Nikon D3300 RED @@ -1950,7 +2124,18 @@ - + + Nikon D4 + + RED + GREEN + GREEN + BLUE + + + + + Nikon D4 RED @@ -1961,7 +2146,21 @@ - + + Nikon D5 + + RED + GREEN + GREEN + BLUE + + + + + + + + Nikon D5 RED @@ -1975,7 +2174,7 @@ - + Nikon Df RED @@ -1989,7 +2188,21 @@ - + + Nikon Df + + RED + GREEN + GREEN + BLUE + + + + + + + + Nikon D5100 RED @@ -2000,7 +2213,18 @@ - + + Nikon D5100 + + RED + GREEN + GREEN + BLUE + + + + + Nikon D3100 GREEN @@ -2011,7 +2235,29 @@ - + + Nikon D3100 + + GREEN + BLUE + RED + GREEN + + + + + + Nikon D40 + + BLUE + GREEN + GREEN + RED + + + + + Nikon D40 BLUE @@ -2022,7 +2268,18 @@ - + + Nikon D40X + + GREEN + BLUE + RED + GREEN + + + + + Nikon D40X GREEN @@ -2033,7 +2290,18 @@ - + + Nikon D50 + + BLUE + GREEN + GREEN + RED + + + + + Nikon D50 BLUE @@ -2078,7 +2346,18 @@ Nikon D500 - + + Nikon D5000 + + GREEN + BLUE + RED + GREEN + + + + + Nikon D5000 GREEN @@ -2089,7 +2368,18 @@ - + + Nikon D5200 + + RED + GREEN + GREEN + BLUE + + + + + Nikon D5200 RED @@ -2114,7 +2404,35 @@ - + + Nikon D5300 + + RED + GREEN + GREEN + BLUE + + + + + + + + + Nikon D5300 + + RED + GREEN + GREEN + BLUE + + + + + + + + Nikon D5300 RED @@ -2142,7 +2460,21 @@ - + + Nikon D5500 + + RED + GREEN + GREEN + BLUE + + + + + + + + Nikon D5500 RED @@ -2156,7 +2488,32 @@ - + + Nikon D5500 + + RED + GREEN + GREEN + BLUE + + + + + + + + + Nikon D60 + + GREEN + BLUE + RED + GREEN + + + + + Nikon D60 GREEN @@ -2167,7 +2524,7 @@ - + Nikon D600 RED @@ -2178,7 +2535,29 @@ - + + Nikon D600 + + RED + GREEN + GREEN + BLUE + + + + + + Nikon D610 + + RED + GREEN + GREEN + BLUE + + + + + Nikon D610 RED @@ -2189,7 +2568,18 @@ - + + Nikon D70 + + BLUE + GREEN + GREEN + RED + + + + + Nikon D70 BLUE @@ -2200,7 +2590,7 @@ - + Nikon D700 RED @@ -2211,6 +2601,28 @@ + + Nikon D700 + + RED + GREEN + GREEN + BLUE + + + + + + Nikon D700 + + RED + GREEN + GREEN + BLUE + + + + Nikon D700 @@ -2250,7 +2662,7 @@ - + Nikon D7000 RED @@ -2261,7 +2673,29 @@ - + + Nikon D7000 + + RED + GREEN + GREEN + BLUE + + + + + + Nikon D7100 + + RED + GREEN + GREEN + BLUE + + + + + Nikon D7100 RED @@ -2300,7 +2734,7 @@ - + Nikon D70s BLUE @@ -2308,10 +2742,32 @@ GREEN RED - - + + + + + Nikon D70s + + BLUE + GREEN + GREEN + RED + + + + + + Nikon D80 + + GREEN + BLUE + RED + GREEN + + + - + Nikon D80 GREEN @@ -2333,6 +2789,17 @@ + + Nikon D800 + + RED + GREEN + GREEN + BLUE + + + + Nikon D800 @@ -2344,7 +2811,18 @@ - + + Nikon D800 + + RED + GREEN + GREEN + BLUE + + + + + Nikon D800 RED @@ -2366,6 +2844,17 @@ + + Nikon D800E + + RED + GREEN + GREEN + BLUE + + + + Nikon D800E @@ -2377,7 +2866,18 @@ - + + Nikon D800E + + RED + GREEN + GREEN + BLUE + + + + + Nikon D800E RED @@ -2500,7 +3000,7 @@ - + Nikon D4S RED @@ -2514,7 +3014,18 @@ - + + Nikon D90 + + GREEN + BLUE + RED + GREEN + + + + + Nikon D90 GREEN @@ -2547,7 +3058,18 @@ - + + Nikon 1 J3 + + RED + GREEN + GREEN + BLUE + + + + + Nikon 1 J3 RED @@ -2558,7 +3080,21 @@ - + + Nikon 1 J4 + + RED + GREEN + GREEN + BLUE + + + + + + + + Nikon 1 J4 RED @@ -2572,7 +3108,21 @@ - + + Nikon 1 J5 + + RED + GREEN + GREEN + BLUE + + + + + + + + Nikon 1 J5 RED @@ -2597,7 +3147,21 @@ - + + Nikon 1 S2 + + RED + GREEN + GREEN + BLUE + + + + + + + + Nikon 1 S2 RED @@ -2622,7 +3186,18 @@ - + + Nikon 1 V2 + + RED + GREEN + GREEN + BLUE + + + + + Nikon 1 V2 RED @@ -2633,7 +3208,21 @@ - + + Nikon 1 V3 + + RED + GREEN + GREEN + BLUE + + + + + + + + Nikon 1 V3 RED @@ -2647,7 +3236,7 @@ - + Nikon 1 AW1 RED @@ -2658,7 +3247,32 @@ - + + Nikon 1 AW1 + + RED + GREEN + GREEN + BLUE + + + + + + Nikon E5400 + + BLUE + GREEN + GREEN + RED + + + + + + + + Nikon E5400 BLUE @@ -2672,7 +3286,21 @@ - + + Nikon E5700 + + FUJI_GREEN + MAGENTA + YELLOW + CYAN + + + + + + + + Nikon E5700 FUJI_GREEN @@ -2686,7 +3314,21 @@ - + + Nikon E8400 + + BLUE + GREEN + GREEN + RED + + + + + + + + Nikon E8400 BLUE @@ -2715,7 +3357,18 @@ - + + Nikon Coolpix P340 + + RED + GREEN + GREEN + BLUE + + + + + Nikon Coolpix P340 RED @@ -2726,7 +3379,18 @@ - + + Nikon Coolpix A + + RED + GREEN + GREEN + BLUE + + + + + Nikon Coolpix A RED @@ -2737,7 +3401,22 @@ - + + Nikon Coolpix P6000 + + RED + GREEN + GREEN + + BLUE + + + + + + + + Nikon Coolpix P6000 RED @@ -2752,7 +3431,24 @@ - + + Nikon Coolpix P7000 + + RED + GREEN + GREEN + BLUE + + + + + + + + + + + Nikon Coolpix P7000 RED @@ -2769,7 +3465,24 @@ - + + Nikon Coolpix P7100 + + RED + GREEN + GREEN + BLUE + + + + + + + + + + + Nikon Coolpix P7100 RED @@ -2816,7 +3529,21 @@ - + + Nikon Coolpix E8800 + + BLUE + GREEN + GREEN + RED + + + + + + + + Nikon Coolpix E8800 BLUE From 12a3cd40255c52e7a11dbcd8cf7eb029e56b299a Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Mon, 15 Aug 2016 21:00:28 +0300 Subject: [PATCH 22/36] add NIKON D7000 mode 14bit. Was caught thanks to last few commits... --- data/cameras.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/data/cameras.xml b/data/cameras.xml index 1557063..5ff5617 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -2662,6 +2662,28 @@ + + Nikon D7000 + + RED + GREEN + GREEN + BLUE + + + + + + Nikon D7000 + + RED + GREEN + GREEN + BLUE + + + + Nikon D7000 From 2f0641b6aee8898606e5c0d4692bf2ae3c0ed59b Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Mon, 15 Aug 2016 21:09:23 +0300 Subject: [PATCH 23/36] add NIKON D300S mode 12bit. Was caught thanks to last few commits... --- data/cameras.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/data/cameras.xml b/data/cameras.xml index 5ff5617..51a7ee9 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -2052,6 +2052,28 @@ + + Nikon D300S + + RED + GREEN + GREEN + BLUE + + + + + + Nikon D300S + + RED + GREEN + GREEN + BLUE + + + + Nikon D3000 From dd17261bf7eef011c36e9f0ae0746c317c0a0ca1 Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Mon, 15 Aug 2016 22:53:33 +0300 Subject: [PATCH 24/36] Nikon D500: uncompressed (supported="no"): add tags from compressed --- data/cameras.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/data/cameras.xml b/data/cameras.xml index 51a7ee9..c69a627 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -2350,6 +2350,17 @@ Nikon D500 + + RED + GREEN + GREEN + BLUE + + + + + + Nikon D500 @@ -2367,6 +2378,17 @@ Nikon D500 + + RED + GREEN + GREEN + BLUE + + + + + + Nikon D5000 From 67bfca644c0f683f7c632150f0f68af40a644e7f Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Mon, 15 Aug 2016 23:14:25 +0300 Subject: [PATCH 25/36] add NIKON D5200 mode 14bit. Was caught thanks to last few commits... --- data/cameras.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/data/cameras.xml b/data/cameras.xml index c69a627..9436bc7 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -2412,6 +2412,28 @@ + + Nikon D5200 + + RED + GREEN + GREEN + BLUE + + + + + + Nikon D5200 + + RED + GREEN + GREEN + BLUE + + + + Nikon D5200 From 8655450d6c8226b4261c7941aa27b49a196b3dd4 Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Mon, 15 Aug 2016 23:16:13 +0300 Subject: [PATCH 26/36] NIKON D5000 mode 12bit: fix whitelevel... ????????? --- data/cameras.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/cameras.xml b/data/cameras.xml index 9436bc7..cd27b8e 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -2399,7 +2399,7 @@ GREEN - + Nikon D5000 @@ -2410,7 +2410,7 @@ GREEN - + Nikon D5200 From 794aae068166bc8731cd44570aec69677dbaac4c Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Mon, 15 Aug 2016 23:20:10 +0300 Subject: [PATCH 27/36] NIKON D3 mode 14bit: fix whitelevel... ????????? --- data/cameras.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/cameras.xml b/data/cameras.xml index cd27b8e..1998c59 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -1929,7 +1929,7 @@ BLUE - + Nikon D3 @@ -1940,7 +1940,7 @@ BLUE - + Nikon D3S From 618b76e5c7df0dc57eea1b74578b818ecae967b2 Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Mon, 15 Aug 2016 23:20:51 +0300 Subject: [PATCH 28/36] NIKON D3X mode 14bit: fix whitelevel... ????????? --- data/cameras.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/cameras.xml b/data/cameras.xml index 1998c59..58f556f 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -1973,7 +1973,7 @@ BLUE - + Nikon D3X @@ -1984,7 +1984,7 @@ BLUE - + Nikon D300 From bee3051af20178e077f4999e2ecf485cb9b04e57 Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Tue, 16 Aug 2016 10:44:42 +0300 Subject: [PATCH 29/36] NIKON D7200: add uncompressed modes too. This is a blind commit, without samples. --- data/cameras.xml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/data/cameras.xml b/data/cameras.xml index 58f556f..0d05766 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -2808,6 +2808,20 @@ + + Nikon D7200 + + RED + GREEN + GREEN + BLUE + + + + + + + Nikon D7200 @@ -2822,6 +2836,20 @@ + + Nikon D7200 + + RED + GREEN + GREEN + BLUE + + + + + + + Nikon D70s From cb06d49196a2c6ba1068f2d31a0ad474086cd34b Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Tue, 16 Aug 2016 10:44:54 +0300 Subject: [PATCH 30/36] NIKON D750: add uncompressed modes too. This is a blind commit, without samples. --- data/cameras.xml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/data/cameras.xml b/data/cameras.xml index 0d05766..bc77a05 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -2714,6 +2714,20 @@ + + Nikon D750 + + RED + GREEN + GREEN + BLUE + + + + + + + Nikon D750 @@ -2728,6 +2742,20 @@ + + Nikon D750 + + RED + GREEN + GREEN + BLUE + + + + + + + Nikon D7000 From 2f7a2ed25ed31fca3936f0f6d611ddfa27efb510 Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Tue, 16 Aug 2016 10:58:18 +0300 Subject: [PATCH 31/36] nikon: add 12bit entries if not present for all 14-bit For all nikon cameras with 14-bit entries and no 12-bit entries, add 12-bit entries with obviously-wrong white level, and supported="no". This way the users will not recieve garbled images, and once they provide a sample, the support can be easily added by setting appropriate whitelevel and removing supported="no" --- data/cameras.xml | 298 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 298 insertions(+) diff --git a/data/cameras.xml b/data/cameras.xml index bc77a05..fab9698 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -1942,6 +1942,28 @@ + + Nikon D3 + + RED + GREEN + GREEN + BLUE + + + + + + Nikon D3 + + RED + GREEN + GREEN + BLUE + + + + Nikon D3S @@ -1964,6 +1986,28 @@ + + Nikon D3S + + RED + GREEN + GREEN + BLUE + + + + + + Nikon D3S + + RED + GREEN + GREEN + BLUE + + + + Nikon D3X @@ -1986,6 +2030,28 @@ + + Nikon D3X + + RED + GREEN + GREEN + BLUE + + + + + + Nikon D3X + + RED + GREEN + GREEN + BLUE + + + + Nikon D300 @@ -2096,6 +2162,28 @@ + + Nikon D3000 + + GREEN + BLUE + RED + GREEN + + + + + + Nikon D3000 + + GREEN + BLUE + RED + GREEN + + + + Nikon D3200 @@ -2118,6 +2206,28 @@ + + Nikon D3200 + + RED + GREEN + GREEN + BLUE + + + + + + Nikon D3200 + + RED + GREEN + GREEN + BLUE + + + + Nikon D3300 @@ -2168,6 +2278,28 @@ + + Nikon D4 + + RED + GREEN + GREEN + BLUE + + + + + + Nikon D4 + + RED + GREEN + GREEN + BLUE + + + + Nikon D5 @@ -2196,6 +2328,34 @@ + + Nikon D5 + + RED + GREEN + GREEN + BLUE + + + + + + + + + Nikon D5 + + RED + GREEN + GREEN + BLUE + + + + + + + Nikon Df @@ -2224,6 +2384,34 @@ + + Nikon Df + + RED + GREEN + GREEN + BLUE + + + + + + + + + Nikon Df + + RED + GREEN + GREEN + BLUE + + + + + + + Nikon D5100 @@ -2246,6 +2434,28 @@ + + Nikon D5100 + + RED + GREEN + GREEN + BLUE + + + + + + Nikon D5100 + + RED + GREEN + GREEN + BLUE + + + + Nikon D3100 @@ -2268,6 +2478,28 @@ + + Nikon D3100 + + GREEN + BLUE + RED + GREEN + + + + + + Nikon D3100 + + GREEN + BLUE + RED + GREEN + + + + Nikon D40 @@ -2612,6 +2844,28 @@ + + Nikon D600 + + RED + GREEN + GREEN + BLUE + + + + + + Nikon D600 + + RED + GREEN + GREEN + BLUE + + + + Nikon D610 @@ -2634,6 +2888,28 @@ + + Nikon D610 + + RED + GREEN + GREEN + BLUE + + + + + + Nikon D610 + + RED + GREEN + GREEN + BLUE + + + + Nikon D70 @@ -2822,6 +3098,28 @@ + + Nikon D7100 + + RED + GREEN + GREEN + BLUE + + + + + + Nikon D7100 + + RED + GREEN + GREEN + BLUE + + + + Nikon D7200 From 7756ebd8ddc192a0ad9e663d7035ae70bff3b9ff Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Wed, 17 Aug 2016 13:37:37 +0300 Subject: [PATCH 32/36] CameraMetaData: avoid use-after free in case of duplicates If you duplicate any camera entry, rawspeed detects it: RawSpeed:CameraMetaData: Duplicate entry found for camera: , Skipping! It deletes the camera, but the caller then just continues to operate with freed pointer. ================================================================= ==32315==ERROR: AddressSanitizer: heap-use-after-free on address 0x614000058328 at pc 0x7fa0d8ba31c5 bp 0x7fa0c0f52ae0 sp 0x7fa0c0f52ad8 READ of size 8 at 0x614000058328 thread T1 0 0x7fa0d8ba31c4 in RawSpeed::CameraMetaData::CameraMetaData(char const*) /home/lebedevri/darktable/src/external/rawspeed/RawSpeed/CameraMetaData.cpp:41 1 0x7fa0d89a9d4b in dt_rawspeed_load_meta /home/lebedevri/darktable/src/common/imageio_rawspeed.cc:64 2 0x7fa0d89aa3d1 in dt_rawspeed_lookup_makermodel /home/lebedevri/darktable/src/common/imageio_rawspeed.cc:76 3 0x7fa0d898cf48 in dt_image_refresh_makermodel /home/lebedevri/darktable/src/common/image.c:1026 4 0x7fa0d899641e in dt_image_cache_allocate /home/lebedevri/darktable/src/common/image_cache.c:127 5 0x7fa0d892c8b9 in dt_cache_get_with_caller /home/lebedevri/darktable/src/common/cache.c:206 6 0x7fa0d89974dc in dt_image_cache_get /home/lebedevri/darktable/src/common/image_cache.c:169 7 0x7fa0d89c2957 in dt_mipmap_cache_get_with_caller /home/lebedevri/darktable/src/common/mipmap_cache.c:685 8 0x7fa0d8a0d74d in dt_image_load_job_run /home/lebedevri/darktable/src/control/jobs/image_jobs.c:35 9 0x7fa0d8a015db in dt_control_run_job /home/lebedevri/darktable/src/control/jobs.c:306 10 0x7fa0d8a015db in dt_control_work /home/lebedevri/darktable/src/control/jobs.c:540 11 0x7fa0d4487463 in start_thread (/lib/x86_64-linux-gnu/libpthread.so.0+0x7463) 12 0x7fa0d09bf30c in clone (/lib/x86_64-linux-gnu/libc.so.6+0xe730c) 0x614000058328 is located 232 bytes inside of 432-byte region [0x614000058240,0x6140000583f0) freed by thread T1 here: 0 0x7fa0d8e8b2d0 in operator delete(void*) (/usr/lib/x86_64-linux-gnu/libasan.so.3+0xc32d0) 1 0x7fa0d8ba1aad in RawSpeed::CameraMetaData::addCamera(RawSpeed::Camera*) /home/lebedevri/darktable/src/external/rawspeed/RawSpeed/CameraMetaData.cpp:87 2 0x7fa0d8ba2f2e in RawSpeed::CameraMetaData::CameraMetaData(char const*) /home/lebedevri/darktable/src/external/rawspeed/RawSpeed/CameraMetaData.cpp:42 3 0x7fa0d89a9d4b in dt_rawspeed_load_meta /home/lebedevri/darktable/src/common/imageio_rawspeed.cc:64 4 0x7fa0d89aa3d1 in dt_rawspeed_lookup_makermodel /home/lebedevri/darktable/src/common/imageio_rawspeed.cc:76 5 0x7fa0d898cf48 in dt_image_refresh_makermodel /home/lebedevri/darktable/src/common/image.c:1026 6 0x7fa0d899641e in dt_image_cache_allocate /home/lebedevri/darktable/src/common/image_cache.c:127 7 0x7fa0d892c8b9 in dt_cache_get_with_caller /home/lebedevri/darktable/src/common/cache.c:206 8 0x7fa0d89974dc in dt_image_cache_get /home/lebedevri/darktable/src/common/image_cache.c:169 9 0x7fa0d89c2957 in dt_mipmap_cache_get_with_caller /home/lebedevri/darktable/src/common/mipmap_cache.c:685 10 0x7fa0d8a0d74d in dt_image_load_job_run /home/lebedevri/darktable/src/control/jobs/image_jobs.c:35 11 0x7fa0d8a015db in dt_control_run_job /home/lebedevri/darktable/src/control/jobs.c:306 12 0x7fa0d8a015db in dt_control_work /home/lebedevri/darktable/src/control/jobs.c:540 13 0x7fa0d4487463 in start_thread (/lib/x86_64-linux-gnu/libpthread.so.0+0x7463) previously allocated by thread T1 here: 0 0x7fa0d8e8acd0 in operator new(unsigned long) (/usr/lib/x86_64-linux-gnu/libasan.so.3+0xc2cd0) 1 0x7fa0d8ba2f11 in RawSpeed::CameraMetaData::CameraMetaData(char const*) /home/lebedevri/darktable/src/external/rawspeed/RawSpeed/CameraMetaData.cpp:41 2 0x7fa0d89a9d4b in dt_rawspeed_load_meta /home/lebedevri/darktable/src/common/imageio_rawspeed.cc:64 3 0x7fa0d89aa3d1 in dt_rawspeed_lookup_makermodel /home/lebedevri/darktable/src/common/imageio_rawspeed.cc:76 4 0x7fa0d898cf48 in dt_image_refresh_makermodel /home/lebedevri/darktable/src/common/image.c:1026 5 0x7fa0d899641e in dt_image_cache_allocate /home/lebedevri/darktable/src/common/image_cache.c:127 6 0x7fa0d892c8b9 in dt_cache_get_with_caller /home/lebedevri/darktable/src/common/cache.c:206 7 0x7fa0d89974dc in dt_image_cache_get /home/lebedevri/darktable/src/common/image_cache.c:169 8 0x7fa0d89c2957 in dt_mipmap_cache_get_with_caller /home/lebedevri/darktable/src/common/mipmap_cache.c:685 9 0x7fa0d8a0d74d in dt_image_load_job_run /home/lebedevri/darktable/src/control/jobs/image_jobs.c:35 10 0x7fa0d8a015db in dt_control_run_job /home/lebedevri/darktable/src/control/jobs.c:306 11 0x7fa0d8a015db in dt_control_work /home/lebedevri/darktable/src/control/jobs.c:540 12 0x7fa0d4487463 in start_thread (/lib/x86_64-linux-gnu/libpthread.so.0+0x7463) Thread T1 created by T0 here: 0 0x7fa0d8df9039 in pthread_create (/usr/lib/x86_64-linux-gnu/libasan.so.3+0x31039) 1 0x7fa0d8a01dcc in dt_control_jobs_init /home/lebedevri/darktable/src/control/jobs.c:596 2 0x7fa0d89f7b6d in dt_control_init /home/lebedevri/darktable/src/control/control.c:119 3 0x7fa0d894d65c in dt_init /home/lebedevri/darktable/src/common/darktable.c:932 4 0x400c6f in main /home/lebedevri/darktable/src/main.c:24 5 0x7fa0d08f872f in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x2072f) SUMMARY: AddressSanitizer: heap-use-after-free /home/lebedevri/darktable/src/external/rawspeed/RawSpeed/CameraMetaData.cpp:41 in RawSpeed::CameraMetaData::CameraMetaData(char const*) --- RawSpeed/CameraMetaData.cpp | 8 +++++--- RawSpeed/CameraMetaData.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/RawSpeed/CameraMetaData.cpp b/RawSpeed/CameraMetaData.cpp index 25aeb4e..d0481b4 100644 --- a/RawSpeed/CameraMetaData.cpp +++ b/RawSpeed/CameraMetaData.cpp @@ -39,7 +39,8 @@ CameraMetaData::CameraMetaData(const char *docname) { for (xml_node camera = cameras.child("Camera"); camera; camera = camera.next_sibling("Camera")) { Camera *cam = new Camera(camera); - addCamera(cam); + + if(!addCamera(cam)) continue; // Create cameras for aliases. for (uint32 i = 0; i < cam->aliases.size(); i++) { @@ -79,13 +80,13 @@ bool CameraMetaData::hasChdkCamera(uint32 filesize) { return chdkCameras.end() != chdkCameras.find(filesize); } -void CameraMetaData::addCamera( Camera* cam ) +bool CameraMetaData::addCamera( Camera* cam ) { string id = string(cam->make).append(cam->model).append(cam->mode); if (cameras.end() != cameras.find(id)) { writeLog(DEBUG_PRIO_WARNING, "CameraMetaData: Duplicate entry found for camera: %s %s, Skipping!\n", cam->make.c_str(), cam->model.c_str()); delete(cam); - return; + return false; } else { cameras[id] = cam; } @@ -100,6 +101,7 @@ void CameraMetaData::addCamera( Camera* cam ) // writeLog(DEBUG_PRIO_WARNING, "CHDK camera: %s %s size:%u\n", cam->make.c_str(), cam->model.c_str(), size); } } + return true; } void CameraMetaData::disableMake( string make ) diff --git a/RawSpeed/CameraMetaData.h b/RawSpeed/CameraMetaData.h index bbbe1a3..eeaeca4 100644 --- a/RawSpeed/CameraMetaData.h +++ b/RawSpeed/CameraMetaData.h @@ -43,7 +43,7 @@ class CameraMetaData void disableMake(string make); void disableCamera(string make, string model); protected: - void addCamera(Camera* cam); + bool addCamera(Camera* cam); }; } // namespace RawSpeed From afbbdbd4336212f1b7559209466a7086e7e0d069 Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Wed, 17 Aug 2016 19:33:40 +0300 Subject: [PATCH 33/36] Nikon: fixup crop for D800{,E} 14bit-compressed Was erroneously set to that value in 53af22a7d8b255f386bf1c012c2202d3324d3c75 Reported by Pascal Obry. --- data/cameras.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/cameras.xml b/data/cameras.xml index fab9698..e1dd460 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -3239,7 +3239,7 @@ GREEN BLUE - + @@ -3294,7 +3294,7 @@ GREEN BLUE - + From a2b651329edf2d8a79d7399794d8f914762000a1 Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Wed, 17 Aug 2016 19:34:44 +0300 Subject: [PATCH 34/36] Nikon: disable D7200 and D750 mode uncompressed Was added in 53af22a7d8b255f386bf1c012c2202d3324d3c75. But there is no sample to verify it... --- data/cameras.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/cameras.xml b/data/cameras.xml index e1dd460..34b3c50 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -2990,7 +2990,7 @@ - + Nikon D750 RED @@ -3018,7 +3018,7 @@ - + Nikon D750 RED @@ -3134,7 +3134,7 @@ - + Nikon D7200 RED @@ -3162,7 +3162,7 @@ - + Nikon D7200 RED From f6fbf0655b43119cbe1f2dcc2d752ad31e77ef96 Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Sat, 20 Aug 2016 17:12:44 +0300 Subject: [PATCH 35/36] NIKON D3100 12bit support. --- data/cameras.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/cameras.xml b/data/cameras.xml index 34b3c50..89fdae2 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -2478,7 +2478,7 @@ - + Nikon D3100 GREEN @@ -2487,9 +2487,9 @@ GREEN - + - + Nikon D3100 GREEN @@ -2498,7 +2498,7 @@ GREEN - + Nikon D40 From 7a87e0f918252bafce80ccc712e06b30ca9c0b38 Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Wed, 24 Aug 2016 20:49:24 +0300 Subject: [PATCH 36/36] Add support for raw images from GITUP GIT2 action camera. The raw file is just plain sensor dump. Has no metadata at all. Not even TIFF. --- data/cameras.xml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/data/cameras.xml b/data/cameras.xml index 89fdae2..20d67c4 100644 --- a/data/cameras.xml +++ b/data/cameras.xml @@ -10407,6 +10407,38 @@ + + GITUP GIT2 + + RED + GREEN + GREEN + BLUE + + + + + + + + + + + GITUP GIT2 + + RED + GREEN + GREEN + BLUE + + + + + + + + +