Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13013
Modified Files:
dcraw.cc dcraw_indi.c
Log Message:
Clean up some definitions and typedefs.
Index: dcraw.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw.cc,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -d -r1.289 -r1.290
--- dcraw.cc 10 Apr 2013 16:45:12 -0000 1.289
+++ dcraw.cc 5 May 2013 03:30:20 -0000 1.290
@@ -111,13 +111,6 @@
/* All definitions of global variables are defined inside a class in dcraw.h */
#include "dcraw.h"
-#ifdef DCRAW_NOMAIN
-extern
-#endif
-#if !defined(ushort)
-#define ushort unsigned short
-#endif
-
/*
All global variables are defined here, and all functions that
access them are prefixed with "CLASS". Note that a thread-safe
Index: dcraw_indi.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw_indi.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- dcraw_indi.c 19 Apr 2013 03:00:09 -0000 1.106
+++ dcraw_indi.c 5 May 2013 03:30:20 -0000 1.107
@@ -36,10 +36,6 @@
#define uf_omp_get_num_threads() 1
#endif
-#define ushort UshORt
-typedef unsigned short ushort;
-typedef gint64 INT64;
-
extern const double xyz_rgb[3][3];
extern const float d65_white[3];
@@ -882,14 +878,14 @@
{
unsigned *flag;
int size, base, dest, next, row, col;
- INT64 *img, hold;
+ gint64 *img, hold;
int height = *height_p, width = *width_p;/* INDI - UF*/
// Message is suppressed because error handling is not enabled here.
// dcraw_message (dcraw, DCRAW_VERBOSE,_("Flipping image %c:%c:%c...\n"),
// flip & 1 ? 'H':'0', flip & 2 ? 'V':'0', flip & 4 ? 'T':'0'); /*UF*/
- img = (INT64 *) image;
+ img = (gint64 *) image;
size = height * width;
flag = calloc((size + 31) >> 5, sizeof * flag);
merror(flag, "flip_image()");
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite
It's a free troubleshooting tool designed for production
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap2
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
