Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12148
Modified Files:
ufraw.h
Log Message:
Fix bug #394: Proper C++ namespacing. Thanks to Jeremy Huddleston Sequoia for
the patch.
Index: ufraw.h
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw.h,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- ufraw.h 1 Jan 2014 06:00:23 -0000 1.173
+++ ufraw.h 12 Jan 2014 01:45:12 -0000 1.174
@@ -45,46 +45,48 @@
/* An impossible value for conf float values */
#define NULLF -10000.0
-/* Options, like auto-adjust buttons can be in 3 states. Enabled and disabled
- * are obvious. Apply means that the option was selected and some function
- * has to act accourdingly, before changing to one of the first two states */
-enum { disabled_state, enabled_state, apply_state };
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
-extern const char uf_spot_wb[];
-extern const char uf_manual_wb[];
-extern const char uf_camera_wb[];
-extern const char uf_auto_wb[];
+ /* Options, like auto-adjust buttons can be in 3 states. Enabled and
disabled
+ * are obvious. Apply means that the option was selected and some function
+ * has to act accourdingly, before changing to one of the first two states
*/
+ enum {
+ disabled_state, enabled_state, apply_state
+ };
-/*
- * UFObject Definitions for ufraw_settings.cc
- */
+ extern const char uf_spot_wb[];
+ extern const char uf_manual_wb[];
+ extern const char uf_camera_wb[];
+ extern const char uf_auto_wb[];
-extern UFName ufWB;
-extern UFName ufPreset;
-extern UFName ufWBFineTuning;
-extern UFName ufTemperature;
-extern UFName ufGreen;
-extern UFName ufChannelMultipliers;
-extern UFName ufLensfunAuto;
-extern UFName ufLensfun;
-extern UFName ufCameraModel;
-extern UFName ufLensModel;
-extern UFName ufFocalLength;
-extern UFName ufAperture;
-extern UFName ufDistance;
-extern UFName ufTCA;
-extern UFName ufVignetting;
-extern UFName ufDistortion;
-extern UFName ufModel;
-extern UFName ufLensGeometry;
-extern UFName ufTargetLensGeometry;
-extern UFName ufRawImage;
-extern UFName ufRawResources;
-extern UFName ufCommandLine;
+ /*
+ * UFObject Definitions for ufraw_settings.cc
+ */
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
+ extern UFName ufWB;
+ extern UFName ufPreset;
+ extern UFName ufWBFineTuning;
+ extern UFName ufTemperature;
+ extern UFName ufGreen;
+ extern UFName ufChannelMultipliers;
+ extern UFName ufLensfunAuto;
+ extern UFName ufLensfun;
+ extern UFName ufCameraModel;
+ extern UFName ufLensModel;
+ extern UFName ufFocalLength;
+ extern UFName ufAperture;
+ extern UFName ufDistance;
+ extern UFName ufTCA;
+ extern UFName ufVignetting;
+ extern UFName ufDistortion;
+ extern UFName ufModel;
+ extern UFName ufLensGeometry;
+ extern UFName ufTargetLensGeometry;
+ extern UFName ufRawImage;
+ extern UFName ufRawResources;
+ extern UFName ufCommandLine;
UFObject *ufraw_image_new();
#ifdef HAVE_LENSFUN
------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today.
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
