Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29821
Modified Files:
dcraw.cc
Log Message:
Fix a build error and various compiler warnings when cross-compiling for MS
Windows with the M cross environment (http://mxe.cc).
Index: dcraw.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw.cc,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -d -r1.284 -r1.285
--- dcraw.cc 17 Mar 2013 18:30:18 -0000 1.284
+++ dcraw.cc 18 Mar 2013 03:30:13 -0000 1.285
@@ -41,34 +41,6 @@
#include <time.h>
#include <sys/types.h>
-#ifdef NODEPS
-#define NO_JASPER
-#define NO_JPEG
-#define NO_LCMS
-#endif
-#ifdef HAVE_LIBJASPER
-#include <jasper/jasper.h> /* Decode RED camera movies */
-#endif
-#ifdef HAVE_LIBJPEG
-extern "C" {
-#include <jpeglib.h> /* Decode compressed Kodak DC120 photos */
-}
-#endif /* and Adobe Lossy DNGs */
-#ifndef NO_LCMS
-#include <lcms.h> /* Support color profiles */
-#endif
-#ifndef DCRAW_NOMAIN
-#ifdef LOCALEDIR
-#include <locale.h>
-#include <libintl.h>
-#define _(String) gettext(String)
-#else
-#define _(String) (String)
-#endif
-#else
-#include <glib/gi18n.h> /*For _(String) definition - NKBJ*/
-#endif
-
#ifndef HAVE_CONFIG_H /*fseeko() is handled by the UFRaw config system - NKBJ*/
#if defined(DJGPP) || defined(__MINGW32__)
#define fseeko fseek
@@ -99,6 +71,34 @@
typedef unsigned long long UINT64;
#endif
+#ifdef NODEPS
+#define NO_JASPER
+#define NO_JPEG
+#define NO_LCMS
+#endif
+#ifdef HAVE_LIBJASPER
+#include <jasper/jasper.h> /* Decode RED camera movies */
+#endif
+#ifdef HAVE_LIBJPEG
+extern "C" {
+#include <jpeglib.h> /* Decode compressed Kodak DC120 photos */
+}
+#endif /* and Adobe Lossy DNGs */
+#ifndef NO_LCMS
+#include <lcms.h> /* Support color profiles */
+#endif
+#ifndef DCRAW_NOMAIN
+#ifdef LOCALEDIR
+#include <locale.h>
+#include <libintl.h>
+#define _(String) gettext(String)
+#else
+#define _(String) (String)
+#endif
+#else
+#include <glib/gi18n.h> /*For _(String) definition - NKBJ*/
+#endif
+
#ifdef LJPEG_DECODE
#error Please compile dcraw.c by itself.
#error Do not link it with ljpeg_decode.
@@ -296,10 +296,16 @@
#define SQR(x) ((x)*(x))
#ifndef DCRAW_NOMAIN
+#ifndef ABS
#define ABS(x) (((int)(x) ^ ((int)(x) >> 31)) - ((int)(x) >> 31))
+#endif
+#ifndef MIN
#define MIN(a,b) ((a) < (b) ? (a) : (b))
+#endif
+#ifndef MAX
#define MAX(a,b) ((a) > (b) ? (a) : (b))
#endif
+#endif
#define LIM(x,min,max) MAX(min,MIN(x,max))
#define ULIM(x,y,z) ((y) < (z) ? LIM(x,y,z) : LIM(x,z,y))
#define CLIP(x) LIM(x,0,65535)
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
