Update of /cvsroot/ufraw/ufraw
In directory vz-cvs-3.sog:/tmp/cvs-serv8092
Modified Files:
configure.ac dcraw.cc ufraw_routines.c
Log Message:
Add support for ARRIRAW and Redcode R3D video file formats.
Index: dcraw.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw.cc,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -d -r1.247 -r1.248
--- dcraw.cc 4 Aug 2011 09:30:07 -0000 1.247
+++ dcraw.cc 6 Aug 2011 16:10:46 -0000 1.248
@@ -46,12 +46,12 @@
#include <time.h>
#include <sys/types.h>
-//#ifdef NODEPS
+#ifdef NODEPS
#define NO_JASPER
-//#define NO_JPEG
-//#define NO_LCMS
-//#endif
-#ifndef NO_JASPER
+#define NO_JPEG
+#define NO_LCMS
+#endif
+#ifdef HAVE_LIBJASPER
#include <jasper/jasper.h> /* Decode RED camera movies */
#endif
#ifdef HAVE_LIBJPEG
@@ -2755,7 +2755,7 @@
void CLASS redcine_load_raw()
{
-#ifndef NO_JASPER
+#ifdef HAVE_LIBJASPER
int c, row, col;
jas_stream_t *in;
jas_image_t *jimg;
@@ -8458,7 +8458,7 @@
if (!tiff_bps) tiff_bps = 12;
if (!maximum) maximum = (1 << tiff_bps) - 1;
if (!load_raw || height < 22) is_raw = 0;
-#ifdef NO_JASPER
+#ifndef HAVE_LIBJASPER
if (load_raw == &CLASS redcine_load_raw) {
dcraw_message (DCRAW_ERROR,_("%s: You must link dcraw with %s!!\n"),
ifname_display, "libjasper");
Index: ufraw_routines.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_routines.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- ufraw_routines.c 20 Feb 2011 06:15:20 -0000 1.112
+++ ufraw_routines.c 6 Aug 2011 16:10:47 -0000 1.113
@@ -165,9 +165,10 @@
}
}
-const char raw_ext[] = "3fr,arw,bay,bmq,cine,cr2,crw,cs1,dc2,dcr,dng,erf,fff,"
-
"hdr,ia,jpg,k25,kc2,kdc,mdc,mef,mos,mrw,nef,nrw,orf,pef,pxn,qtk,raf,"
- "raw,rdc,rw2,rwl,sr2,srf,srw,sti,tif,ufraw,x3f";
+const char raw_ext[] = "3fr,ari,arw,bay,bmq,cine,cr2,crw,cs1,dc2,dcr,dng,erf,"
+
"fff,hdr,ia,jpg,k25,kc2,kdc,mdc,mef,mos,mrw,nef,nrw,orf,"
+ "pef,pxn,qtk,r3d,raf,raw,rdc,rw2,rwl,sr2,srf,srw,sti,"
+ "tif,ufraw,x3f";
const char *file_type[] = { ".ppm", ".ppm", ".tif", ".tif", ".jpg",
".png", ".png", ".embedded.jpg", ".embedded.png",
".fits"
Index: configure.ac
===================================================================
RCS file: /cvsroot/ufraw/ufraw/configure.ac,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -d -r1.159 -r1.160
--- configure.ac 5 Aug 2011 02:35:29 -0000 1.159
+++ configure.ac 6 Aug 2011 16:10:46 -0000 1.160
@@ -235,6 +235,10 @@
AC_CHECK_LIB(jpeg, jpeg_CreateCompress))
have_jpeg=${ac_cv_lib_jpeg_jpeg_CreateCompress:-no}
+# Check for libjasper.
+AC_CHECK_LIB(jasper, jas_image_decode)
+have_jasper=${ac_cv_lib_jasper_jas_image_decode:-no}
+
# Check for tiff headers and library.
AC_CHECK_HEADER(tiffio.h,
AC_CHECK_LIB(tiff, TIFFSetErrorHandler))
@@ -365,6 +369,7 @@
AC_MSG_NOTICE(build CinePaint plug-in: $have_cinepaint)
AC_MSG_NOTICE(EXIF support using exiv2: $have_exiv2)
AC_MSG_NOTICE(JPEG support: $have_jpeg)
+AC_MSG_NOTICE(JPEG2000 (libjasper) support: $have_jasper)
AC_MSG_NOTICE(TIFF support: $have_tiff)
AC_MSG_NOTICE(PNG support: $have_png)
AC_MSG_NOTICE(FITS support: $have_cfitsio)
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
The must-attend event for mobile developers. Connect with experts.
Get tools for creating Super Apps. See the latest technologies.
Sessions, hands-on labs, demos & much more. Register early & save!
http://p.sf.net/sfu/rim-blackberry-1
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
