[Rawstudio-commit] r2048 - trunk/src

[Anders Brander]

Author: abrander
Date: 2008-09-29 02:11:31 +0200 (Mon, 29 Sep 2008)
New Revision: 2048

Modified:
   trunk/src/rawstudio.h
   trunk/src/rs-preview-widget.c
Log:
Moved ROI_GRID_*-enums to rs-preview-widget.c.

Modified: trunk/src/rawstudio.h
===================================================================
--- trunk/src/rawstudio.h	2008-09-29 00:08:15 UTC (rev 2047)
+++ trunk/src/rawstudio.h	2008-09-29 00:11:31 UTC (rev 2048)
@@ -53,16 +53,6 @@
 
 #define MASK_WB (MASK_WARMTH|MASK_TINT)
 
-enum {
-	ROI_GRID_NONE = 0,
-	ROI_GRID_GOLDEN,
-	ROI_GRID_THIRDS,
-	ROI_GRID_GOLDEN_TRIANGLES1,
-	ROI_GRID_GOLDEN_TRIANGLES2,
-	ROI_GRID_HARMONIOUS_TRIANGLES1,
-	ROI_GRID_HARMONIOUS_TRIANGLES2,
-};
-
 #if __GNUC__ >= 3
 #define likely(x) __builtin_expect (!!(x), 1)
 #define unlikely(x) __builtin_expect (!!(x), 0)

Modified: trunk/src/rs-preview-widget.c
===================================================================
--- trunk/src/rs-preview-widget.c	2008-09-29 00:08:15 UTC (rev 2047)
+++ trunk/src/rs-preview-widget.c	2008-09-29 00:11:31 UTC (rev 2048)
@@ -35,6 +35,16 @@
 #include "rs-utils.h"
 #include <gettext.h>
 
+enum {
+	ROI_GRID_NONE = 0,
+	ROI_GRID_GOLDEN,
+	ROI_GRID_THIRDS,
+	ROI_GRID_GOLDEN_TRIANGLES1,
+	ROI_GRID_GOLDEN_TRIANGLES2,
+	ROI_GRID_HARMONIOUS_TRIANGLES1,
+	ROI_GRID_HARMONIOUS_TRIANGLES2,
+};
+
 typedef enum {
 	NORMAL           = 0x000F, /* 0000 0000 0000 1111 */
 	WB_PICKER        = 0x0001, /* 0000 0000 0000 0001 */