liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Beep6581/RawTherapee into dev

Browse Source
This commit is contained in:
Morgan Hardwood
2020-02-18 20:03:30 +01:00
parent 020051fd4b e7a4ae3c9f
commit 17767ce0aa
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/camconst.json
View File

@@ -1221,7 +1221,7 @@ Camera constants:
{ // Quality A, changes for raw crop which is wrong (larger) in dcraw { // Quality A, changes for raw crop which is wrong (larger) in dcraw
"make_model": "Canon PowerShot S120", "make_model": "Canon PowerShot S120",
"dcraw_matrix": [ 6961, -1685, -695, -4625, 12945, 1836, -1114, 2152, 5518 ] // ColorMatrix2 using illuminant D65 from Adobe DNG Converter 12.2 "dcraw_matrix": [ 6961, -1685, -695, -4625, 12945, 1836, -1114, 2152, 5518 ], // ColorMatrix2 using illuminant D65 from Adobe DNG Converter 12.2
"raw_crop": [ 120, 30, 4024, 3030 ], "raw_crop": [ 120, 30, 4024, 3030 ],
"masked_areas": [ 32, 2, 3028, 80 ], "masked_areas": [ 32, 2, 3028, 80 ],
"ranges": { "white": 4050 } "ranges": { "white": 4050 }

2
rtgui/rtwindow.cc
View File

@@ -99,6 +99,8 @@ RTWindow::RTWindow ()
, bpanel (nullptr) , bpanel (nullptr)
, splash (nullptr) , splash (nullptr)
, btn_fullscreen (nullptr) , btn_fullscreen (nullptr)
, iFullscreen (nullptr)
, iFullscreen_exit (nullptr)
, epanel (nullptr) , epanel (nullptr)
, fpanel (nullptr) , fpanel (nullptr)
{ {