Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3789
Modified Files:
wb_presets.c
Log Message:
Add WB presets for the OLYMPUS E-M10 and the SAMSUNG NX300M. Stolen from
Darktable.
Index: wb_presets.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -d -r1.291 -r1.292
--- wb_presets.c 13 Nov 2014 03:15:07 -0000 1.291
+++ wb_presets.c 26 Nov 2014 03:30:10 -0000 1.292
@@ -4942,6 +4942,15 @@
{ "OLYMPUS", "E-M5", Flash, 0, { 2.3750, 1, 1.6016, 0 } },
{ "OLYMPUS", "E-M5", Flash, 7, { 2.7031, 1, 1.3750, 0 } },
+ // Firmware version 1.1
+ { "OLYMPUS", "E-M10", Daylight, 0, { 1.882813, 1, 1.750000, 0 } },
+ { "OLYMPUS", "E-M10", Shade, 0, { 2.156250, 1, 1.351563, 0 } },
+ { "OLYMPUS", "E-M10", Cloudy, 0, { 2.015625, 1, 1.585938, 0 } },
+ { "OLYMPUS", "E-M10", Incandescent, 0, { 1.148438, 1, 3.367188, 0 } },
+ { "OLYMPUS", "E-M10", Fluorescent, 0, { 1.882813, 1,
2.484375, 0 } },
+ { "OLYMPUS", "E-M10", Underwater, 0, { 1.523438, 1, 2.718750, 0 } },
+ { "OLYMPUS", "E-M10", Flash, 0, { 2.210938, 1, 1.515625, 0 } },
+
{ "OLYMPUS", "E-P1", Daylight, 0, { 1.835938, 1, 1.351563, 0 } },
{ "OLYMPUS", "E-P1", Shade, 0, { 2.195313, 1, 1.046875, 0 } },
{ "OLYMPUS", "E-P1", Cloudy, 0, { 2.031250, 1, 1.203125, 0 } },
@@ -6945,6 +6954,116 @@
{ "SAMSUNG", "NX300", "5500K", 0, { 2.636719, 1, 1.792969, 0 } },
{ "SAMSUNG", "NX300", "6500K", 0, { 3.003906, 1, 1.644531, 0 } },
+ // copy of NX300
+ { "SAMSUNG", "NX300M", Daylight, -7, { 2.308594, 1, 2.097656, 0 } },
+ { "SAMSUNG", "NX300M", Daylight, -6, { 2.347656, 1, 2.027344, 0 } },
+ { "SAMSUNG", "NX300M", Daylight, -5, { 2.390625, 1, 1.953125, 0 } },
+ { "SAMSUNG", "NX300M", Daylight, -4, { 2.429688, 1, 1.882813, 0 } },
+ { "SAMSUNG", "NX300M", Daylight, -3, { 2.472656, 1, 1.812500, 0 } },
+ { "SAMSUNG", "NX300M", Daylight, -2, { 2.511719, 1, 1.742188, 0 } },
+ { "SAMSUNG", "NX300M", Daylight, -1, { 2.554688, 1, 1.671875, 0 } },
+ { "SAMSUNG", "NX300M", Daylight, 0, { 2.593750, 1, 1.601563, 0 } },
+ { "SAMSUNG", "NX300M", Daylight, 1, { 2.636719, 1, 1.562500, 0 } },
+ { "SAMSUNG", "NX300M", Daylight, 2, { 2.683594, 1, 1.523438, 0 } },
+ { "SAMSUNG", "NX300M", Daylight, 3, { 2.726563, 1, 1.484375, 0 } },
+ { "SAMSUNG", "NX300M", Daylight, 4, { 2.773438, 1, 1.445313, 0 } },
+ { "SAMSUNG", "NX300M", Daylight, 5, { 2.816406, 1, 1.406250, 0 } },
+ { "SAMSUNG", "NX300M", Daylight, 6, { 2.859375, 1, 1.367188, 0 } },
+ { "SAMSUNG", "NX300M", Daylight, 7, { 2.906250, 1, 1.328125, 0 } },
+ { "SAMSUNG", "NX300M", Cloudy, -7, { 2.394531, 1, 2.011719, 0 } },
+ { "SAMSUNG", "NX300M", Cloudy, -6, { 2.433594, 1, 1.945313, 0 } },
+ { "SAMSUNG", "NX300M", Cloudy, -5, { 2.476563, 1, 1.878906, 0 } },
+ { "SAMSUNG", "NX300M", Cloudy, -4, { 2.519531, 1, 1.808594, 0 } },
+ { "SAMSUNG", "NX300M", Cloudy, -3, { 2.562500, 1, 1.742188, 0 } },
+ { "SAMSUNG", "NX300M", Cloudy, -2, { 2.605469, 1, 1.671875, 0 } },
+ { "SAMSUNG", "NX300M", Cloudy, -1, { 2.644531, 1, 1.605469, 0 } },
+ { "SAMSUNG", "NX300M", Cloudy, 0, { 2.687500, 1, 1.535156, 0 } },
+ { "SAMSUNG", "NX300M", Cloudy, 1, { 2.734375, 1, 1.500000, 0 } },
+ { "SAMSUNG", "NX300M", Cloudy, 2, { 2.781250, 1, 1.460938, 0 } },
+ { "SAMSUNG", "NX300M", Cloudy, 3, { 2.828125, 1, 1.425781, 0 } },
+ { "SAMSUNG", "NX300M", Cloudy, 4, { 2.875000, 1, 1.386719, 0 } },
+ { "SAMSUNG", "NX300M", Cloudy, 5, { 2.917969, 1, 1.351563, 0 } },
+ { "SAMSUNG", "NX300M", Cloudy, 6, { 2.964844, 1, 1.312500, 0 } },
+ { "SAMSUNG", "NX300M", Cloudy, 7, { 3.011719, 1, 1.273438, 0 } },
+ { "SAMSUNG", "NX300M", CoolWhiteFluorescent, -7, { 2.000000, 1, 2.933594, 0
} },
+ { "SAMSUNG", "NX300M", CoolWhiteFluorescent, -6, { 2.035156, 1, 2.835938, 0
} },
+ { "SAMSUNG", "NX300M", CoolWhiteFluorescent, -5, { 2.070313, 1, 2.734375, 0
} },
+ { "SAMSUNG", "NX300M", CoolWhiteFluorescent, -4, { 2.105469, 1, 2.636719, 0
} },
+ { "SAMSUNG", "NX300M", CoolWhiteFluorescent, -3, { 2.140625, 1, 2.539063, 0
} },
+ { "SAMSUNG", "NX300M", CoolWhiteFluorescent, -2, { 2.175781, 1, 2.437500, 0
} },
+ { "SAMSUNG", "NX300M", CoolWhiteFluorescent, -1, { 2.214844, 1, 2.339844, 0
} },
+ { "SAMSUNG", "NX300M", CoolWhiteFluorescent, 0, { 2.250000, 1, 2.238281, 0 }
},
+ { "SAMSUNG", "NX300M", CoolWhiteFluorescent, 1, { 2.285156, 1, 2.183594, 0 }
},
+ { "SAMSUNG", "NX300M", CoolWhiteFluorescent, 2, { 2.324219, 1, 2.128906, 0 }
},
+ { "SAMSUNG", "NX300M", CoolWhiteFluorescent, 3, { 2.363281, 1, 2.078125, 0 }
},
+ { "SAMSUNG", "NX300M", CoolWhiteFluorescent, 4, { 2.402344, 1, 2.023438, 0 }
},
+ { "SAMSUNG", "NX300M", CoolWhiteFluorescent, 5, { 2.441406, 1, 1.968750, 0 }
},
+ { "SAMSUNG", "NX300M", CoolWhiteFluorescent, 6, { 2.480469, 1, 1.914063, 0 }
},
+ { "SAMSUNG", "NX300M", CoolWhiteFluorescent, 7, { 2.519531, 1, 1.859375, 0 }
},
+ { "SAMSUNG", "NX300M", DayWhiteFluorescent, -7, { 2.253906, 1, 2.445313, 0 }
},
+ { "SAMSUNG", "NX300M", DayWhiteFluorescent, -6, { 2.292969, 1, 2.363281, 0 }
},
+ { "SAMSUNG", "NX300M", DayWhiteFluorescent, -5, { 2.332031, 1, 2.281250, 0 }
},
+ { "SAMSUNG", "NX300M", DayWhiteFluorescent, -4, { 2.371094, 1, 2.199219, 0 }
},
+ { "SAMSUNG", "NX300M", DayWhiteFluorescent, -3, { 2.410156, 1, 2.117188, 0 }
},
+ { "SAMSUNG", "NX300M", DayWhiteFluorescent, -2, { 2.453125, 1, 2.031250, 0 }
},
+ { "SAMSUNG", "NX300M", DayWhiteFluorescent, -1, { 2.492188, 1, 1.949219, 0 }
},
+ { "SAMSUNG", "NX300M", DayWhiteFluorescent, 0, { 2.531250, 1, 1.867188, 0 }
},
+ { "SAMSUNG", "NX300M", DayWhiteFluorescent, 1, { 2.574219, 1, 1.820313, 0 }
},
+ { "SAMSUNG", "NX300M", DayWhiteFluorescent, 2, { 2.617188, 1, 1.777344, 0 }
},
+ { "SAMSUNG", "NX300M", DayWhiteFluorescent, 3, { 2.660156, 1, 1.730469, 0 }
},
+ { "SAMSUNG", "NX300M", DayWhiteFluorescent, 4, { 2.703125, 1, 1.687500, 0 }
},
+ { "SAMSUNG", "NX300M", DayWhiteFluorescent, 5, { 2.750000, 1, 1.640625, 0 }
},
+ { "SAMSUNG", "NX300M", DayWhiteFluorescent, 6, { 2.792969, 1, 1.593750, 0 }
},
+ { "SAMSUNG", "NX300M", DayWhiteFluorescent, 7, { 2.835938, 1, 1.550781, 0 }
},
+ { "SAMSUNG", "NX300M", DaylightFluorescent, -7, { 2.699219, 1, 2.128906, 0 }
},
+ { "SAMSUNG", "NX300M", DaylightFluorescent, -6, { 2.746094, 1, 2.054688, 0 }
},
+ { "SAMSUNG", "NX300M", DaylightFluorescent, -5, { 2.792969, 1, 1.984375, 0 }
},
+ { "SAMSUNG", "NX300M", DaylightFluorescent, -4, { 2.839844, 1, 1.910156, 0 }
},
+ { "SAMSUNG", "NX300M", DaylightFluorescent, -3, { 2.890625, 1, 1.839844, 0 }
},
+ { "SAMSUNG", "NX300M", DaylightFluorescent, -2, { 2.937500, 1, 1.765625, 0 }
},
+ { "SAMSUNG", "NX300M", DaylightFluorescent, -1, { 2.984375, 1, 1.695313, 0 }
},
+ { "SAMSUNG", "NX300M", DaylightFluorescent, 0, { 3.031250, 1, 1.625000, 0 }
},
+ { "SAMSUNG", "NX300M", DaylightFluorescent, 1, { 3.082031, 1, 1.582031, 0 }
},
+ { "SAMSUNG", "NX300M", DaylightFluorescent, 2, { 3.136719, 1, 1.542969, 0 }
},
+ { "SAMSUNG", "NX300M", DaylightFluorescent, 3, { 3.187500, 1, 1.503906, 0 }
},
+ { "SAMSUNG", "NX300M", DaylightFluorescent, 4, { 3.238281, 1, 1.464844, 0 }
},
+ { "SAMSUNG", "NX300M", DaylightFluorescent, 5, { 3.292969, 1, 1.425781, 0 }
},
+ { "SAMSUNG", "NX300M", DaylightFluorescent, 6, { 3.343750, 1, 1.386719, 0 }
},
+ { "SAMSUNG", "NX300M", DaylightFluorescent, 7, { 3.394531, 1, 1.347656, 0 }
},
+ { "SAMSUNG", "NX300M", Tungsten, -7, { 1.390625, 1, 3.695313, 0 } },
+ { "SAMSUNG", "NX300M", Tungsten, -6, { 1.414063, 1, 3.570313, 0 } },
+ { "SAMSUNG", "NX300M", Tungsten, -5, { 1.437500, 1, 3.445313, 0 } },
+ { "SAMSUNG", "NX300M", Tungsten, -4, { 1.460938, 1, 3.320313, 0 } },
+ { "SAMSUNG", "NX300M", Tungsten, -3, { 1.488281, 1, 3.195313, 0 } },
+ { "SAMSUNG", "NX300M", Tungsten, -2, { 1.511719, 1, 3.070313, 0 } },
+ { "SAMSUNG", "NX300M", Tungsten, -1, { 1.535156, 1, 2.945313, 0 } },
+ { "SAMSUNG", "NX300M", Tungsten, 0, { 1.562500, 1, 2.820313, 0 } },
+ { "SAMSUNG", "NX300M", Tungsten, 1, { 1.585938, 1, 2.753906, 0 } },
+ { "SAMSUNG", "NX300M", Tungsten, 2, { 1.613281, 1, 2.683594, 0 } },
+ { "SAMSUNG", "NX300M", Tungsten, 3, { 1.640625, 1, 2.617188, 0 } },
+ { "SAMSUNG", "NX300M", Tungsten, 4, { 1.667969, 1, 2.546875, 0 } },
+ { "SAMSUNG", "NX300M", Tungsten, 5, { 1.695313, 1, 2.480469, 0 } },
+ { "SAMSUNG", "NX300M", Tungsten, 6, { 1.722656, 1, 2.410156, 0 } },
+ { "SAMSUNG", "NX300M", Tungsten, 7, { 1.750000, 1, 2.339844, 0 } },
+ { "SAMSUNG", "NX300M", Flash, -7, { 2.613281, 1, 1.957031, 0 } },
+ { "SAMSUNG", "NX300M", Flash, -6, { 2.660156, 1, 1.890625, 0 } },
+ { "SAMSUNG", "NX300M", Flash, -5, { 2.707031, 1, 1.824219, 0 } },
+ { "SAMSUNG", "NX300M", Flash, -4, { 2.753906, 1, 1.757813, 0 } },
+ { "SAMSUNG", "NX300M", Flash, -3, { 2.800781, 1, 1.691406, 0 } },
+ { "SAMSUNG", "NX300M", Flash, -2, { 2.843750, 1, 1.625000, 0 } },
+ { "SAMSUNG", "NX300M", Flash, -1, { 2.890625, 1, 1.558594, 0 } },
+ { "SAMSUNG", "NX300M", Flash, 0, { 2.937500, 1, 1.492188, 0 } },
+ { "SAMSUNG", "NX300M", Flash, 1, { 2.988281, 1, 1.457031, 0 } },
+ { "SAMSUNG", "NX300M", Flash, 2, { 3.039063, 1, 1.421875, 0 } },
+ { "SAMSUNG", "NX300M", Flash, 3, { 3.089844, 1, 1.386719, 0 } },
+ { "SAMSUNG", "NX300M", Flash, 4, { 3.140625, 1, 1.347656, 0 } },
+ { "SAMSUNG", "NX300M", Flash, 5, { 3.191406, 1, 1.312500, 0 } },
+ { "SAMSUNG", "NX300M", Flash, 6, { 3.238281, 1, 1.277344, 0 } },
+ { "SAMSUNG", "NX300M", Flash, 7, { 3.289063, 1, 1.238281, 0 } },
+ { "SAMSUNG", "NX300M", "5000K", 0, { 2.402344, 1, 1.945313, 0 } },
+ { "SAMSUNG", "NX300M", "5500K", 0, { 2.636719, 1, 1.792969, 0 } },
+ { "SAMSUNG", "NX300M", "6500K", 0, { 3.003906, 1, 1.644531, 0 } },
+
// Copied from Samsung NX200
{ "SAMSUNG", "NX1000", Daylight, 0, { 2.773438, 1, 1.625000, 0 } },
{ "SAMSUNG", "NX1000", Cloudy, 0, { 2.902344, 1, 1.546875, 0 } },
------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=157005751&iu=/4140/ostg.clktrk
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
