[Rawstudio-commit] r2007 - trunk/src
Anders Brander
anders at brander.dk
Tue Sep 16 18:49:41 CEST 2008
Author: abrander
Date: 2008-09-16 18:49:41 +0200 (Tue, 16 Sep 2008)
New Revision: 2007
Modified:
trunk/src/ciff-meta.c
trunk/src/ciff-meta.h
trunk/src/mrw-meta.c
trunk/src/mrw-meta.h
trunk/src/raf-meta.c
trunk/src/raf-meta.h
trunk/src/rawstudio.c
trunk/src/rawstudio.h
trunk/src/rs-store.c
trunk/src/tiff-meta.c
trunk/src/tiff-meta.h
trunk/src/x3f-meta.c
trunk/src/x3f-meta.h
Log:
Renamed RS_METADATA to RSMetadata.
Modified: trunk/src/ciff-meta.c
===================================================================
--- trunk/src/ciff-meta.c 2008-09-16 15:43:50 UTC (rev 2006)
+++ trunk/src/ciff-meta.c 2008-09-16 16:49:41 UTC (rev 2007)
@@ -25,10 +25,10 @@
#include "adobe-coeff.h"
#include "rs-utils.h"
-gboolean raw_crw_walker(RAWFILE *rawfile, guint offset, guint length, RS_METADATA *meta);
+gboolean raw_crw_walker(RAWFILE *rawfile, guint offset, guint length, RSMetadata *meta);
gboolean
-raw_crw_walker(RAWFILE *rawfile, guint offset, guint length, RS_METADATA *meta)
+raw_crw_walker(RAWFILE *rawfile, guint offset, guint length, RSMetadata *meta)
{
guint valuedata=0;
gushort records=0;
@@ -177,7 +177,7 @@
}
void
-rs_ciff_load_meta(const gchar *filename, RS_METADATA *meta)
+rs_ciff_load_meta(const gchar *filename, RSMetadata *meta)
{
guint root=0;
RAWFILE *rawfile;
@@ -201,7 +201,7 @@
GdkPixbuf *pixbuf = NULL, *pixbuf2 = NULL;
gdouble ratio;
guint start=0, length=0, root=0;
- RS_METADATA *m;
+ RSMetadata *m;
RAWFILE *rawfile;
raw_init();
Modified: trunk/src/ciff-meta.h
===================================================================
--- trunk/src/ciff-meta.h 2008-09-16 15:43:50 UTC (rev 2006)
+++ trunk/src/ciff-meta.h 2008-09-16 16:49:41 UTC (rev 2007)
@@ -17,5 +17,5 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-void rs_ciff_load_meta(const gchar *filename, RS_METADATA *meta);
+void rs_ciff_load_meta(const gchar *filename, RSMetadata *meta);
GdkPixbuf *rs_ciff_load_thumb(const gchar *src);
Modified: trunk/src/mrw-meta.c
===================================================================
--- trunk/src/mrw-meta.c 2008-09-16 15:43:50 UTC (rev 2006)
+++ trunk/src/mrw-meta.c 2008-09-16 16:49:41 UTC (rev 2007)
@@ -23,10 +23,10 @@
#include "mrw-meta.h"
#include "tiff-meta.h"
-static void raw_mrw_walker(RAWFILE *rawfile, guint offset, RS_METADATA *meta);
+static void raw_mrw_walker(RAWFILE *rawfile, guint offset, RSMetadata *meta);
static void
-raw_mrw_walker(RAWFILE *rawfile, guint offset, RS_METADATA *meta)
+raw_mrw_walker(RAWFILE *rawfile, guint offset, RSMetadata *meta)
{
guint rawstart=0;
guint tag=0, len=0;
@@ -68,7 +68,7 @@
}
void
-rs_mrw_load_meta(const gchar *filename, RS_METADATA *meta)
+rs_mrw_load_meta(const gchar *filename, RSMetadata *meta)
{
RAWFILE *rawfile;
raw_init();
@@ -86,7 +86,7 @@
{
RAWFILE *rawfile;
GdkPixbuf *pixbuf=NULL, *pixbuf2=NULL;
- RS_METADATA meta;
+ RSMetadata meta;
guint start=0, length=0;
raw_init();
Modified: trunk/src/mrw-meta.h
===================================================================
--- trunk/src/mrw-meta.h 2008-09-16 15:43:50 UTC (rev 2006)
+++ trunk/src/mrw-meta.h 2008-09-16 16:49:41 UTC (rev 2007)
@@ -20,7 +20,7 @@
#ifndef MRW_META_H
#define MRW_META_H
-extern void rs_mrw_load_meta(const gchar *filename, RS_METADATA *meta);
+extern void rs_mrw_load_meta(const gchar *filename, RSMetadata *meta);
extern GdkPixbuf *rs_mrw_load_thumb(const gchar *src);
#endif
Modified: trunk/src/raf-meta.c
===================================================================
--- trunk/src/raf-meta.c 2008-09-16 15:43:50 UTC (rev 2006)
+++ trunk/src/raf-meta.c 2008-09-16 16:49:41 UTC (rev 2007)
@@ -27,7 +27,7 @@
#include "rs-utils.h"
void
-rs_raf_load_meta(const gchar *filename, RS_METADATA *meta)
+rs_raf_load_meta(const gchar *filename, RSMetadata *meta)
{
RAWFILE *rawfile;
guint directory;
Modified: trunk/src/raf-meta.h
===================================================================
--- trunk/src/raf-meta.h 2008-09-16 15:43:50 UTC (rev 2006)
+++ trunk/src/raf-meta.h 2008-09-16 16:49:41 UTC (rev 2007)
@@ -19,5 +19,5 @@
#include "rawstudio.h"
-extern void rs_raf_load_meta(const gchar *filename, RS_METADATA *meta);
+extern void rs_raf_load_meta(const gchar *filename, RSMetadata *meta);
extern GdkPixbuf *rs_raf_load_thumb(const gchar *src);
Modified: trunk/src/rawstudio.c
===================================================================
--- trunk/src/rawstudio.c 2008-09-16 15:43:50 UTC (rev 2006)
+++ trunk/src/rawstudio.c 2008-09-16 16:49:41 UTC (rev 2007)
@@ -62,7 +62,7 @@
rs_add_filetype(gchar *id, gint filetype, const gchar *ext, gchar *description,
RS_IMAGE16 *(*load)(const gchar *, gboolean),
GdkPixbuf *(*thumb)(const gchar *),
- void (*load_meta)(const gchar *, RS_METADATA *),
+ void (*load_meta)(const gchar *, RSMetadata *),
gboolean (*save)(RS_PHOTO *photo, const gchar *filename, gint filetype, gint width, gint height, gboolean keep_aspect, gdouble scale, gint snapshot, RS_CMS *cms))
{
RS_FILETYPE *cur = filetypes;
@@ -424,12 +424,12 @@
return;
}
-RS_METADATA *
+RSMetadata *
rs_metadata_new(void)
{
- RS_METADATA *metadata;
+ RSMetadata *metadata;
gint i;
- metadata = g_malloc(sizeof(RS_METADATA));
+ metadata = g_malloc(sizeof(RSMetadata));
metadata->make = MAKE_UNKNOWN;
metadata->make_ascii = NULL;
metadata->model_ascii = NULL;
@@ -458,7 +458,7 @@
}
void
-rs_metadata_free(RS_METADATA *metadata)
+rs_metadata_free(RSMetadata *metadata)
{
if (metadata->make_ascii)
g_free(metadata->make_ascii);
@@ -474,7 +474,7 @@
* Load metadata from file
*/
gboolean
-rs_metadata_load(const gchar *filename, RS_METADATA *metadata)
+rs_metadata_load(const gchar *filename, RSMetadata *metadata)
{
gboolean ret = FALSE;
RS_FILETYPE *filetype;
@@ -493,7 +493,7 @@
}
gchar *
-rs_metadata_get_short_description(RS_METADATA *metadata)
+rs_metadata_get_short_description(RSMetadata *metadata)
{
GString *label = g_string_new("");
gchar *ret = NULL;
@@ -517,7 +517,7 @@
}
void
-rs_metadata_normalize_wb(RS_METADATA *meta)
+rs_metadata_normalize_wb(RSMetadata *meta)
{
gdouble div;
if ((meta->cam_mul[1]+meta->cam_mul[3])!=0.0)
@@ -1126,7 +1126,7 @@
gboolean wb_ok = FALSE;
gboolean focallength_ok = FALSE;
- RS_METADATA *metadata = rs_metadata_new();
+ RSMetadata *metadata = rs_metadata_new();
g_strstrip(filename);
RS_FILETYPE *filetype = rs_filetype_get(filename, TRUE);
Modified: trunk/src/rawstudio.h
===================================================================
--- trunk/src/rawstudio.h 2008-09-16 15:43:50 UTC (rev 2006)
+++ trunk/src/rawstudio.h 2008-09-16 16:49:41 UTC (rev 2007)
@@ -181,6 +181,7 @@
} RS_SETTINGS_DOUBLE;
typedef struct _metadata {
+ GObject parent;
gint make;
gchar *make_ascii;
gchar *model_ascii;
@@ -204,7 +205,7 @@
gdouble color_tone;
gshort focallength;
RS_MATRIX4 adobe_coeff;
-} RS_METADATA;
+} RSMetadata;
typedef struct _photo {
GObject parent;
@@ -213,7 +214,7 @@
RS_SETTINGS_DOUBLE *settings[3];
gint priority;
guint orientation;
- RS_METADATA *metadata;
+ RSMetadata *metadata;
RS_RECT *crop;
gdouble angle;
gboolean exported;
@@ -255,7 +256,7 @@
gchar *description;
RS_IMAGE16 *(*load)(const gchar *, gboolean);
GdkPixbuf *(*thumb)(const gchar *);
- void (*load_meta)(const gchar *, RS_METADATA *);
+ void (*load_meta)(const gchar *, RSMetadata *);
gboolean (*save)(RS_PHOTO *photo, const gchar *filename, gint filetype, gint width, gint height, gboolean keep_aspect, gdouble scale, gint snapshot, RS_CMS *cms);
struct _rs_filetype *next;
} RS_FILETYPE;
@@ -276,11 +277,11 @@
RS_SETTINGS_DOUBLE *rs_settings_double_new(void);
void rs_settings_double_copy(const RS_SETTINGS_DOUBLE *in, RS_SETTINGS_DOUBLE *out, gint mask);
void rs_settings_double_free(RS_SETTINGS_DOUBLE *rssd);
-RS_METADATA *rs_metadata_new();
-void rs_metadata_free(RS_METADATA *metadata);
-gboolean rs_metadata_load(const gchar *filename, RS_METADATA *metadata);
-gchar * rs_metadata_get_short_description(RS_METADATA *metadata);
-void rs_metadata_normalize_wb(RS_METADATA *meta);
+RSMetadata *rs_metadata_new();
+void rs_metadata_free(RSMetadata *metadata);
+gboolean rs_metadata_load(const gchar *filename, RSMetadata *metadata);
+gchar * rs_metadata_get_short_description(RSMetadata *metadata);
+void rs_metadata_normalize_wb(RSMetadata *meta);
RS_BLOB *rs_new();
void rs_free(RS_BLOB *rs);
void rs_set_photo(RS_BLOB *rs, RS_PHOTO *photo);
Modified: trunk/src/rs-store.c
===================================================================
--- trunk/src/rs-store.c 2008-09-16 15:43:50 UTC (rev 2006)
+++ trunk/src/rs-store.c 2008-09-16 16:49:41 UTC (rev 2007)
@@ -1941,7 +1941,7 @@
gchar *filename = NULL;
gint timestamp = 0, timestamp_old = 0;
gint exposure;
- RS_METADATA *meta;
+ RSMetadata *meta;
GList *filenames = NULL;
GtkTreeIter iter;
Modified: trunk/src/tiff-meta.c
===================================================================
--- trunk/src/tiff-meta.c 2008-09-16 15:43:50 UTC (rev 2006)
+++ trunk/src/tiff-meta.c 2008-09-16 16:49:41 UTC (rev 2007)
@@ -48,16 +48,16 @@
static gfloat get_rational(RAWFILE *rawfile, guint offset);
inline static void read_ifd(RAWFILE *rawfile, guint offset, struct IFD *ifd);
-static gboolean makernote_canon(RAWFILE *rawfile, guint offset, RS_METADATA *meta);
-static gboolean makernote_leica(RAWFILE *rawfile, guint offset, RS_METADATA *meta);
-static gboolean makernote_minolta(RAWFILE *rawfile, guint offset, RS_METADATA *meta);
-static gboolean makernote_nikon(RAWFILE *rawfile, guint offset, RS_METADATA *meta);
-static gboolean makernote_olympus(RAWFILE *rawfile, guint base, guint offset, RS_METADATA *meta);
-static gboolean makernote_olympus_camerasettings(RAWFILE *rawfile, guint base, guint offset, RS_METADATA *meta);
-static gboolean makernote_olympus_imageprocessing(RAWFILE *rawfile, guint base, guint offset, RS_METADATA *meta);
-static gboolean makernote_panasonic(RAWFILE *rawfile, guint offset, RS_METADATA *meta);
-static gboolean makernote_pentax(RAWFILE *rawfile, guint offset, RS_METADATA *meta);
-static gboolean ifd_reader(RAWFILE *rawfile, guint offset, RS_METADATA *meta);
+static gboolean makernote_canon(RAWFILE *rawfile, guint offset, RSMetadata *meta);
+static gboolean makernote_leica(RAWFILE *rawfile, guint offset, RSMetadata *meta);
+static gboolean makernote_minolta(RAWFILE *rawfile, guint offset, RSMetadata *meta);
+static gboolean makernote_nikon(RAWFILE *rawfile, guint offset, RSMetadata *meta);
+static gboolean makernote_olympus(RAWFILE *rawfile, guint base, guint offset, RSMetadata *meta);
+static gboolean makernote_olympus_camerasettings(RAWFILE *rawfile, guint base, guint offset, RSMetadata *meta);
+static gboolean makernote_olympus_imageprocessing(RAWFILE *rawfile, guint base, guint offset, RSMetadata *meta);
+static gboolean makernote_panasonic(RAWFILE *rawfile, guint offset, RSMetadata *meta);
+static gboolean makernote_pentax(RAWFILE *rawfile, guint offset, RSMetadata *meta);
+static gboolean ifd_reader(RAWFILE *rawfile, guint offset, RSMetadata *meta);
typedef enum tiff_field_type
{
@@ -178,7 +178,7 @@
#endif
static gboolean
-makernote_canon(RAWFILE *rawfile, guint offset, RS_METADATA *meta)
+makernote_canon(RAWFILE *rawfile, guint offset, RSMetadata *meta)
{
gushort number_of_entries = 0;
gushort ushort_temp1;
@@ -232,7 +232,7 @@
}
static gboolean
-makernote_leica(RAWFILE *rawfile, guint offset, RS_METADATA *meta)
+makernote_leica(RAWFILE *rawfile, guint offset, RSMetadata *meta)
{
gboolean ret = FALSE;
gushort number_of_entries = 0;
@@ -327,7 +327,7 @@
}
static gboolean
-makernote_minolta(RAWFILE *rawfile, guint offset, RS_METADATA *meta)
+makernote_minolta(RAWFILE *rawfile, guint offset, RSMetadata *meta)
{
gushort number_of_entries = 0;
@@ -362,7 +362,7 @@
}
static gboolean
-makernote_nikon(RAWFILE *rawfile, guint offset, RS_METADATA *meta)
+makernote_nikon(RAWFILE *rawfile, guint offset, RSMetadata *meta)
{
static const guchar xlat[2][256] = {
{ 0xc1,0xbf,0x6d,0x0d,0x59,0xc5,0x13,0x9d,0x83,0x61,0x6b,0x4f,0xc7,0x7f,0x3d,0x3d,
@@ -592,7 +592,7 @@
}
static gboolean
-makernote_olympus_camerasettings(RAWFILE *rawfile, guint base, guint offset, RS_METADATA *meta)
+makernote_olympus_camerasettings(RAWFILE *rawfile, guint base, guint offset, RSMetadata *meta)
{
/* NOTE! At least on E-410 the offsets in this section is relative to
the base of the MakerNotes! */
@@ -642,7 +642,7 @@
}
static gboolean
-makernote_olympus_imageprocessing(RAWFILE *rawfile, guint base, guint offset, RS_METADATA *meta)
+makernote_olympus_imageprocessing(RAWFILE *rawfile, guint base, guint offset, RSMetadata *meta)
{
gushort number_of_entries;
struct IFD ifd;
@@ -684,7 +684,7 @@
}
static gboolean
-makernote_olympus(RAWFILE *rawfile, guint base, guint offset, RS_METADATA *meta)
+makernote_olympus(RAWFILE *rawfile, guint base, guint offset, RSMetadata *meta)
{
gushort number_of_entries;
gushort fieldtag=0;
@@ -742,7 +742,7 @@
}
static gboolean
-makernote_panasonic(RAWFILE *rawfile, guint offset, RS_METADATA *meta)
+makernote_panasonic(RAWFILE *rawfile, guint offset, RSMetadata *meta)
{
gushort number_of_entries;
struct IFD ifd;
@@ -789,7 +789,7 @@
}
static gboolean
-makernote_pentax(RAWFILE *rawfile, guint offset, RS_METADATA *meta)
+makernote_pentax(RAWFILE *rawfile, guint offset, RSMetadata *meta)
{
gushort number_of_entries;
gushort ushort_temp1=0;
@@ -831,7 +831,7 @@
}
gboolean
-exif_reader(RAWFILE *rawfile, guint offset, RS_METADATA *meta)
+exif_reader(RAWFILE *rawfile, guint offset, RSMetadata *meta)
{
gushort number_of_entries = 0;
@@ -912,7 +912,7 @@
}
static gboolean
-ifd_reader(RAWFILE *rawfile, guint offset, RS_METADATA *meta)
+ifd_reader(RAWFILE *rawfile, guint offset, RSMetadata *meta)
{
gushort number_of_entries = 0;
gboolean is_preview = FALSE;
@@ -1052,7 +1052,7 @@
}
void
-rs_tiff_load_meta_from_rawfile(RAWFILE *rawfile, guint offset, RS_METADATA *meta)
+rs_tiff_load_meta_from_rawfile(RAWFILE *rawfile, guint offset, RSMetadata *meta)
{
guint next = 0;
gushort ifd_num = 0;
@@ -1098,7 +1098,7 @@
}
void
-rs_tiff_load_meta(const gchar *filename, RS_METADATA *meta)
+rs_tiff_load_meta(const gchar *filename, RSMetadata *meta)
{
RAWFILE *rawfile;
@@ -1118,7 +1118,7 @@
RAWFILE *rawfile;
GdkPixbuf *pixbuf=NULL, *pixbuf2=NULL;
guint start=0, length=0;
- RS_METADATA *meta = rs_metadata_new();
+ RSMetadata *meta = rs_metadata_new();
if (!(rawfile = raw_open_file(src)))
return(NULL);
Modified: trunk/src/tiff-meta.h
===================================================================
--- trunk/src/tiff-meta.h 2008-09-16 15:43:50 UTC (rev 2006)
+++ trunk/src/tiff-meta.h 2008-09-16 16:49:41 UTC (rev 2007)
@@ -19,7 +19,7 @@
#include "rawstudio.h"
-extern gboolean exif_reader(RAWFILE *rawfile, guint offset, RS_METADATA *meta);
-extern void rs_tiff_load_meta_from_rawfile(RAWFILE *rawfile, guint offset, RS_METADATA *meta);
-extern void rs_tiff_load_meta(const gchar *filename, RS_METADATA *meta);
+extern gboolean exif_reader(RAWFILE *rawfile, guint offset, RSMetadata *meta);
+extern void rs_tiff_load_meta_from_rawfile(RAWFILE *rawfile, guint offset, RSMetadata *meta);
+extern void rs_tiff_load_meta(const gchar *filename, RSMetadata *meta);
extern GdkPixbuf *rs_tiff_load_thumb(const gchar *src);
Modified: trunk/src/x3f-meta.c
===================================================================
--- trunk/src/x3f-meta.c 2008-09-16 15:43:50 UTC (rev 2006)
+++ trunk/src/x3f-meta.c 2008-09-16 16:49:41 UTC (rev 2007)
@@ -110,7 +110,7 @@
} __attribute__ ((packed)) X3F_PROPERTY_ENTRY;
void
-rs_x3f_load_meta(const gchar *filename, RS_METADATA *meta)
+rs_x3f_load_meta(const gchar *filename, RSMetadata *meta)
{
gint i;
RAWFILE *rawfile;
Modified: trunk/src/x3f-meta.h
===================================================================
--- trunk/src/x3f-meta.h 2008-09-16 15:43:50 UTC (rev 2006)
+++ trunk/src/x3f-meta.h 2008-09-16 16:49:41 UTC (rev 2007)
@@ -17,5 +17,5 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-extern void rs_x3f_load_meta(const gchar *filename, RS_METADATA *meta);
+extern void rs_x3f_load_meta(const gchar *filename, RSMetadata *meta);
GdkPixbuf *rs_x3f_load_thumb(const gchar *src);
More information about the Rawstudio-commit
mailing list