Merge remote-tracking branch 'upstream/pr/1445'

* upstream/pr/1445: noise profile: add Canon Powershot G7 X Mark II, fixes #11501
darktable-org · Feb 17, 2017 · c773a18 · c773a18
2 parents 7a6529f + 4b5a26b
commit c773a18
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/data/noiseprofiles.json b/data/noiseprofiles.json
@@ -196,6 +196,33 @@
             {"name": "PowerShot G7 X iso 800", "iso": 800, "a": [0.000119723997899977, 4.93802558606591e-05, 9.68441361952425e-05], "b": [1.80499616345235e-07, 1.25923980166345e-07, 1.68922567213427e-07]}
           ]
         },
+        {
+          "comment": "powershot g7 x mark ii contributed by mariano",
+          "model": "PowerShot G7 X Mark II",
+          "profiles": [
+            {"name": "PowerShot G7 X Mark II iso 125", "iso": 125, "a": [1.06935133377294e-05, 1.00550358890388e-05, 4.13826960261977e-05], "b": [2.12312093053528e-08, -1.62220882963983e-08, -6.43505084400269e-09]},
+            {"name": "PowerShot G7 X Mark II iso 160", "iso": 160, "a": [1.41924958180789e-05, 1.12890228293744e-05, 4.57364966213153e-05], "b": [1.17944487227951e-08, 1.20181565749208e-08, 4.87935359794542e-08]},
+            {"name": "PowerShot G7 X Mark II iso 200", "iso": 200, "a": [1.6019548250256e-05, 1.35368424441407e-05, 5.49895799699785e-05], "b": [2.21538321747858e-08, 6.10681799492254e-09, 6.03149474029967e-08]},
+            {"name": "PowerShot G7 X Mark II iso 250", "iso": 250, "a": [1.88625087245583e-05, 1.62907844339081e-05, 6.73318044584856e-05], "b": [5.6456340188443e-08, 2.91054465018343e-08, 9.7334472038177e-08]},
+            {"name": "PowerShot G7 X Mark II iso 320", "iso": 320, "a": [2.34349678079496e-05, 2.01449876769379e-05, 6.84283107580354e-05], "b": [9.00745437394801e-08, 5.64859745530566e-08, 2.11337921311363e-07]},
+            {"name": "PowerShot G7 X Mark II iso 400", "iso": 400, "a": [5.6911440279177e-05, 2.24852582291037e-05, 3.48988851758936e-05], "b": [-1.17742962658112e-07, 4.28238195298461e-08, 1.94726473118584e-07]},
+            {"name": "PowerShot G7 X Mark II iso 500", "iso": 500, "a": [6.99856544228826e-05, 2.78278722081667e-05, 4.30933772072822e-05], "b": [-2.18499716445543e-07, 6.01365337752333e-08, 2.81839641620175e-07]},
+            {"name": "PowerShot G7 X Mark II iso 640", "iso": 640, "a": [8.55171244683898e-05, 3.40648750480151e-05, 5.45629410704495e-05], "b": [-9.84857479078553e-08, 1.19499389863408e-07, 3.17166864272111e-07]},
+            {"name": "PowerShot G7 X Mark II iso 800", "iso": 800, "a": [8.7295839268937e-05, 3.97762405610494e-05, 5.09359123186171e-05], "b": [-6.63535066849235e-08, 1.7555412672144e-07, 5.62879836831656e-07]},
+            {"name": "PowerShot G7 X Mark II iso 1000", "iso": 1000, "a": [0.000141929023993355, 5.44470621868961e-05, 7.40270360562961e-05], "b": [-2.9169720976641e-07, 2.04989457987547e-07, 6.05792781159337e-07]},
+            {"name": "PowerShot G7 X Mark II iso 1250", "iso": 1250, "a": [0.000162856305258218, 6.95756802056634e-05, 0.000112273901348038], "b": [-1.30457948717608e-07, 2.59381393813685e-07, 6.31868796737214e-07]},
+            {"name": "PowerShot G7 X Mark II iso 1600", "iso": 1600, "a": [8.9869180641876e-05, 8.12181591789464e-05, 0.00037039898069506], "b": [8.83892299062382e-07, 2.7435604894914e-07, 9.86964270431402e-08]},
+            {"name": "PowerShot G7 X Mark II iso 2000", "iso": 2000, "a": [0.000112062548407812, 9.95732435584513e-05, 0.000362506795126356], "b": [1.34204332451866e-06, 5.29302362111498e-07, 2.63202934020444e-06]},
+            {"name": "PowerShot G7 X Mark II iso 2500", "iso": 2500, "a": [0.000141471208039253, 0.000123258930290636, 0.00053838192930081], "b": [1.24285899115696e-06, 7.6501504971041e-07, 9.73786653812927e-07]},
+            {"name": "PowerShot G7 X Mark II iso 3200", "iso": 3200, "a": [0.000183015334304001, 0.000154323757995835, 0.000698875446552585], "b": [1.42367305014125e-06, 1.88744924849388e-06, 5.10875051792612e-06]},
+            {"name": "PowerShot G7 X Mark II iso 4000", "iso": 4000, "a": [0.000274054142962489, 0.000195518271899586, 0.000614438186199257], "b": [1.27524568623463e-06, 1.88620193284058e-06, 6.34959530263886e-06]},
+            {"name": "PowerShot G7 X Mark II iso 5000", "iso": 5000, "a": [0.000286501534227043, 0.000240680090527953, 5.68848260215146e-05], "b": [6.8373416327802e-06, 2.9787127831731e-06, 4.90992869072545e-05]},
+            {"name": "PowerShot G7 X Mark II iso 6400", "iso": 6400, "a": [0.000331255172605134, 0.000297108210639488, 0.00133601209104009], "b": [8.66110421116362e-06, 5.21013663033006e-06, 1.35819715828872e-06]},
+            {"name": "PowerShot G7 X Mark II iso 8000", "iso": 8000, "a": [0.00110689236968198, 0.000401836070762736, 0.000505535475596215], "b": [2.13798536789686e-06, 4.66954155211054e-06, 4.20369449483539e-06]},
+            {"name": "PowerShot G7 X Mark II iso 10000", "iso": 10000, "a": [0.000672674586355028, 0.000611624042729493, 0.00179572484717187], "b": [4.95726593098577e-06, 3.50617989536728e-06, 2.31662821686309e-06]},
+            {"name": "PowerShot G7 X Mark II iso 12800", "iso": 12800, "a": [0.00172832884019693, 0.000647089726943206, 0.000851192081451353], "b": [4.63571678267481e-06, 9.30747700171677e-06, 7.42848348404348e-06]}
+          ]
+        },
         {
           "comment": "eos 1200d contributed by aitatxoborja",
           "model": "EOS 1200D",

diff --git a/data/noiseprofiles.schema b/data/noiseprofiles.schema
@@ -49,7 +49,7 @@
                   "type": "string",
                   "pattern": "^[a-zA-Z0-9\\- \\*]+$",
                   "minLength": 2,
-                  "maxLength": 18
+                  "maxLength": 22
                 },
                 "profiles": {
                   "type": "array",