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

merge with dev

Browse Source
This commit is contained in:
Desmis
2019-03-28 21:28:01 +01:00
parent 06b2826c14 68ba87a71f
commit e8847a6639
6 changed files with 2030 additions and 2011 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
rtexif/nikonattribs.cc
View File

@@ -1148,7 +1148,26 @@ const std::map<std::string, std::string> NALensDataInterpreter::lenses = {
{"FE 53 5C 80 24 24 84 06", "Tamron SP AF 70-200mm f/2.8 Di LD (IF) Macro (A001)"}, {"FE 53 5C 80 24 24 84 06", "Tamron SP AF 70-200mm f/2.8 Di LD (IF) Macro (A001)"},
{"FE 54 5C 80 24 24 DF 0E", "Tamron SP 70-200mm f/2.8 Di VC USD (A009)"}, {"FE 54 5C 80 24 24 DF 0E", "Tamron SP 70-200mm f/2.8 Di VC USD (A009)"},
{"FE 54 64 64 24 24 DF 0E", "Tamron SP 90mm f/2.8 Di VC USD Macro 1:1 (F004)"}, {"FE 54 64 64 24 24 DF 0E", "Tamron SP 90mm f/2.8 Di VC USD Macro 1:1 (F004)"},
{"FF 40 2D 80 2C 40 4B 06", "Sigma 18-200mm f/3.5-6.3 DC"} {"FF 40 2D 80 2C 40 4B 06", "Sigma 18-200mm f/3.5-6.3 DC"},
// There are cases where one lens uses multiple IDs which change based on the focal length or aperture.
// These IDs cannot be listed using ExifTool, and so must be entered manually below.
// #4135
{"92 2B 2D 88 2C 40 4B 0E", "Sigma 18-250mm f/3.5-6.3 DC Macro OS HSM"}, // (210mm)
{"92 2C 2D 88 2C 40 4B 0E", "Sigma 18-250mm f/3.5-6.3 DC Macro OS HSM"}, // (185mm)
{"92 2D 2D 88 2C 40 4B 0E", "Sigma 18-250mm f/3.5-6.3 DC Macro OS HSM"}, // (155mm)
{"92 2E 2D 88 2C 40 4B 0E", "Sigma 18-250mm f/3.5-6.3 DC Macro OS HSM"}, // (130mm)
{"92 2F 2D 88 2C 40 4B 0E", "Sigma 18-250mm f/3.5-6.3 DC Macro OS HSM"}, // (105mm)
{"92 30 2D 88 2C 40 4B 0E", "Sigma 18-250mm f/3.5-6.3 DC Macro OS HSM"}, // (90mm)
{"92 32 2D 88 2C 40 4B 0E", "Sigma 18-250mm f/3.5-6.3 DC Macro OS HSM"}, // (75mm)
{"92 33 2D 88 2C 40 4B 0E", "Sigma 18-250mm f/3.5-6.3 DC Macro OS HSM"}, // (62mm)
{"92 35 2D 88 2C 40 4B 0E", "Sigma 18-250mm f/3.5-6.3 DC Macro OS HSM"}, // (52mm)
{"92 37 2D 88 2C 40 4B 0E", "Sigma 18-250mm f/3.5-6.3 DC Macro OS HSM"}, // (44mm)
{"92 39 2D 88 2C 40 4B 0E", "Sigma 18-250mm f/3.5-6.3 DC Macro OS HSM"}, // (38mm)
{"92 3A 2D 88 2C 40 4B 0E", "Sigma 18-250mm f/3.5-6.3 DC Macro OS HSM"}, // (32mm)
{"92 3E 2D 88 2C 40 4B 0E", "Sigma 18-250mm f/3.5-6.3 DC Macro OS HSM"}, // (22mm)
{"92 40 2D 88 2C 40 4B 0E", "Sigma 18-250mm f/3.5-6.3 DC Macro OS HSM"} // (18mm)
}; };
const TagAttrib nikonISOInfoAttribs[] = { const TagAttrib nikonISOInfoAttribs[] = {

10
rtgui/editwidgets.cc
View File

@@ -731,23 +731,23 @@ OPIcon::OPIcon(Glib::ustring normalImage, Glib::ustring activeImage, Glib::ustri
Glib::ustring draggedImage, Glib::ustring insensitiveImage, DrivenPoint drivenPoint) : drivenPoint(drivenPoint) Glib::ustring draggedImage, Glib::ustring insensitiveImage, DrivenPoint drivenPoint) : drivenPoint(drivenPoint)
{ {
if (!normalImage.empty()) { if (!normalImage.empty()) {
normalImg->setImage(normalImage); normalImg = Cairo::RefPtr<RTSurface>(new RTSurface(normalImage));
} }
if (!prelightImage.empty()) { if (!prelightImage.empty()) {
prelightImg->setImage(prelightImage); prelightImg = Cairo::RefPtr<RTSurface>(new RTSurface(prelightImage));
} }
if (!activeImage.empty()) { if (!activeImage.empty()) {
activeImg->setImage(activeImage); activeImg = Cairo::RefPtr<RTSurface>(new RTSurface(activeImage));
} }
if (!draggedImage.empty()) { if (!draggedImage.empty()) {
draggedImg->setImage(draggedImage); draggedImg = Cairo::RefPtr<RTSurface>(new RTSurface(draggedImage));
} }
if (!insensitiveImage.empty()) { if (!insensitiveImage.empty()) {
insensitiveImg->setImage(insensitiveImage); insensitiveImg = Cairo::RefPtr<RTSurface>(new RTSurface(insensitiveImage));
} }
} }