[Rawstudio-commit] r2039 - trunk/src

[Anders Brander]

Author: abrander
Date: 2008-09-29 01:34:19 +0200 (Mon, 29 Sep 2008)
New Revision: 2039

Modified:
   trunk/src/rawstudio.h
   trunk/src/rs-color-transform.c
   trunk/src/rs-image.h
Log:
Moved declaration of RS_IMAGE16 to rs-image.h.

Modified: trunk/src/rawstudio.h
===================================================================
--- trunk/src/rawstudio.h	2008-09-28 23:29:33 UTC (rev 2038)
+++ trunk/src/rawstudio.h	2008-09-28 23:34:19 UTC (rev 2039)
@@ -126,27 +126,14 @@
 /* Defined in rs-metadata.h */
 typedef struct _RSMetadata RSMetadata;
 
+/* Defined in rs-image.h */
+typedef struct _rs_image16 RS_IMAGE16;
+
 typedef struct {double coeff[3][3]; } RS_MATRIX3;
 typedef struct {int coeff[3][3]; } RS_MATRIX3Int;
 typedef struct {double coeff[4][4]; } RS_MATRIX4;
 typedef struct {int coeff[4][4]; } RS_MATRIX4Int;
 
-typedef struct _rs_image16 {
-	GObject parent;
-	gint w;
-	gint h;
-	gint pitch;
-	gint rowstride;
-	guint channels;
-	guint pixelsize; /* the size of a pixel in SHORTS */
-	guint orientation;
-	gushort *pixels;
-	guint filters;
-	guint fourColorFilters;
-	gboolean preview;
-	gboolean dispose_has_run;
-} RS_IMAGE16;
-
 typedef struct {
 	gint x1;
 	gint y1;

Modified: trunk/src/rs-color-transform.c
===================================================================
--- trunk/src/rs-color-transform.c	2008-09-28 23:29:33 UTC (rev 2038)
+++ trunk/src/rs-color-transform.c	2008-09-28 23:34:19 UTC (rev 2039)
@@ -21,6 +21,7 @@
 #include "color.h"
 #include "rs-color-transform.h"
 #include "rs-spline.h"
+#include "rs-image.h"
 
 static void make_tables(RSColorTransform *rct);
 static gboolean select_render(RSColorTransform *rct);

Modified: trunk/src/rs-image.h
===================================================================
--- trunk/src/rs-image.h	2008-09-28 23:29:33 UTC (rev 2038)
+++ trunk/src/rs-image.h	2008-09-28 23:34:19 UTC (rev 2039)
@@ -29,6 +29,22 @@
 #define RS_IS_IMAGE16_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), RS_TYPE_IMAGE16))
 #define RS_IMAGE16_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), RS_TYPE_IMAGE16, RS_IMAGE16Class))
 
+struct _rs_image16 {
+	GObject parent;
+	gint w;
+	gint h;
+	gint pitch;
+	gint rowstride;
+	guint channels;
+	guint pixelsize; /* the size of a pixel in SHORTS */
+	guint orientation;
+	gushort *pixels;
+	guint filters;
+	guint fourColorFilters;
+	gboolean preview;
+	gboolean dispose_has_run;
+};
+
 typedef struct _RS_IMAGE16Class RS_IMAGE16Class;
 
 struct _RS_IMAGE16Class {