[UFRaw-CVS] ufraw dcraw.c,1.1.2.21,1.1.2.22

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

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

Modified Files:
      Tag: dcraw-original-branch
	dcraw.c 
Log Message:
dcraw original 7.84 (1.300).

Index: dcraw.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw.c,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -C2 -d -r1.1.2.21 -r1.1.2.22
*** dcraw.c	12 Nov 2005 19:31:17 -0000	1.1.2.21
--- dcraw.c	13 Nov 2005 05:04:16 -0000	1.1.2.22
***************
*** 3278,3281 ****
--- 3278,3282 ----
    } else if (!strcmp (buf,"OLYMP") ||
  	     !strcmp (buf,"LEICA") ||
+ 	     !strcmp (buf,"Ricoh") ||
  	     !strcmp (buf,"EPSON"))
      fseek (ifp, -2, SEEK_CUR);
***************
*** 5476,5480 ****
      pre_mul[0] = 2.07;
      pre_mul[2] = 1.88;
!   } else if (!strcmp(model,"EX-P600")) {
      height = 2142;
      width  = 2844;
--- 5477,5481 ----
      pre_mul[0] = 2.07;
      pre_mul[2] = 1.88;
!   } else if (fsize == 9313536) {	/* EX-P600 or QV-R61 */
      height = 2142;
      width  = 2844;