[UFRaw-CVS] ufraw dcraw.cc,1.50,1.51

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

Update of /cvsroot/ufraw/ufraw
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv23373

Modified Files:
	dcraw.cc 
Log Message:
dcraw modified 8.61 (1.369).

Index: dcraw.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw.cc,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** dcraw.cc	25 Feb 2007 05:25:45 -0000	1.50
--- dcraw.cc	27 Feb 2007 04:17:07 -0000	1.51
***************
*** 2380,2384 ****
  }
  
! /* BEGIN GPL BLOCK */
  
  void CLASS foveon_decoder (unsigned size, unsigned code)
--- 2380,2384 ----
  }
  
! /* RESTRICTED code starts here */
  
  void CLASS foveon_decoder (unsigned size, unsigned code)
***************
*** 3016,3020 ****
  #undef image
  
! /* END GPL BLOCK */
  
  /*
--- 3016,3020 ----
  #undef image
  
! /* RESTRICTED code ends here */
  
  /*
***************
*** 5887,5891 ****
      pixel_aspect = 1;
    }
!   if (!strcmp(model,"K10D")) {		/* Camera DNGs are not cropped! */
      height = 2616;
      width  = 3896;
--- 5887,5891 ----
      pixel_aspect = 1;
    }
!   if (height == 2624 && width == 3936) { /* Pentax K10D and Samsung GX10 */
      height = 2616;
      width  = 3896;