[UFRaw-CVS] ufraw dcraw.cc,1.189,1.190

[Niels K. B. J. <nk...@us...>]

Update of /cvsroot/ufraw/ufraw
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26001

Modified Files:
	dcraw.cc 
Log Message:
dcraw modified 8.97 (1.428). Changelog: Correctly crop Nikon D300S photos.

Index: dcraw.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw.cc,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -d -r1.189 -r1.190
--- dcraw.cc	31 Aug 2009 12:00:18 -0000	1.189
+++ dcraw.cc	31 Aug 2009 16:45:12 -0000	1.190
@@ -6330,8 +6330,6 @@
 	{ 10231,-2769,-1255,-8301,15900,2552,-797,680,7148 } },
     { "NIKON D3000", 0, 0,
 	{ 8736,-2458,-935,-9075,16894,2251,-1354,1242,8263 } },
-    { "NIKON D300S", 0, 0,	/* copied */
-	{ 9030,-1992,-715,-8465,16302,2255,-2689,3217,8069 } },
     { "NIKON D300", 0, 0,
 	{ 9030,-1992,-715,-8465,16302,2255,-2689,3217,8069 } },
     { "NIKON D3X", 0, 0,
@@ -7205,8 +7203,7 @@
   } else if (!strncmp(model,"D2X",3)) {
     if (width == 3264) width -= 32;
     else width -= 8;
-  } else if (!strcmp(model,"D300") ||
-	     !strcmp(model,"D300S")) {
+  } else if (!strncmp(model,"D300",4)) {
     width -= 32;
   } else if (!strcmp(model,"COOLPIX P6000")) {
     load_flags = 24;