Update of /cvsroot/ufraw/ufraw
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv25002
Modified Files:
nikon_curve.c ufraw-batch.c ufraw-gimp.c ufraw.c ufraw.h
ufraw_chooser.c ufraw_conf.c ufraw_delete.c ufraw_developer.c
ufraw_embedded.c ufraw_exiv2.cc ufraw_icons.c ufraw_lens_ui.c
ufraw_message.c ufraw_preview.c ufraw_routines.c ufraw_saver.c
ufraw_ufraw.c ufraw_writer.c wb_presets.c
Log Message:
Reorganize #include directives.
Index: ufraw_conf.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_conf.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -d -r1.154 -r1.155
--- ufraw_conf.c 13 Nov 2009 16:25:22 -0000 1.154
+++ ufraw_conf.c 11 Dec 2009 23:54:13 -0000 1.155
@@ -10,18 +10,13 @@
* (at your option) any later version.
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
+#include "ufraw.h"
#include <string.h>
#include <errno.h>
#include <math.h>
#include <sys/stat.h> /* needed for fstat() */
#include <getopt.h>
-#include "uf_glib.h"
#include <glib/gi18n.h>
-#include "ufraw.h"
#ifdef HAVE_EXIV2
#include <exiv2/exv_conf.h>
Index: ufraw_writer.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_writer.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- ufraw_writer.c 25 Nov 2009 16:15:45 -0000 1.68
+++ ufraw_writer.c 11 Dec 2009 23:54:14 -0000 1.69
@@ -10,20 +10,15 @@
* (at your option) any later version.
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
+#include "ufraw.h"
+#include <glib/gi18n.h>
#include <errno.h> /* for errno */
#include <string.h>
#include <lcms.h>
-#include "uf_glib.h"
-#include <glib/gi18n.h>
#ifdef HAVE_LIBTIFF
#include <tiffio.h>
#endif
#ifdef HAVE_LIBJPEG
-#include <jpeglib.h>
#include <jerror.h>
#include "iccjpeg.h"
#endif
@@ -38,8 +33,6 @@
#define uf_omp_get_thread_num() 0
#endif
-#include "ufraw.h"
-
#ifdef HAVE_LIBCFITSIO
#include <fitsio.h>
#endif
Index: wb_presets.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- wb_presets.c 9 Dec 2009 03:15:16 -0000 1.136
+++ wb_presets.c 11 Dec 2009 23:54:14 -0000 1.137
@@ -13,13 +13,8 @@
* (at your option) any later version.
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <glib.h>
-#include <glib/gi18n.h>
#include "ufraw.h"
+#include <glib/gi18n.h>
/* Column 1 - "make" of the camera.
* Column 2 - "model" (use the "make" and "model" as provided by DCRaw).
Index: ufraw_delete.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_delete.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ufraw_delete.c 30 Jun 2008 21:59:51 -0000 1.8
+++ ufraw_delete.c 11 Dec 2009 23:54:13 -0000 1.9
@@ -10,14 +10,10 @@
* (at your option) any later version.
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "ufraw.h"
#include <string.h>
-#include "uf_glib.h"
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include "ufraw.h"
// Response can be any unique positive integer
#define UFRAW_RESPONSE_DELETE_SELECTED 1
Index: ufraw_exiv2.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_exiv2.cc,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- ufraw_exiv2.cc 30 Nov 2009 05:58:57 -0000 1.53
+++ ufraw_exiv2.cc 11 Dec 2009 23:54:13 -0000 1.54
@@ -12,14 +12,7 @@
* (at your option) any later version.
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-extern "C" {
-#include "uf_glib.h"
#include "ufraw.h"
-}
#ifdef HAVE_EXIV2
#include <exiv2/image.hpp>
Index: ufraw_routines.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_routines.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- ufraw_routines.c 2 Dec 2009 02:57:22 -0000 1.103
+++ ufraw_routines.c 11 Dec 2009 23:54:14 -0000 1.104
@@ -18,13 +18,12 @@
#define _GNU_SOURCE /* needed for canonicalize_file_name() */
#endif
+#include "ufraw.h"
+#include <glib/gi18n.h>
#include <errno.h>
#include <locale.h>
#include <stdlib.h> /* needed for canonicalize_file_name() */
#include <string.h>
-#include "uf_glib.h"
-#include <glib/gi18n.h>
-#include "ufraw.h"
/* we start by some general purpose functions that mostly take care of
* making the rest of the code platform independ */
Index: ufraw_lens_ui.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_lens_ui.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- ufraw_lens_ui.c 8 Dec 2009 06:17:26 -0000 1.22
+++ ufraw_lens_ui.c 11 Dec 2009 23:54:13 -0000 1.23
@@ -11,20 +11,14 @@
* (at your option) any later version.
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gtk/gtk.h>
+#include "ufraw.h"
+#include "uf_gtk.h"
+#include "ufraw_ui.h"
#include <glib/gi18n.h>
#include <string.h>
#include <ctype.h>
#include <math.h>
-#include "ufraw.h"
-#include "ufraw_ui.h"
-#include "uf_gtk.h"
-
#ifdef HAVE_LENSFUN
static void delete_children (GtkWidget *widget, gpointer data)
Index: ufraw_embedded.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_embedded.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- ufraw_embedded.c 23 Dec 2008 07:56:23 -0000 1.23
+++ ufraw_embedded.c 11 Dec 2009 23:54:13 -0000 1.24
@@ -10,13 +10,10 @@
* (at your option) any later version.
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
+#include "ufraw.h"
+#include "dcraw_api.h"
#include <errno.h> /* for errno */
#include <string.h>
-#include "uf_glib.h"
#include <glib/gi18n.h>
#ifdef HAVE_LIBJPEG
#include <jpeglib.h>
@@ -25,8 +22,6 @@
#ifdef HAVE_LIBPNG
#include <png.h>
#endif
-#include "dcraw_api.h"
-#include "ufraw.h"
#ifdef HAVE_LIBJPEG
static void ufraw_jpeg_warning(j_common_ptr cinfo)
Index: ufraw_preview.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_preview.c,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -d -r1.321 -r1.322
--- ufraw_preview.c 10 Dec 2009 06:10:09 -0000 1.321
+++ ufraw_preview.c 11 Dec 2009 23:54:13 -0000 1.322
@@ -15,23 +15,18 @@
* (at your option) any later version.
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <errno.h>
-#include "uf_gtk.h"
-#include <gdk/gdkkeysyms.h>
-#include <glib/gi18n.h>
#include "ufraw.h"
+#include "uf_gtk.h"
#include "ufraw_ui.h"
#include "curveeditor_widget.h"
+#include <gdk/gdkkeysyms.h>
+#include <glib/gi18n.h>
#include <gtkimageview/gtkimagescrollwin.h>
#include <gtkimageview/gtkimageview.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include <errno.h>
#if GTK_CHECK_VERSION(2,6,0)
void ufraw_chooser_toggle(GtkToggleButton *button, GtkFileChooser
*filechooser);
#endif
Index: ufraw.h
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw.h,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- ufraw.h 8 Dec 2009 06:17:26 -0000 1.141
+++ ufraw.h 11 Dec 2009 23:54:13 -0000 1.142
@@ -13,6 +13,12 @@
#ifndef _UFRAW_H
#define _UFRAW_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "uf_glib.h"
+
#ifdef HAVE_LENSFUN
#include <lensfun.h>
#endif /* HAVE_LENSFUN */
@@ -310,6 +316,10 @@
* It should be set in every UFRaw main() */
extern char *ufraw_binary;
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/* prototypes for functions in ufraw_ufraw.c */
ufraw_data *ufraw_open(char *filename);
int ufraw_config(ufraw_data *uf, conf_data *rc, conf_data *conf,conf_data
*cmd);
@@ -452,6 +462,10 @@
int ufraw_exif_prepare_output(ufraw_data *uf);
int ufraw_exif_write(ufraw_data *uf);
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
/* status numbers from DCRaw and UFRaw */
#define UFRAW_SUCCESS 0
//#define UFRAW_DCRAW_ERROR 1 /* General dcraw unrecoverable error */
Index: nikon_curve.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/nikon_curve.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- nikon_curve.c 2 Dec 2009 02:57:22 -0000 1.35
+++ nikon_curve.c 11 Dec 2009 23:54:13 -0000 1.36
@@ -34,18 +34,17 @@
//Define this if using with UFRaw
#define __WITH_UFRAW__
-#include "nikon_curve.h"
#ifdef __WITH_UFRAW__
- #include "uf_glib.h"
- #include "ufraw.h"
+#include "ufraw.h"
#else
- #define MAX(a,b) ((a) > (b) ? (a) : (b))
- #define MIN(a,b) ((a) < (b) ? (a) : (b))
- #define g_fopen fopen
+#include "nikon_curve.h"
+#include <stdio.h>
+#define MAX(a,b) ((a) > (b) ? (a) : (b))
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
+#define g_fopen fopen
#endif
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
#include <math.h>
#include <errno.h>
Index: ufraw_icons.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_icons.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ufraw_icons.c 9 Feb 2009 06:05:06 -0000 1.18
+++ ufraw_icons.c 11 Dec 2009 23:54:13 -0000 1.19
@@ -10,13 +10,9 @@
* (at your option) any later version.
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gtk/gtk.h>
#include "ufraw.h"
#include "icons/ufraw_icons.h"
+#include <gtk/gtk.h>
static GdkPixbuf *load_icon(GtkIconFactory *factory,
const guint8 *icon,const char *name)
Index: ufraw_saver.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_saver.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- ufraw_saver.c 17 Oct 2008 01:12:55 -0000 1.57
+++ ufraw_saver.c 11 Dec 2009 23:54:14 -0000 1.58
@@ -10,17 +10,11 @@
* (at your option) any later version.
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h> /* for printf */
+#include "ufraw.h"
+#include "uf_gtk.h"
#include <errno.h>
#include <string.h>
-#include "uf_glib.h"
#include <glib/gi18n.h>
-#include "uf_gtk.h"
-#include "ufraw.h"
static int ufraw_overwrite_dialog(char *filename, GtkWidget *widget)
{
Index: ufraw-gimp.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw-gimp.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- ufraw-gimp.c 27 Nov 2009 03:40:17 -0000 1.59
+++ ufraw-gimp.c 11 Dec 2009 23:54:13 -0000 1.60
@@ -15,12 +15,7 @@
* (at your option) any later version.
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <string.h>
-#include "uf_glib.h"
+#include "ufraw.h"
#include "uf_gtk.h"
#ifdef UFRAW_CINEPAINT
/* Bypass a bug in CinePaint header files */
@@ -41,7 +36,7 @@
#define PLUGIN_MODE 1
#endif
#include <glib/gi18n.h>
-#include "ufraw.h"
+#include <string.h>
void query();
void run(GIMP_CONST gchar *name,
Index: ufraw_ufraw.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_ufraw.c,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -d -r1.226 -r1.227
--- ufraw_ufraw.c 8 Dec 2009 06:17:26 -0000 1.226
+++ ufraw_ufraw.c 11 Dec 2009 23:54:14 -0000 1.227
@@ -10,10 +10,9 @@
* (at your option) any later version.
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
+#include "ufraw.h"
+#include "dcraw_api.h"
+#include <glib/gi18n.h>
#include <string.h>
#include <sys/stat.h> /* for fstat() */
#include <math.h>
@@ -24,14 +23,6 @@
#ifdef HAVE_LIBBZ2
#include <bzlib.h>
#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include "uf_glib.h"
-#include <glib/gi18n.h>
-#include "dcraw_api.h"
-#include "nikon_curve.h"
-#include "ufraw.h"
void (*ufraw_progress)(int what, int ticks);
Index: ufraw_chooser.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_chooser.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- ufraw_chooser.c 10 Dec 2008 04:22:33 -0000 1.28
+++ ufraw_chooser.c 11 Dec 2009 23:54:13 -0000 1.29
@@ -10,15 +10,10 @@
* (at your option) any later version.
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h> /* for printf */
-#include <string.h>
+#include "ufraw.h"
#include "uf_gtk.h"
+#include <string.h>
#include <glib/gi18n.h>
-#include "ufraw.h"
#if GTK_CHECK_VERSION(2,6,0)
void ufraw_chooser_toggle(GtkToggleButton *button, GtkFileChooser *fileChooser)
Index: ufraw.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- ufraw.c 11 Aug 2009 15:15:12 -0000 1.52
+++ ufraw.c 11 Dec 2009 23:54:13 -0000 1.53
@@ -10,18 +10,12 @@
* (at your option) any later version.
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h> /* for printf */
+#include "ufraw.h"
+#include "uf_gtk.h"
#include <stdlib.h> /* for exit */
#include <errno.h> /* for errno */
#include <string.h>
-#include "uf_glib.h"
#include <glib/gi18n.h>
-#include "uf_gtk.h"
-#include "ufraw.h"
char *ufraw_binary;
Index: ufraw-batch.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw-batch.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- ufraw-batch.c 25 Nov 2009 16:15:45 -0000 1.30
+++ ufraw-batch.c 11 Dec 2009 23:54:13 -0000 1.31
@@ -10,16 +10,11 @@
* (at your option) any later version.
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
+#include "ufraw.h"
#include <stdlib.h> /* for exit */
#include <errno.h> /* for errno */
#include <string.h>
-#include "uf_glib.h"
#include <glib/gi18n.h>
-#include "ufraw.h"
static gboolean silentMessenger;
char *ufraw_binary;
Index: ufraw_developer.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_developer.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- ufraw_developer.c 27 Nov 2009 07:18:23 -0000 1.78
+++ ufraw_developer.c 11 Dec 2009 23:54:13 -0000 1.79
@@ -10,20 +10,12 @@
* (at your option) any later version.
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
+#include "ufraw.h"
#ifdef _OPENMP
#include <omp.h>
#endif
-
-#include <stdio.h>
#include <math.h>
#include <lcms.h>
-#include "uf_glib.h"
-#include "nikon_curve.h"
-#include "ufraw.h"
static int lcms_message(int ErrorCode, const char *ErrorText)
{
Index: ufraw_message.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_message.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ufraw_message.c 3 Jul 2008 15:45:06 -0000 1.7
+++ ufraw_message.c 11 Dec 2009 23:54:13 -0000 1.8
@@ -10,13 +10,8 @@
* (at your option) any later version.
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <string.h>
-#include <glib.h>
#include "ufraw.h"
+#include <string.h>
/*
* Every ufraw internal function that might fail should return a status
------------------------------------------------------------------------------
Return on Information:
Google Enterprise Search pays you back
Get the facts.
http://p.sf.net/sfu/google-dev2dev
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
