[UFRaw-CVS] ufraw dcraw.cc,1.61,1.62

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

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

Modified Files:
	dcraw.cc 
Log Message:
dcraw modified 8.69 (1.377). Changelog: Better detect and reject non-raw TIFFs.

Index: dcraw.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw.cc,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** dcraw.cc	20 Mar 2007 04:29:12 -0000	1.61
--- dcraw.cc	26 Mar 2007 03:11:16 -0000	1.62
***************
*** 24,28 ****
  #endif
  
! #define DCRAW_VERSION "8.68"
  
  //#define _GNU_SOURCE
--- 24,28 ----
  #endif
  
! #define DCRAW_VERSION "8.69"
  
  //#define _GNU_SOURCE
***************
*** 4751,4756 ****
  	}
      }
!   if (tiff_samples == 3 && tiff_bps == 8)
!     if (!dng_version) is_raw = 0;
    for (i=0; i < tiff_nifds; i++)
      if (i != raw && tiff_ifd[i].samples == max_samp &&
--- 4751,4757 ----
  	}
      }
!   if (!dng_version && tiff_samples == 3)
!     if (tiff_ifd[raw].bytes && tiff_bps != 14 && tiff_bps != 2048)
!       is_raw = 0;
    for (i=0; i < tiff_nifds; i++)
      if (i != raw && tiff_ifd[i].samples == max_samp &&