[Rawstudio-commit] r2037 - trunk/src

[Anders Brander]

Author: abrander
Date: 2008-09-29 01:27:43 +0200 (Mon, 29 Sep 2008)
New Revision: 2037

Modified:
   trunk/src/rawstudio.h
   trunk/src/rs-metadata.h
   trunk/src/rs-preview-widget.c
   trunk/src/x3f-meta.c
Log:
Moved RSMetadata declaration to rs-metadata.h

Modified: trunk/src/rawstudio.h
===================================================================
--- trunk/src/rawstudio.h	2008-09-28 23:19:05 UTC (rev 2036)
+++ trunk/src/rawstudio.h	2008-09-28 23:27:43 UTC (rev 2037)
@@ -123,6 +123,9 @@
 /* Defined in rs-color-transform.c */
 typedef struct _RSColorTransform RSColorTransform;
 
+/* Defined in rs-metadata.h */
+typedef struct _RSMetadata RSMetadata;
+
 typedef struct {double coeff[3][3]; } RS_MATRIX3;
 typedef struct {int coeff[3][3]; } RS_MATRIX3Int;
 typedef struct {double coeff[4][4]; } RS_MATRIX4;
@@ -174,35 +177,6 @@
 	gfloat *curve_knots;
 } RS_SETTINGS_DOUBLE;
 
-typedef struct _metadata {
-	GObject parent;
-	gboolean dispose_has_run;
-	gint make;
-	gchar *make_ascii;
-	gchar *model_ascii;
-	gchar *time_ascii;
-	GTime timestamp;
-	gushort orientation;
-	gfloat aperture;
-	gushort iso;
-	gfloat shutterspeed;
-	guint thumbnail_start;
-	guint thumbnail_length;
-	guint preview_start;
-	guint preview_length;
-	guint16 preview_planar_config;
-	guint preview_width;
-	guint preview_height;
-	guint16 preview_bits [3];
-	gdouble cam_mul[4];
-	gdouble contrast;
-	gdouble saturation;
-	gdouble color_tone;
-	gshort focallength;
-	RS_MATRIX4 adobe_coeff;
-	GdkPixbuf *thumbnail;
-} RSMetadata;
-
 typedef struct _photo {
 	GObject parent;
 	gchar *filename;

Modified: trunk/src/rs-metadata.h
===================================================================
--- trunk/src/rs-metadata.h	2008-09-28 23:19:05 UTC (rev 2036)
+++ trunk/src/rs-metadata.h	2008-09-28 23:27:43 UTC (rev 2037)
@@ -32,7 +32,35 @@
 #define RS_IS_METADATA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), RS_TYPE_METADATA))
 #define RS_METADATA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), RS_TYPE_METADATA, RSMetadataClass))
 
-//typedef struct _rs_metadata RSMetadata;
+struct _RSMetadata {
+	GObject parent;
+	gboolean dispose_has_run;
+	gint make;
+	gchar *make_ascii;
+	gchar *model_ascii;
+	gchar *time_ascii;
+	GTime timestamp;
+	gushort orientation;
+	gfloat aperture;
+	gushort iso;
+	gfloat shutterspeed;
+	guint thumbnail_start;
+	guint thumbnail_length;
+	guint preview_start;
+	guint preview_length;
+	guint16 preview_planar_config;
+	guint preview_width;
+	guint preview_height;
+	guint16 preview_bits [3];
+	gdouble cam_mul[4];
+	gdouble contrast;
+	gdouble saturation;
+	gdouble color_tone;
+	gshort focallength;
+	RS_MATRIX4 adobe_coeff;
+	GdkPixbuf *thumbnail;
+};
+
 typedef struct {
   GObjectClass parent_class;
 } RSMetadataClass;

Modified: trunk/src/rs-preview-widget.c
===================================================================
--- trunk/src/rs-preview-widget.c	2008-09-28 23:19:05 UTC (rev 2036)
+++ trunk/src/rs-preview-widget.c	2008-09-28 23:27:43 UTC (rev 2037)
@@ -31,6 +31,7 @@
 #include "rs-photo.h"
 #include "rs-actions.h"
 #include "rs-job.h"
+#include "rs-metadata.h" /* FIXME: Remove this line and add rs_metadata_get_adobe_matrix() */
 #include <gettext.h>
 
 typedef enum {

Modified: trunk/src/x3f-meta.c
===================================================================
--- trunk/src/x3f-meta.c	2008-09-28 23:19:05 UTC (rev 2036)
+++ trunk/src/x3f-meta.c	2008-09-28 23:27:43 UTC (rev 2037)
@@ -22,6 +22,7 @@
 #include "rawfile.h"
 #include "x3f-meta.h"
 #include "rs-utils.h"
+#include "rs-metadata.h"
 
 /* http://www.x3f.info/technotes/FileDocs/X3F_Format.pdf */