[SOLVED] ufraw v0.18 updates for nikon d5100

lazardo · 01-05-2012, 04:57 PM

As the subject says. These changes are from cvs and will be obsolete after the next ufraw release.

Cheers,

Code:

--- wb_presets.c.orig	2011-02-18 20:29:33.000000000 -0800
+++ wb_presets.c	2012-01-05 14:37:48.940374807 -0800
@@ -2542,6 +2542,19 @@
   { "NIKON", "D5000", DaylightFluorescent, 0,	{ 1.925781, 1, 1.074219, 0 } },
   { "NIKON", "D5000", HighTempMercuryVaporFluorescent, 0, { 2.207031, 1, 1.292969, 0 } },
 
+  { "NIKON", "D5100", DirectSunlight, 0,	{ 2.0273, 1, 1.3906, 0 } },
+  { "NIKON", "D5100", Flash, 0,			{ 2.2813, 1, 1.2109, 0 } },
+  { "NIKON", "D5100", Cloudy, 0,		{ 2.1680, 1, 1.2656, 0 } },
+  { "NIKON", "D5100", Shade, 0,			{ 2.4922, 1, 1.1367, 0 } },
+  { "NIKON", "D5100", Incandescent, 0,		{ 1.3047, 1, 2.2148, 0 } },
+  { "NIKON", "D5100", SodiumVaporFluorescent, 0, { 1.2031, 1, 2.4375, 0 } },
+  { "NIKON", "D5100", WarmWhiteFluorescent, 0,	{ 1.3008, 1, 1.9648, 0 } },
+  { "NIKON", "D5100", WhiteFluorescent, 0,	{ 1.4961, 1, 2.3047, 0 } },
+  { "NIKON", "D5100", CoolWhiteFluorescent, 0,	{ 1.8320, 1, 2.0273, 0 } },
+  { "NIKON", "D5100", DayWhiteFluorescent, 0,	{ 1.8984, 1, 1.3906, 0 } },
+  { "NIKON", "D5100", DaylightFluorescent, 0,	{ 2.1680, 1, 1.1172, 0 } },
+  { "NIKON", "D5100", HighTempMercuryVaporFluorescent, 0, { 2.4844, 1, 1.3672, 0 } },
+
   { "NIKON", "D7000", DirectSunlight, -6,	{ 2.199219, 1, 1.242187, 0 } },
   { "NIKON", "D7000", DirectSunlight, 0,	{ 2.027344, 1, 1.390625, 0 } },
   { "NIKON", "D7000", DirectSunlight, 6,	{ 1.847656, 1, 1.542969, 0 } },

lazardo · 01-10-2012, 01:03 PM

Oops, actually two files need to be patched.

Code:

--- dcraw.cc.orig	2011-02-19 23:56:15.000000000 -0800
+++ dcraw.cc	2012-01-10 10:57:59.083259560 -0800
@@ -6472,6 +6472,8 @@
 	{ 6992,-1668,-806,-8138,15748,2543,-874,850,7897 } },
     { "NIKON D5000", 0, 0xf00,
 	{ 7309,-1403,-519,-8474,16008,2622,-2433,2826,8064 } },
+    { "NIKON D5100", 0, 0x3de6,
+	{ 8198,-2239,-724,-4871,12389,2798,-1043,2050,7181 } },
     { "NIKON D50", 0, 0,
 	{ 7732,-2422,-789,-8238,15884,2498,-859,783,7330 } },
     { "NIKON D60", 0, 0,

lazardo · 05-29-2012, 01:19 PM

Update to the dcraw.cc patch posted on Jan 5. The 5100 and 7000 have the same sensor.

Code:

--- dcraw.cc.orig	2011-02-19 23:56:15.000000000 -0800
+++ dcraw.cc	2012-05-29 11:05:53.805792818 -0700
@@ -6472,6 +6472,8 @@
 	{ 6992,-1668,-806,-8138,15748,2543,-874,850,7897 } },
     { "NIKON D5000", 0, 0xf00,
 	{ 7309,-1403,-519,-8474,16008,2622,-2433,2826,8064 } },
+    { "NIKON D5100", 0, 0x3de6,
+	{ 8198,-2239,-724,-4871,12389,2798,-1043,2050,7181 } },
     { "NIKON D50", 0, 0,
 	{ 7732,-2422,-789,-8238,15884,2498,-859,783,7330 } },
     { "NIKON D60", 0, 0,
@@ -7473,7 +7475,8 @@
     left_margin = 2;
   } else if (!strcmp(model,"D5000")) {
     width -= 42;
-  } else if (!strcmp(model,"D7000")) {
+  } else if (!strcmp(model,"D5100") ||
+             !strcmp(model,"D7000")) {
     width -= 44;
   } else if (!strcmp(model,"D3100")) {
     width -= 28;