summaryrefslogtreecommitdiff
path: root/src/photos
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-03-22 06:39:17 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-03-22 06:39:17 +0100
commit3253d99365813f2d2ffd05e10cbb8c11f53d746e (patch)
tree0ab6f04d9051dc4ada1c4f977a01308227767234 /src/photos
parente69c1b746d63bf794316669471474ab57c8cd40a (diff)
New upstream version 0.26.0upstream/0.26.0
Diffstat (limited to 'src/photos')
-rw-r--r--src/photos/GRaw.c1635
-rw-r--r--src/photos/GRaw.vala12
-rw-r--r--src/photos/PhotoFileAdapter.c422
-rw-r--r--src/photos/PhotoFileAdapter.vala15
-rw-r--r--src/photos/RawSupport.c866
-rw-r--r--src/photos/RawSupport.vala13
6 files changed, 1600 insertions, 1363 deletions
diff --git a/src/photos/GRaw.c b/src/photos/GRaw.c
index 2b56cbf..12ffba3 100644
--- a/src/photos/GRaw.c
+++ b/src/photos/GRaw.c
@@ -29,6 +29,8 @@
#define GRAW_TYPE_INTERPOLATION_QUALITY (graw_interpolation_quality_get_type ())
+#define GRAW_TYPE_USE_CAMERA_MATRIX (graw_use_camera_matrix_get_type ())
+
#define GRAW_TYPE_PROCESSED_IMAGE (graw_processed_image_get_type ())
#define GRAW_PROCESSED_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GRAW_TYPE_PROCESSED_IMAGE, GRawProcessedImage))
#define GRAW_PROCESSED_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GRAW_TYPE_PROCESSED_IMAGE, GRawProcessedImageClass))
@@ -115,6 +117,12 @@ typedef enum {
GRAW_INTERPOLATION_QUALITY_AHD = 3
} GRawInterpolationQuality;
+typedef enum {
+ GRAW_USE_CAMERA_MATRIX_IGNORE = 0,
+ GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_PROFILE = 1,
+ GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_DATA = 3
+} GRawUseCameraMatrix;
+
struct _GRawProcessedImage {
GTypeInstance parent_instance;
volatile int ref_count;
@@ -168,6 +176,7 @@ GType graw_flip_get_type (void) G_GNUC_CONST;
GType graw_fuji_rotate_get_type (void) G_GNUC_CONST;
GType graw_highlight_mode_get_type (void) G_GNUC_CONST;
GType graw_interpolation_quality_get_type (void) G_GNUC_CONST;
+GType graw_use_camera_matrix_get_type (void) G_GNUC_CONST;
gpointer graw_processed_image_ref (gpointer instance);
void graw_processed_image_unref (gpointer instance);
GParamSpec* graw_param_spec_processed_image (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -290,6 +299,18 @@ GType graw_interpolation_quality_get_type (void) {
}
+GType graw_use_camera_matrix_get_type (void) {
+ static volatile gsize graw_use_camera_matrix_type_id__volatile = 0;
+ if (g_once_init_enter (&graw_use_camera_matrix_type_id__volatile)) {
+ static const GEnumValue values[] = {{GRAW_USE_CAMERA_MATRIX_IGNORE, "GRAW_USE_CAMERA_MATRIX_IGNORE", "ignore"}, {GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_PROFILE, "GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_PROFILE", "embedded-color-profile"}, {GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_DATA, "GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_DATA", "embedded-color-data"}, {0, NULL, NULL}};
+ GType graw_use_camera_matrix_type_id;
+ graw_use_camera_matrix_type_id = g_enum_register_static ("GRawUseCameraMatrix", values);
+ g_once_init_leave (&graw_use_camera_matrix_type_id__volatile, graw_use_camera_matrix_type_id);
+ }
+ return graw_use_camera_matrix_type_id__volatile;
+}
+
+
GRawProcessedImage* graw_processed_image_construct (GType object_type, libraw_data_t* proc, GError** error) {
GRawProcessedImage* self = NULL;
enum LibRaw_errors _result_ = 0;
@@ -312,91 +333,91 @@ GRawProcessedImage* graw_processed_image_construct (GType object_type, libraw_da
gushort _tmp15_ = 0U;
GdkPixbuf* _tmp16_ = NULL;
GError * _inner_error_ = NULL;
-#line 106 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 112 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_val_if_fail (proc != NULL, NULL);
-#line 106 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 112 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
self = (GRawProcessedImage*) g_type_create_instance (object_type);
-#line 107 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 113 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_result_ = LIBRAW_SUCCESS;
-#line 108 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = proc;
-#line 108 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp1_ = libraw_dcraw_make_mem_image (_tmp0_, &_result_);
-#line 108 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_free0 (self->priv->image);
-#line 108 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
self->priv->image = _tmp1_;
-#line 109 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp2_ = _result_;
-#line 109 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
graw_throw_exception ("ProcessedImage", _tmp2_, &_inner_error_);
-#line 109 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 109 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 109 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_propagate_error (error, _inner_error_);
-#line 109 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_graw_processed_image_unref0 (self);
-#line 109 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return NULL;
-#line 344 "GRaw.c"
+#line 365 "GRaw.c"
} else {
-#line 109 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 109 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_clear_error (&_inner_error_);
-#line 109 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return NULL;
-#line 352 "GRaw.c"
+#line 373 "GRaw.c"
}
}
-#line 110 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 116 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp3_ = self->priv->image;
-#line 110 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 116 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_vala_assert (_tmp3_ != NULL, "image != null");
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp4_ = self->priv->image;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp5_ = _tmp4_->data;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp5__length1 = _tmp4_->data_size;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp6_ = self->priv->image;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp7_ = _tmp6_->bits;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp8_ = self->priv->image;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp9_ = _tmp8_->width;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp10_ = self->priv->image;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp11_ = _tmp10_->height;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp12_ = self->priv->image;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp13_ = _tmp12_->width;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp14_ = self->priv->image;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp15_ = _tmp14_->colors;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp16_ = gdk_pixbuf_new_from_data (_tmp5_, GDK_COLORSPACE_RGB, FALSE, (gint) _tmp7_, (gint) _tmp9_, (gint) _tmp11_, (gint) (_tmp13_ * _tmp15_), (GdkPixbufDestroyNotify) NULL, NULL);
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_object_unref0 (self->priv->pixbuf);
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
self->priv->pixbuf = _tmp16_;
-#line 106 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 112 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return self;
-#line 393 "GRaw.c"
+#line 414 "GRaw.c"
}
GRawProcessedImage* graw_processed_image_new (libraw_data_t* proc, GError** error) {
-#line 106 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 112 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return graw_processed_image_construct (GRAW_TYPE_PROCESSED_IMAGE, proc, error);
-#line 400 "GRaw.c"
+#line 421 "GRaw.c"
}
@@ -424,50 +445,50 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type
gint _tmp31_ = 0;
gint _tmp32_ = 0;
GError * _inner_error_ = NULL;
-#line 118 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 124 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_val_if_fail (proc != NULL, NULL);
-#line 118 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 124 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
self = (GRawProcessedImage*) g_type_create_instance (object_type);
-#line 119 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 125 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_result_ = LIBRAW_SUCCESS;
-#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 126 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = proc;
-#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 126 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp1_ = libraw_dcraw_make_mem_thumb (_tmp0_, &_result_);
-#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 126 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_free0 (self->priv->image);
-#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 126 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
self->priv->image = _tmp1_;
-#line 121 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp2_ = _result_;
-#line 121 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
graw_throw_exception ("ProcessedImage.from_thumb", _tmp2_, &_inner_error_);
-#line 121 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 121 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 121 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_propagate_error (error, _inner_error_);
-#line 121 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_graw_processed_image_unref0 (self);
-#line 121 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return NULL;
-#line 456 "GRaw.c"
+#line 477 "GRaw.c"
} else {
-#line 121 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 121 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_clear_error (&_inner_error_);
-#line 121 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return NULL;
-#line 464 "GRaw.c"
+#line 485 "GRaw.c"
}
}
-#line 122 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 128 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp3_ = self->priv->image;
-#line 122 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 128 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_vala_assert (_tmp3_ != NULL, "image != null");
-#line 471 "GRaw.c"
+#line 492 "GRaw.c"
{
GBytes* bytes = NULL;
libraw_processed_image_t* _tmp4_ = NULL;
@@ -481,50 +502,50 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type
GdkPixbuf* _tmp11_ = NULL;
GdkPixbuf* _tmp12_ = NULL;
GdkPixbuf* _tmp13_ = NULL;
-#line 128 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp4_ = self->priv->image;
-#line 128 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp5_ = _tmp4_->data;
-#line 128 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp5__length1 = _tmp4_->data_size;
-#line 128 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp6_ = g_bytes_new_static (_tmp5_, _tmp5__length1);
-#line 128 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
bytes = _tmp6_;
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp8_ = bytes;
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp9_ = (GMemoryInputStream*) g_memory_input_stream_new_from_bytes (_tmp8_);
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp10_ = _tmp9_;
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp11_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp12_ = _tmp11_;
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_object_unref0 (_tmp10_);
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp7_ = _tmp12_;
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_bytes_unref0 (bytes);
-#line 513 "GRaw.c"
+#line 534 "GRaw.c"
goto __catch29_g_error;
}
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp13_ = _tmp7_;
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp7_ = NULL;
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_object_unref0 (self->priv->pixbuf);
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
self->priv->pixbuf = _tmp13_;
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_object_unref0 (_tmp7_);
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_bytes_unref0 (bytes);
-#line 528 "GRaw.c"
+#line 549 "GRaw.c"
}
goto __finally29;
__catch29_g_error:
@@ -533,95 +554,95 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type
GError* _tmp14_ = NULL;
const gchar* _tmp15_ = NULL;
GError* _tmp16_ = NULL;
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
err = _inner_error_;
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_inner_error_ = NULL;
-#line 132 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp14_ = err;
-#line 132 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp15_ = _tmp14_->message;
-#line 132 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp16_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSUPPORTED_THUMBNAIL, _tmp15_);
-#line 132 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_inner_error_ = _tmp16_;
-#line 132 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_error_free0 (err);
-#line 551 "GRaw.c"
+#line 572 "GRaw.c"
goto __finally29;
}
__finally29:
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_propagate_error (error, _inner_error_);
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_graw_processed_image_unref0 (self);
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return NULL;
-#line 565 "GRaw.c"
+#line 586 "GRaw.c"
} else {
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_clear_error (&_inner_error_);
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return NULL;
-#line 573 "GRaw.c"
+#line 594 "GRaw.c"
}
}
-#line 136 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 142 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp17_ = self->priv->image;
-#line 136 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 142 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp18_ = self->priv->pixbuf;
-#line 136 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 142 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp19_ = gdk_pixbuf_get_width (_tmp18_);
-#line 136 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 142 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp20_ = _tmp19_;
-#line 136 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 142 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp17_->width = (gushort) _tmp20_;
-#line 137 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 143 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp21_ = self->priv->image;
-#line 137 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 143 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp22_ = self->priv->pixbuf;
-#line 137 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 143 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp23_ = gdk_pixbuf_get_height (_tmp22_);
-#line 137 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 143 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp24_ = _tmp23_;
-#line 137 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 143 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp21_->height = (gushort) _tmp24_;
-#line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp25_ = self->priv->image;
-#line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp26_ = self->priv->pixbuf;
-#line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp27_ = gdk_pixbuf_get_n_channels (_tmp26_);
-#line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp28_ = _tmp27_;
-#line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp25_->colors = (gushort) _tmp28_;
-#line 139 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 145 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp29_ = self->priv->image;
-#line 139 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 145 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp30_ = self->priv->pixbuf;
-#line 139 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 145 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp31_ = gdk_pixbuf_get_bits_per_sample (_tmp30_);
-#line 139 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 145 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp32_ = _tmp31_;
-#line 139 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 145 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp29_->bits = (gushort) _tmp32_;
-#line 118 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 124 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return self;
-#line 618 "GRaw.c"
+#line 639 "GRaw.c"
}
GRawProcessedImage* graw_processed_image_new_from_thumb (libraw_data_t* proc, GError** error) {
-#line 118 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 124 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return graw_processed_image_construct_from_thumb (GRAW_TYPE_PROCESSED_IMAGE, proc, error);
-#line 625 "GRaw.c"
+#line 646 "GRaw.c"
}
@@ -629,17 +650,17 @@ GdkPixbuf* graw_processed_image_get_pixbuf_copy (GRawProcessedImage* self) {
GdkPixbuf* result = NULL;
GdkPixbuf* _tmp0_ = NULL;
GdkPixbuf* _tmp1_ = NULL;
-#line 143 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 149 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), NULL);
-#line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 150 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = self->priv->pixbuf;
-#line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 150 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp1_ = gdk_pixbuf_copy (_tmp0_);
-#line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 150 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
result = _tmp1_;
-#line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 150 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return result;
-#line 643 "GRaw.c"
+#line 664 "GRaw.c"
}
@@ -647,17 +668,17 @@ gushort graw_processed_image_get_width (GRawProcessedImage* self) {
gushort result;
libraw_processed_image_t* _tmp0_ = NULL;
gushort _tmp1_ = 0U;
-#line 71 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 77 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), 0U);
-#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 78 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = self->priv->image;
-#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 78 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp1_ = _tmp0_->width;
-#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 78 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
result = _tmp1_;
-#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 78 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return result;
-#line 661 "GRaw.c"
+#line 682 "GRaw.c"
}
@@ -665,17 +686,17 @@ gushort graw_processed_image_get_height (GRawProcessedImage* self) {
gushort result;
libraw_processed_image_t* _tmp0_ = NULL;
gushort _tmp1_ = 0U;
-#line 77 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 83 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), 0U);
-#line 78 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = self->priv->image;
-#line 78 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp1_ = _tmp0_->height;
-#line 78 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
result = _tmp1_;
-#line 78 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return result;
-#line 679 "GRaw.c"
+#line 700 "GRaw.c"
}
@@ -683,17 +704,17 @@ gushort graw_processed_image_get_colors (GRawProcessedImage* self) {
gushort result;
libraw_processed_image_t* _tmp0_ = NULL;
gushort _tmp1_ = 0U;
-#line 83 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 89 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), 0U);
-#line 84 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 90 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = self->priv->image;
-#line 84 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 90 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp1_ = _tmp0_->colors;
-#line 84 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 90 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
result = _tmp1_;
-#line 84 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 90 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return result;
-#line 697 "GRaw.c"
+#line 718 "GRaw.c"
}
@@ -701,17 +722,17 @@ gushort graw_processed_image_get_bits (GRawProcessedImage* self) {
gushort result;
libraw_processed_image_t* _tmp0_ = NULL;
gushort _tmp1_ = 0U;
-#line 89 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 95 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), 0U);
-#line 90 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = self->priv->image;
-#line 90 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp1_ = _tmp0_->bits;
-#line 90 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
result = _tmp1_;
-#line 90 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return result;
-#line 715 "GRaw.c"
+#line 736 "GRaw.c"
}
@@ -720,19 +741,19 @@ guint8* graw_processed_image_get_data (GRawProcessedImage* self) {
libraw_processed_image_t* _tmp0_ = NULL;
guint8* _tmp1_ = NULL;
gint _tmp1__length1 = 0;
-#line 95 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 101 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), NULL);
-#line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = self->priv->image;
-#line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp1_ = _tmp0_->data;
-#line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp1__length1 = _tmp0_->data_size;
-#line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
result = _tmp1_;
-#line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return result;
-#line 736 "GRaw.c"
+#line 757 "GRaw.c"
}
@@ -740,233 +761,233 @@ guint graw_processed_image_get_data_size (GRawProcessedImage* self) {
guint result;
libraw_processed_image_t* _tmp0_ = NULL;
guint _tmp1_ = 0U;
-#line 101 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 107 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), 0U);
-#line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 108 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = self->priv->image;
-#line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 108 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp1_ = _tmp0_->data_size;
-#line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 108 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
result = _tmp1_;
-#line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 108 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return result;
-#line 754 "GRaw.c"
+#line 775 "GRaw.c"
}
static void graw_value_processed_image_init (GValue* value) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
value->data[0].v_pointer = NULL;
-#line 761 "GRaw.c"
+#line 782 "GRaw.c"
}
static void graw_value_processed_image_free_value (GValue* value) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (value->data[0].v_pointer) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
graw_processed_image_unref (value->data[0].v_pointer);
-#line 770 "GRaw.c"
+#line 791 "GRaw.c"
}
}
static void graw_value_processed_image_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (src_value->data[0].v_pointer) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
dest_value->data[0].v_pointer = graw_processed_image_ref (src_value->data[0].v_pointer);
-#line 780 "GRaw.c"
+#line 801 "GRaw.c"
} else {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
dest_value->data[0].v_pointer = NULL;
-#line 784 "GRaw.c"
+#line 805 "GRaw.c"
}
}
static gpointer graw_value_processed_image_peek_pointer (const GValue* value) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return value->data[0].v_pointer;
-#line 792 "GRaw.c"
+#line 813 "GRaw.c"
}
static gchar* graw_value_processed_image_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (collect_values[0].v_pointer) {
-#line 799 "GRaw.c"
+#line 820 "GRaw.c"
GRawProcessedImage* object;
object = collect_values[0].v_pointer;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (object->parent_instance.g_class == NULL) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 806 "GRaw.c"
+#line 827 "GRaw.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 810 "GRaw.c"
+#line 831 "GRaw.c"
}
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
value->data[0].v_pointer = graw_processed_image_ref (object);
-#line 814 "GRaw.c"
+#line 835 "GRaw.c"
} else {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
value->data[0].v_pointer = NULL;
-#line 818 "GRaw.c"
+#line 839 "GRaw.c"
}
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return NULL;
-#line 822 "GRaw.c"
+#line 843 "GRaw.c"
}
static gchar* graw_value_processed_image_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
GRawProcessedImage** object_p;
object_p = collect_values[0].v_pointer;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (!object_p) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 833 "GRaw.c"
+#line 854 "GRaw.c"
}
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (!value->data[0].v_pointer) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
*object_p = NULL;
-#line 839 "GRaw.c"
+#line 860 "GRaw.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
*object_p = value->data[0].v_pointer;
-#line 843 "GRaw.c"
+#line 864 "GRaw.c"
} else {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
*object_p = graw_processed_image_ref (value->data[0].v_pointer);
-#line 847 "GRaw.c"
+#line 868 "GRaw.c"
}
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return NULL;
-#line 851 "GRaw.c"
+#line 872 "GRaw.c"
}
GParamSpec* graw_param_spec_processed_image (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
GRawParamSpecProcessedImage* spec;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_val_if_fail (g_type_is_a (object_type, GRAW_TYPE_PROCESSED_IMAGE), NULL);
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
G_PARAM_SPEC (spec)->value_type = object_type;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return G_PARAM_SPEC (spec);
-#line 865 "GRaw.c"
+#line 886 "GRaw.c"
}
gpointer graw_value_get_processed_image (const GValue* value) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSED_IMAGE), NULL);
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return value->data[0].v_pointer;
-#line 874 "GRaw.c"
+#line 895 "GRaw.c"
}
void graw_value_set_processed_image (GValue* value, gpointer v_object) {
GRawProcessedImage* old;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSED_IMAGE));
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
old = value->data[0].v_pointer;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (v_object) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, GRAW_TYPE_PROCESSED_IMAGE));
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
value->data[0].v_pointer = v_object;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
graw_processed_image_ref (value->data[0].v_pointer);
-#line 894 "GRaw.c"
+#line 915 "GRaw.c"
} else {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
value->data[0].v_pointer = NULL;
-#line 898 "GRaw.c"
+#line 919 "GRaw.c"
}
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (old) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
graw_processed_image_unref (old);
-#line 904 "GRaw.c"
+#line 925 "GRaw.c"
}
}
void graw_value_take_processed_image (GValue* value, gpointer v_object) {
GRawProcessedImage* old;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSED_IMAGE));
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
old = value->data[0].v_pointer;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (v_object) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, GRAW_TYPE_PROCESSED_IMAGE));
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
value->data[0].v_pointer = v_object;
-#line 923 "GRaw.c"
+#line 944 "GRaw.c"
} else {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
value->data[0].v_pointer = NULL;
-#line 927 "GRaw.c"
+#line 948 "GRaw.c"
}
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (old) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
graw_processed_image_unref (old);
-#line 933 "GRaw.c"
+#line 954 "GRaw.c"
}
}
static void graw_processed_image_class_init (GRawProcessedImageClass * klass) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
graw_processed_image_parent_class = g_type_class_peek_parent (klass);
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
((GRawProcessedImageClass *) klass)->finalize = graw_processed_image_finalize;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_type_class_add_private (klass, sizeof (GRawProcessedImagePrivate));
-#line 945 "GRaw.c"
+#line 966 "GRaw.c"
}
static void graw_processed_image_instance_init (GRawProcessedImage * self) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
self->priv = GRAW_PROCESSED_IMAGE_GET_PRIVATE (self);
-#line 68 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 74 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
self->priv->pixbuf = NULL;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
self->ref_count = 1;
-#line 956 "GRaw.c"
+#line 977 "GRaw.c"
}
static void graw_processed_image_finalize (GRawProcessedImage* obj) {
GRawProcessedImage * self;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, GRAW_TYPE_PROCESSED_IMAGE, GRawProcessedImage);
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_signal_handlers_destroy (self);
-#line 67 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 73 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_free0 (self->priv->image);
-#line 68 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 74 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_object_unref0 (self->priv->pixbuf);
-#line 970 "GRaw.c"
+#line 991 "GRaw.c"
}
@@ -987,24 +1008,24 @@ GType graw_processed_image_get_type (void) {
gpointer graw_processed_image_ref (gpointer instance) {
GRawProcessedImage* self;
self = instance;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_atomic_int_inc (&self->ref_count);
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return instance;
-#line 995 "GRaw.c"
+#line 1016 "GRaw.c"
}
void graw_processed_image_unref (gpointer instance) {
GRawProcessedImage* self;
self = instance;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
GRAW_PROCESSED_IMAGE_GET_CLASS (self)->finalize (self);
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 1008 "GRaw.c"
+#line 1029 "GRaw.c"
}
}
@@ -1013,26 +1034,26 @@ GRawProcessor* graw_processor_construct (GType object_type, enum LibRaw_construc
GRawProcessor* self = NULL;
enum LibRaw_constructor_flags _tmp0_ = 0;
libraw_data_t* _tmp1_ = NULL;
-#line 157 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 163 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
self = (GRawProcessor*) g_type_create_instance (object_type);
-#line 158 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 164 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = options;
-#line 158 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 164 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp1_ = libraw_init (_tmp0_);
-#line 158 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 164 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_libraw_close0 (self->priv->proc);
-#line 158 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 164 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
self->priv->proc = _tmp1_;
-#line 157 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 163 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return self;
-#line 1029 "GRaw.c"
+#line 1050 "GRaw.c"
}
GRawProcessor* graw_processor_new (enum LibRaw_constructor_flags options) {
-#line 157 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 163 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return graw_processor_construct (GRAW_TYPE_PROCESSOR, options);
-#line 1036 "GRaw.c"
+#line 1057 "GRaw.c"
}
@@ -1040,31 +1061,31 @@ void graw_processor_adjust_sizes_info_only (GRawProcessor* self, GError** error)
libraw_data_t* _tmp0_ = NULL;
enum LibRaw_errors _tmp1_ = 0;
GError * _inner_error_ = NULL;
-#line 161 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 167 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_if_fail (GRAW_IS_PROCESSOR (self));
-#line 162 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = self->priv->proc;
-#line 162 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp1_ = libraw_adjust_sizes_info_only (_tmp0_);
-#line 162 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
graw_throw_exception ("adjust_sizes_info_only", _tmp1_, &_inner_error_);
-#line 162 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 162 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 162 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_propagate_error (error, _inner_error_);
-#line 162 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 1060 "GRaw.c"
+#line 1081 "GRaw.c"
} else {
-#line 162 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 162 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_clear_error (&_inner_error_);
-#line 162 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 1068 "GRaw.c"
+#line 1089 "GRaw.c"
}
}
}
@@ -1081,7 +1102,7 @@ static libraw_imgother_t libraw_get_image_other (libraw_data_t* self) {
result = _tmp0_;
#line 188 "/home/jens/Source/shotwell/vapi/libraw.vapi"
return result;
-#line 1085 "GRaw.c"
+#line 1106 "GRaw.c"
}
@@ -1089,17 +1110,17 @@ libraw_imgother_t graw_processor_get_image_other (GRawProcessor* self) {
libraw_imgother_t result = {0};
libraw_data_t* _tmp0_ = NULL;
libraw_imgother_t _tmp1_ = {0};
-#line 165 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 171 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_val_if_fail (GRAW_IS_PROCESSOR (self), result);
-#line 166 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = self->priv->proc;
-#line 166 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp1_ = libraw_get_image_other (_tmp0_);
-#line 166 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
result = _tmp1_;
-#line 166 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return result;
-#line 1103 "GRaw.c"
+#line 1124 "GRaw.c"
}
@@ -1114,7 +1135,7 @@ static libraw_iparams_t libraw_get_image_params (libraw_data_t* self) {
result = _tmp0_;
#line 189 "/home/jens/Source/shotwell/vapi/libraw.vapi"
return result;
-#line 1118 "GRaw.c"
+#line 1139 "GRaw.c"
}
@@ -1122,17 +1143,17 @@ libraw_iparams_t graw_processor_get_image_params (GRawProcessor* self) {
libraw_iparams_t result = {0};
libraw_data_t* _tmp0_ = NULL;
libraw_iparams_t _tmp1_ = {0};
-#line 169 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 175 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_val_if_fail (GRAW_IS_PROCESSOR (self), result);
-#line 170 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = self->priv->proc;
-#line 170 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp1_ = libraw_get_image_params (_tmp0_);
-#line 170 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
result = _tmp1_;
-#line 170 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return result;
-#line 1136 "GRaw.c"
+#line 1157 "GRaw.c"
}
@@ -1147,7 +1168,7 @@ static libraw_image_sizes_t libraw_get_sizes (libraw_data_t* self) {
result = _tmp0_;
#line 192 "/home/jens/Source/shotwell/vapi/libraw.vapi"
return result;
-#line 1151 "GRaw.c"
+#line 1172 "GRaw.c"
}
@@ -1155,17 +1176,17 @@ libraw_image_sizes_t graw_processor_get_sizes (GRawProcessor* self) {
libraw_image_sizes_t result = {0};
libraw_data_t* _tmp0_ = NULL;
libraw_image_sizes_t _tmp1_ = {0};
-#line 173 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 179 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_val_if_fail (GRAW_IS_PROCESSOR (self), result);
-#line 174 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = self->priv->proc;
-#line 174 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp1_ = libraw_get_sizes (_tmp0_);
-#line 174 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
result = _tmp1_;
-#line 174 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return result;
-#line 1169 "GRaw.c"
+#line 1190 "GRaw.c"
}
@@ -1180,7 +1201,7 @@ static libraw_thumbnail_t libraw_get_thumbnail (libraw_data_t* self) {
result = _tmp0_;
#line 193 "/home/jens/Source/shotwell/vapi/libraw.vapi"
return result;
-#line 1184 "GRaw.c"
+#line 1205 "GRaw.c"
}
@@ -1188,17 +1209,17 @@ libraw_thumbnail_t graw_processor_get_thumbnail (GRawProcessor* self) {
libraw_thumbnail_t result = {0};
libraw_data_t* _tmp0_ = NULL;
libraw_thumbnail_t _tmp1_ = {0};
-#line 177 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 183 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_val_if_fail (GRAW_IS_PROCESSOR (self), result);
-#line 178 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = self->priv->proc;
-#line 178 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp1_ = libraw_get_thumbnail (_tmp0_);
-#line 178 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
result = _tmp1_;
-#line 178 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return result;
-#line 1202 "GRaw.c"
+#line 1223 "GRaw.c"
}
@@ -1209,44 +1230,44 @@ GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError**
GRawProcessedImage* _tmp2_ = NULL;
GRawProcessedImage* _tmp3_ = NULL;
GError * _inner_error_ = NULL;
-#line 181 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 187 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_val_if_fail (GRAW_IS_PROCESSOR (self), NULL);
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp1_ = self->priv->proc;
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp2_ = graw_processed_image_new (_tmp1_, &_inner_error_);
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = _tmp2_;
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_propagate_error (error, _inner_error_);
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return NULL;
-#line 1229 "GRaw.c"
+#line 1250 "GRaw.c"
} else {
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_clear_error (&_inner_error_);
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return NULL;
-#line 1237 "GRaw.c"
+#line 1258 "GRaw.c"
}
}
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp3_ = _tmp0_;
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = NULL;
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
result = _tmp3_;
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_graw_processed_image_unref0 (_tmp0_);
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return result;
-#line 1250 "GRaw.c"
+#line 1271 "GRaw.c"
}
@@ -1257,44 +1278,44 @@ GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError
GRawProcessedImage* _tmp2_ = NULL;
GRawProcessedImage* _tmp3_ = NULL;
GError * _inner_error_ = NULL;
-#line 185 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 191 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_val_if_fail (GRAW_IS_PROCESSOR (self), NULL);
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp1_ = self->priv->proc;
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp2_ = graw_processed_image_new_from_thumb (_tmp1_, &_inner_error_);
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = _tmp2_;
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_propagate_error (error, _inner_error_);
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return NULL;
-#line 1277 "GRaw.c"
+#line 1298 "GRaw.c"
} else {
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_clear_error (&_inner_error_);
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return NULL;
-#line 1285 "GRaw.c"
+#line 1306 "GRaw.c"
}
}
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp3_ = _tmp0_;
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = NULL;
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
result = _tmp3_;
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_graw_processed_image_unref0 (_tmp0_);
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return result;
-#line 1298 "GRaw.c"
+#line 1319 "GRaw.c"
}
@@ -1304,35 +1325,35 @@ void graw_processor_open_buffer (GRawProcessor* self, guint8* buffer, int buffer
gint _tmp1__length1 = 0;
enum LibRaw_errors _tmp2_ = 0;
GError * _inner_error_ = NULL;
-#line 189 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 195 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_if_fail (GRAW_IS_PROCESSOR (self));
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = self->priv->proc;
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp1_ = buffer;
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp1__length1 = buffer_length1;
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp2_ = libraw_open_buffer (_tmp0_, _tmp1_, _tmp1__length1);
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
graw_throw_exception ("open_buffer", _tmp2_, &_inner_error_);
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_propagate_error (error, _inner_error_);
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 1328 "GRaw.c"
+#line 1349 "GRaw.c"
} else {
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_clear_error (&_inner_error_);
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 1336 "GRaw.c"
+#line 1357 "GRaw.c"
}
}
}
@@ -1343,35 +1364,35 @@ void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GErro
const gchar* _tmp1_ = NULL;
enum LibRaw_errors _tmp2_ = 0;
GError * _inner_error_ = NULL;
-#line 193 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 199 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_if_fail (GRAW_IS_PROCESSOR (self));
-#line 193 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 199 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_if_fail (filename != NULL);
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = self->priv->proc;
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp1_ = filename;
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp2_ = libraw_open_file (_tmp0_, _tmp1_);
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
graw_throw_exception ("open_file", _tmp2_, &_inner_error_);
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_propagate_error (error, _inner_error_);
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 1367 "GRaw.c"
+#line 1388 "GRaw.c"
} else {
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_clear_error (&_inner_error_);
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 1375 "GRaw.c"
+#line 1396 "GRaw.c"
}
}
}
@@ -1381,31 +1402,31 @@ void graw_processor_process (GRawProcessor* self, GError** error) {
libraw_data_t* _tmp0_ = NULL;
enum LibRaw_errors _tmp1_ = 0;
GError * _inner_error_ = NULL;
-#line 197 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 203 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_if_fail (GRAW_IS_PROCESSOR (self));
-#line 198 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = self->priv->proc;
-#line 198 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp1_ = libraw_dcraw_process (_tmp0_);
-#line 198 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
graw_throw_exception ("process", _tmp1_, &_inner_error_);
-#line 198 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 198 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 198 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_propagate_error (error, _inner_error_);
-#line 198 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 1401 "GRaw.c"
+#line 1422 "GRaw.c"
} else {
-#line 198 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 198 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_clear_error (&_inner_error_);
-#line 198 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 1409 "GRaw.c"
+#line 1430 "GRaw.c"
}
}
}
@@ -1416,35 +1437,35 @@ void graw_processor_ppm_tiff_writer (GRawProcessor* self, const gchar* filename,
const gchar* _tmp1_ = NULL;
enum LibRaw_errors _tmp2_ = 0;
GError * _inner_error_ = NULL;
-#line 201 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 207 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_if_fail (GRAW_IS_PROCESSOR (self));
-#line 201 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 207 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_if_fail (filename != NULL);
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = self->priv->proc;
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp1_ = filename;
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp2_ = libraw_dcraw_ppm_tiff_writer (_tmp0_, _tmp1_);
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
graw_throw_exception ("ppm_tiff_writer", _tmp2_, &_inner_error_);
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_propagate_error (error, _inner_error_);
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 1440 "GRaw.c"
+#line 1461 "GRaw.c"
} else {
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_clear_error (&_inner_error_);
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 1448 "GRaw.c"
+#line 1469 "GRaw.c"
}
}
}
@@ -1455,35 +1476,35 @@ void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GE
const gchar* _tmp1_ = NULL;
enum LibRaw_errors _tmp2_ = 0;
GError * _inner_error_ = NULL;
-#line 205 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 211 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_if_fail (GRAW_IS_PROCESSOR (self));
-#line 205 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 211 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_if_fail (filename != NULL);
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = self->priv->proc;
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp1_ = filename;
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp2_ = libraw_dcraw_thumb_writer (_tmp0_, _tmp1_);
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
graw_throw_exception ("thumb_writer", _tmp2_, &_inner_error_);
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_propagate_error (error, _inner_error_);
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 1479 "GRaw.c"
+#line 1500 "GRaw.c"
} else {
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_clear_error (&_inner_error_);
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 1487 "GRaw.c"
+#line 1508 "GRaw.c"
}
}
}
@@ -1491,13 +1512,13 @@ void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GE
void graw_processor_recycle (GRawProcessor* self) {
libraw_data_t* _tmp0_ = NULL;
-#line 209 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 215 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_if_fail (GRAW_IS_PROCESSOR (self));
-#line 210 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 216 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = self->priv->proc;
-#line 210 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 216 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
libraw_recycle (_tmp0_);
-#line 1501 "GRaw.c"
+#line 1522 "GRaw.c"
}
@@ -1505,31 +1526,31 @@ void graw_processor_unpack (GRawProcessor* self, GError** error) {
libraw_data_t* _tmp0_ = NULL;
enum LibRaw_errors _tmp1_ = 0;
GError * _inner_error_ = NULL;
-#line 213 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 219 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_if_fail (GRAW_IS_PROCESSOR (self));
-#line 214 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = self->priv->proc;
-#line 214 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp1_ = libraw_unpack (_tmp0_);
-#line 214 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
graw_throw_exception ("unpack", _tmp1_, &_inner_error_);
-#line 214 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 214 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 214 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_propagate_error (error, _inner_error_);
-#line 214 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 1525 "GRaw.c"
+#line 1546 "GRaw.c"
} else {
-#line 214 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 214 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_clear_error (&_inner_error_);
-#line 214 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 1533 "GRaw.c"
+#line 1554 "GRaw.c"
}
}
}
@@ -1539,75 +1560,87 @@ void graw_processor_unpack_thumb (GRawProcessor* self, GError** error) {
libraw_data_t* _tmp0_ = NULL;
enum LibRaw_errors _tmp1_ = 0;
GError * _inner_error_ = NULL;
-#line 217 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 223 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_if_fail (GRAW_IS_PROCESSOR (self));
-#line 218 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = self->priv->proc;
-#line 218 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp1_ = libraw_unpack_thumb (_tmp0_);
-#line 218 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
graw_throw_exception ("unpack_thumb", _tmp1_, &_inner_error_);
-#line 218 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 218 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 218 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_propagate_error (error, _inner_error_);
-#line 218 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 1559 "GRaw.c"
+#line 1580 "GRaw.c"
} else {
-#line 218 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 218 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_clear_error (&_inner_error_);
-#line 218 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 1567 "GRaw.c"
+#line 1588 "GRaw.c"
}
}
}
-static void lib_raw_output_params_set_chromatic_aberrations (libraw_output_params_t self, gdouble red_multiplier, gdouble green_multiplier) {
- gdouble _tmp0_ = 0.0;
+static void lib_raw_output_params_set_chromatic_aberrations (libraw_output_params_t* params, gdouble red_multiplier, gdouble green_multiplier) {
+ libraw_output_params_t* _tmp0_ = NULL;
gdouble _tmp1_ = 0.0;
gdouble _tmp2_ = 0.0;
- gdouble _tmp3_ = 0.0;
+ libraw_output_params_t* _tmp3_ = NULL;
+ gdouble _tmp4_ = 0.0;
+ gdouble _tmp5_ = 0.0;
+#line 148 "/home/jens/Source/shotwell/vapi/libraw.vapi"
+ _tmp0_ = params;
#line 148 "/home/jens/Source/shotwell/vapi/libraw.vapi"
- _tmp0_ = red_multiplier;
+ _tmp1_ = red_multiplier;
#line 148 "/home/jens/Source/shotwell/vapi/libraw.vapi"
- self.aber[0] = _tmp0_;
+ (*_tmp0_).aber[0] = _tmp1_;
#line 148 "/home/jens/Source/shotwell/vapi/libraw.vapi"
- _tmp1_ = self.aber[0];
+ _tmp2_ = (*_tmp0_).aber[0];
+#line 149 "/home/jens/Source/shotwell/vapi/libraw.vapi"
+ _tmp3_ = params;
#line 149 "/home/jens/Source/shotwell/vapi/libraw.vapi"
- _tmp2_ = green_multiplier;
+ _tmp4_ = green_multiplier;
#line 149 "/home/jens/Source/shotwell/vapi/libraw.vapi"
- self.aber[2] = _tmp2_;
+ (*_tmp3_).aber[2] = _tmp4_;
#line 149 "/home/jens/Source/shotwell/vapi/libraw.vapi"
- _tmp3_ = self.aber[2];
-#line 1590 "GRaw.c"
+ _tmp5_ = (*_tmp3_).aber[2];
+#line 1617 "GRaw.c"
}
-static void lib_raw_output_params_set_gamma_curve (libraw_output_params_t self, gdouble power, gdouble slope) {
- gdouble _tmp0_ = 0.0;
+static void lib_raw_output_params_set_gamma_curve (libraw_output_params_t* params, gdouble power, gdouble slope) {
+ libraw_output_params_t* _tmp0_ = NULL;
gdouble _tmp1_ = 0.0;
gdouble _tmp2_ = 0.0;
- gdouble _tmp3_ = 0.0;
+ libraw_output_params_t* _tmp3_ = NULL;
+ gdouble _tmp4_ = 0.0;
+ gdouble _tmp5_ = 0.0;
#line 153 "/home/jens/Source/shotwell/vapi/libraw.vapi"
- _tmp0_ = power;
+ _tmp0_ = params;
#line 153 "/home/jens/Source/shotwell/vapi/libraw.vapi"
- self.gamm[0] = _tmp0_;
+ _tmp1_ = power;
#line 153 "/home/jens/Source/shotwell/vapi/libraw.vapi"
- _tmp1_ = self.gamm[0];
+ (*_tmp0_).gamm[0] = 1.0 / _tmp1_;
+#line 153 "/home/jens/Source/shotwell/vapi/libraw.vapi"
+ _tmp2_ = (*_tmp0_).gamm[0];
+#line 154 "/home/jens/Source/shotwell/vapi/libraw.vapi"
+ _tmp3_ = params;
#line 154 "/home/jens/Source/shotwell/vapi/libraw.vapi"
- _tmp2_ = slope;
+ _tmp4_ = slope;
#line 154 "/home/jens/Source/shotwell/vapi/libraw.vapi"
- self.gamm[1] = _tmp2_;
+ (*_tmp3_).gamm[1] = _tmp4_;
#line 154 "/home/jens/Source/shotwell/vapi/libraw.vapi"
- _tmp3_ = self.gamm[1];
-#line 1611 "GRaw.c"
+ _tmp5_ = (*_tmp3_).gamm[1];
+#line 1644 "GRaw.c"
}
@@ -1643,328 +1676,328 @@ void graw_processor_configure_for_rgb_display (GRawProcessor* self, gboolean hal
libraw_output_params_t* _tmp28_ = NULL;
libraw_output_params_t* _tmp29_ = NULL;
libraw_output_params_t* _tmp30_ = NULL;
-#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 230 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_if_fail (GRAW_IS_PROCESSOR (self));
-#line 229 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 235 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = graw_processor_get_output_params (self);
-#line 229 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 235 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp1_ = _tmp0_;
-#line 229 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- lib_raw_output_params_set_chromatic_aberrations (*_tmp1_, 1.0, 1.0);
-#line 230 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 235 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ lib_raw_output_params_set_chromatic_aberrations (_tmp1_, 1.0, 1.0);
+#line 236 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp2_ = graw_processor_get_output_params (self);
-#line 230 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 236 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp3_ = _tmp2_;
-#line 230 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- lib_raw_output_params_set_gamma_curve (*_tmp3_, GRAW_SRGB_POWER, GRAW_SRGB_SLOPE);
-#line 234 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 236 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ lib_raw_output_params_set_gamma_curve (_tmp3_, GRAW_SRGB_POWER, GRAW_SRGB_SLOPE);
+#line 240 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp4_ = graw_processor_get_output_params (self);
-#line 234 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 240 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp5_ = _tmp4_;
-#line 234 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 240 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
(*_tmp5_).bright = 1.0f;
-#line 236 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 242 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp6_ = graw_processor_get_output_params (self);
-#line 236 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 242 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp7_ = _tmp6_;
-#line 236 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 242 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp8_ = half_size;
-#line 236 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 242 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
(*_tmp7_).half_size = _tmp8_;
-#line 238 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 244 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp9_ = graw_processor_get_output_params (self);
-#line 238 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 244 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp10_ = _tmp9_;
-#line 238 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 244 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
(*_tmp10_).highlight = (gint) GRAW_HIGHLIGHT_MODE_CLIP;
-#line 239 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 245 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp11_ = graw_processor_get_output_params (self);
-#line 239 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 245 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp12_ = _tmp11_;
-#line 239 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 245 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
(*_tmp12_).use_auto_wb = TRUE;
-#line 240 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 246 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp13_ = graw_processor_get_output_params (self);
-#line 240 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 246 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp14_ = _tmp13_;
-#line 240 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 246 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
(*_tmp14_).use_camera_wb = TRUE;
-#line 241 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 247 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp15_ = graw_processor_get_output_params (self);
-#line 241 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 247 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp16_ = _tmp15_;
-#line 241 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- (*_tmp16_).use_camera_matrix = TRUE;
-#line 242 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 247 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ (*_tmp16_).use_camera_matrix = (gint) GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_PROFILE;
+#line 248 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp17_ = graw_processor_get_output_params (self);
-#line 242 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 248 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp18_ = _tmp17_;
-#line 242 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 248 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
(*_tmp18_).output_color = (gint) GRAW_COLORSPACE_SRGB;
-#line 247 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 253 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp19_ = graw_processor_get_output_params (self);
-#line 247 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 253 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp20_ = _tmp19_;
-#line 247 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 253 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
(*_tmp20_).output_bps = 8;
-#line 249 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 255 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp21_ = graw_processor_get_output_params (self);
-#line 249 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 255 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp22_ = _tmp21_;
-#line 249 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 255 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
(*_tmp22_).user_flip = (gint) GRAW_FLIP_FROM_SOURCE;
-#line 250 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 256 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp23_ = graw_processor_get_output_params (self);
-#line 250 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 256 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp24_ = _tmp23_;
-#line 250 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 256 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
(*_tmp24_).user_qual = (gint) GRAW_INTERPOLATION_QUALITY_PPG;
-#line 254 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 260 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp25_ = graw_processor_get_output_params (self);
-#line 254 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 260 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp26_ = _tmp25_;
-#line 254 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 260 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
(*_tmp26_).no_auto_bright = TRUE;
-#line 255 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 261 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp27_ = graw_processor_get_output_params (self);
-#line 255 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 261 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp28_ = _tmp27_;
-#line 255 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 261 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
(*_tmp28_).auto_bright_thr = 0.01f;
-#line 256 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 262 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp29_ = graw_processor_get_output_params (self);
-#line 256 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 262 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp30_ = _tmp29_;
-#line 256 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 262 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
(*_tmp30_).use_fuji_rotate = (gint) GRAW_FUJI_ROTATE_USE;
-#line 1741 "GRaw.c"
+#line 1774 "GRaw.c"
}
libraw_output_params_t* graw_processor_get_output_params (GRawProcessor* self) {
libraw_output_params_t* result;
libraw_data_t* _tmp0_ = NULL;
-#line 150 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 156 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_val_if_fail (GRAW_IS_PROCESSOR (self), NULL);
-#line 151 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 157 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = self->priv->proc;
-#line 151 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 157 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
result = &_tmp0_->params;
-#line 151 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 157 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return result;
-#line 1756 "GRaw.c"
+#line 1789 "GRaw.c"
}
static void graw_value_processor_init (GValue* value) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
value->data[0].v_pointer = NULL;
-#line 1763 "GRaw.c"
+#line 1796 "GRaw.c"
}
static void graw_value_processor_free_value (GValue* value) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (value->data[0].v_pointer) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
graw_processor_unref (value->data[0].v_pointer);
-#line 1772 "GRaw.c"
+#line 1805 "GRaw.c"
}
}
static void graw_value_processor_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (src_value->data[0].v_pointer) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
dest_value->data[0].v_pointer = graw_processor_ref (src_value->data[0].v_pointer);
-#line 1782 "GRaw.c"
+#line 1815 "GRaw.c"
} else {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
dest_value->data[0].v_pointer = NULL;
-#line 1786 "GRaw.c"
+#line 1819 "GRaw.c"
}
}
static gpointer graw_value_processor_peek_pointer (const GValue* value) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return value->data[0].v_pointer;
-#line 1794 "GRaw.c"
+#line 1827 "GRaw.c"
}
static gchar* graw_value_processor_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (collect_values[0].v_pointer) {
-#line 1801 "GRaw.c"
+#line 1834 "GRaw.c"
GRawProcessor* object;
object = collect_values[0].v_pointer;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (object->parent_instance.g_class == NULL) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1808 "GRaw.c"
+#line 1841 "GRaw.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1812 "GRaw.c"
+#line 1845 "GRaw.c"
}
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
value->data[0].v_pointer = graw_processor_ref (object);
-#line 1816 "GRaw.c"
+#line 1849 "GRaw.c"
} else {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
value->data[0].v_pointer = NULL;
-#line 1820 "GRaw.c"
+#line 1853 "GRaw.c"
}
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return NULL;
-#line 1824 "GRaw.c"
+#line 1857 "GRaw.c"
}
static gchar* graw_value_processor_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
GRawProcessor** object_p;
object_p = collect_values[0].v_pointer;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (!object_p) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1835 "GRaw.c"
+#line 1868 "GRaw.c"
}
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (!value->data[0].v_pointer) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
*object_p = NULL;
-#line 1841 "GRaw.c"
+#line 1874 "GRaw.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
*object_p = value->data[0].v_pointer;
-#line 1845 "GRaw.c"
+#line 1878 "GRaw.c"
} else {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
*object_p = graw_processor_ref (value->data[0].v_pointer);
-#line 1849 "GRaw.c"
+#line 1882 "GRaw.c"
}
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return NULL;
-#line 1853 "GRaw.c"
+#line 1886 "GRaw.c"
}
GParamSpec* graw_param_spec_processor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
GRawParamSpecProcessor* spec;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_val_if_fail (g_type_is_a (object_type, GRAW_TYPE_PROCESSOR), NULL);
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
G_PARAM_SPEC (spec)->value_type = object_type;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return G_PARAM_SPEC (spec);
-#line 1867 "GRaw.c"
+#line 1900 "GRaw.c"
}
gpointer graw_value_get_processor (const GValue* value) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSOR), NULL);
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return value->data[0].v_pointer;
-#line 1876 "GRaw.c"
+#line 1909 "GRaw.c"
}
void graw_value_set_processor (GValue* value, gpointer v_object) {
GRawProcessor* old;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSOR));
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
old = value->data[0].v_pointer;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (v_object) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, GRAW_TYPE_PROCESSOR));
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
value->data[0].v_pointer = v_object;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
graw_processor_ref (value->data[0].v_pointer);
-#line 1896 "GRaw.c"
+#line 1929 "GRaw.c"
} else {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
value->data[0].v_pointer = NULL;
-#line 1900 "GRaw.c"
+#line 1933 "GRaw.c"
}
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (old) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
graw_processor_unref (old);
-#line 1906 "GRaw.c"
+#line 1939 "GRaw.c"
}
}
void graw_value_take_processor (GValue* value, gpointer v_object) {
GRawProcessor* old;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSOR));
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
old = value->data[0].v_pointer;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (v_object) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, GRAW_TYPE_PROCESSOR));
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
value->data[0].v_pointer = v_object;
-#line 1925 "GRaw.c"
+#line 1958 "GRaw.c"
} else {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
value->data[0].v_pointer = NULL;
-#line 1929 "GRaw.c"
+#line 1962 "GRaw.c"
}
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (old) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
graw_processor_unref (old);
-#line 1935 "GRaw.c"
+#line 1968 "GRaw.c"
}
}
static void graw_processor_class_init (GRawProcessorClass * klass) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
graw_processor_parent_class = g_type_class_peek_parent (klass);
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
((GRawProcessorClass *) klass)->finalize = graw_processor_finalize;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_type_class_add_private (klass, sizeof (GRawProcessorPrivate));
-#line 1947 "GRaw.c"
+#line 1980 "GRaw.c"
}
static void graw_processor_instance_init (GRawProcessor * self) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
self->priv = GRAW_PROCESSOR_GET_PRIVATE (self);
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
self->ref_count = 1;
-#line 1956 "GRaw.c"
+#line 1989 "GRaw.c"
}
static void graw_processor_finalize (GRawProcessor* obj) {
GRawProcessor * self;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, GRAW_TYPE_PROCESSOR, GRawProcessor);
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_signal_handlers_destroy (self);
-#line 155 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 161 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_libraw_close0 (self->priv->proc);
-#line 1968 "GRaw.c"
+#line 2001 "GRaw.c"
}
@@ -1985,24 +2018,24 @@ GType graw_processor_get_type (void) {
gpointer graw_processor_ref (gpointer instance) {
GRawProcessor* self;
self = instance;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_atomic_int_inc (&self->ref_count);
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return instance;
-#line 1993 "GRaw.c"
+#line 2026 "GRaw.c"
}
void graw_processor_unref (gpointer instance) {
GRawProcessor* self;
self = instance;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
GRAW_PROCESSOR_GET_CLASS (self)->finalize (self);
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 2006 "GRaw.c"
+#line 2039 "GRaw.c"
}
}
@@ -2016,149 +2049,83 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
gchar* _tmp10_ = NULL;
enum LibRaw_errors _tmp11_ = 0;
GError * _inner_error_ = NULL;
-#line 260 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_return_if_fail (caller != NULL);
-#line 261 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 267 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = _result_;
-#line 261 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 267 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (_tmp0_ == LIBRAW_SUCCESS) {
-#line 262 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2028 "GRaw.c"
+#line 2061 "GRaw.c"
} else {
enum LibRaw_errors _tmp1_ = 0;
-#line 263 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 269 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp1_ = _result_;
-#line 263 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 269 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (_tmp1_ > 0) {
-#line 2035 "GRaw.c"
+#line 2068 "GRaw.c"
const gchar* _tmp2_ = NULL;
enum LibRaw_errors _tmp3_ = 0;
enum LibRaw_errors _tmp4_ = 0;
const gchar* _tmp5_ = NULL;
GError* _tmp6_ = NULL;
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp2_ = caller;
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp3_ = _result_;
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp4_ = _result_;
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp5_ = g_strerror ((gint) _tmp4_);
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp6_ = g_error_new (GRAW_EXCEPTION, GRAW_EXCEPTION_SYSTEM_ERROR, "%s: System error %d: %s", _tmp2_, (gint) _tmp3_, _tmp5_);
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_inner_error_ = _tmp6_;
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_propagate_error (error, _inner_error_);
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2059 "GRaw.c"
+#line 2092 "GRaw.c"
} else {
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_clear_error (&_inner_error_);
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2067 "GRaw.c"
+#line 2100 "GRaw.c"
}
}
}
-#line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 272 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp7_ = caller;
-#line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 272 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp8_ = _result_;
-#line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 272 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp9_ = libraw_strerror (_tmp8_);
-#line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 272 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp10_ = g_strdup_printf ("%s: %s", _tmp7_, _tmp9_);
-#line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 272 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
msg = _tmp10_;
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp11_ = _result_;
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
switch (_tmp11_) {
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
case LIBRAW_UNSPECIFIED_ERROR:
-#line 2087 "GRaw.c"
+#line 2120 "GRaw.c"
{
const gchar* _tmp12_ = NULL;
GError* _tmp13_ = NULL;
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _tmp12_ = msg;
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _tmp13_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSPECIFIED, _tmp12_);
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _inner_error_ = _tmp13_;
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- g_propagate_error (error, _inner_error_);
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _g_free0 (msg);
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- return;
-#line 2105 "GRaw.c"
- } else {
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _g_free0 (msg);
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- g_clear_error (&_inner_error_);
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- return;
-#line 2115 "GRaw.c"
- }
- }
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- case LIBRAW_FILE_UNSUPPORTED:
-#line 2120 "GRaw.c"
- {
- const gchar* _tmp14_ = NULL;
- GError* _tmp15_ = NULL;
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _tmp14_ = msg;
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _tmp15_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSUPPORTED_FILE, _tmp14_);
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _inner_error_ = _tmp15_;
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- g_propagate_error (error, _inner_error_);
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _g_free0 (msg);
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- return;
-#line 2138 "GRaw.c"
- } else {
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _g_free0 (msg);
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- g_clear_error (&_inner_error_);
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- return;
-#line 2148 "GRaw.c"
- }
- }
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- case LIBRAW_REQUEST_FOR_NONEXISTENT_IMAGE:
-#line 2153 "GRaw.c"
- {
- const gchar* _tmp16_ = NULL;
- GError* _tmp17_ = NULL;
#line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _tmp16_ = msg;
+ _tmp12_ = msg;
#line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _tmp17_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_NONEXISTANT_IMAGE, _tmp16_);
+ _tmp13_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSPECIFIED, _tmp12_);
#line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _inner_error_ = _tmp17_;
+ _inner_error_ = _tmp13_;
#line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (_inner_error_->domain == GRAW_EXCEPTION) {
#line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2167,7 +2134,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
_g_free0 (msg);
#line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2171 "GRaw.c"
+#line 2138 "GRaw.c"
} else {
#line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_free0 (msg);
@@ -2177,21 +2144,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
g_clear_error (&_inner_error_);
#line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2181 "GRaw.c"
+#line 2148 "GRaw.c"
}
}
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- case LIBRAW_OUT_OF_ORDER_CALL:
-#line 2186 "GRaw.c"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ case LIBRAW_FILE_UNSUPPORTED:
+#line 2153 "GRaw.c"
{
- const gchar* _tmp18_ = NULL;
- GError* _tmp19_ = NULL;
+ const gchar* _tmp14_ = NULL;
+ GError* _tmp15_ = NULL;
#line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _tmp18_ = msg;
+ _tmp14_ = msg;
#line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _tmp19_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_OUT_OF_ORDER_CALL, _tmp18_);
+ _tmp15_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSUPPORTED_FILE, _tmp14_);
#line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _inner_error_ = _tmp19_;
+ _inner_error_ = _tmp15_;
#line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (_inner_error_->domain == GRAW_EXCEPTION) {
#line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2200,7 +2167,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
_g_free0 (msg);
#line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2204 "GRaw.c"
+#line 2171 "GRaw.c"
} else {
#line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_free0 (msg);
@@ -2210,21 +2177,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
g_clear_error (&_inner_error_);
#line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2214 "GRaw.c"
+#line 2181 "GRaw.c"
}
}
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- case LIBRAW_NO_THUMBNAIL:
-#line 2219 "GRaw.c"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ case LIBRAW_REQUEST_FOR_NONEXISTENT_IMAGE:
+#line 2186 "GRaw.c"
{
- const gchar* _tmp20_ = NULL;
- GError* _tmp21_ = NULL;
+ const gchar* _tmp16_ = NULL;
+ GError* _tmp17_ = NULL;
#line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _tmp20_ = msg;
+ _tmp16_ = msg;
#line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _tmp21_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_NO_THUMBNAIL, _tmp20_);
+ _tmp17_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_NONEXISTANT_IMAGE, _tmp16_);
#line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _inner_error_ = _tmp21_;
+ _inner_error_ = _tmp17_;
#line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (_inner_error_->domain == GRAW_EXCEPTION) {
#line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2233,7 +2200,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
_g_free0 (msg);
#line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2237 "GRaw.c"
+#line 2204 "GRaw.c"
} else {
#line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_free0 (msg);
@@ -2243,21 +2210,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
g_clear_error (&_inner_error_);
#line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2247 "GRaw.c"
+#line 2214 "GRaw.c"
}
}
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- case LIBRAW_UNSUPPORTED_THUMBNAIL:
-#line 2252 "GRaw.c"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ case LIBRAW_OUT_OF_ORDER_CALL:
+#line 2219 "GRaw.c"
{
- const gchar* _tmp22_ = NULL;
- GError* _tmp23_ = NULL;
+ const gchar* _tmp18_ = NULL;
+ GError* _tmp19_ = NULL;
#line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _tmp22_ = msg;
+ _tmp18_ = msg;
#line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _tmp23_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSUPPORTED_THUMBNAIL, _tmp22_);
+ _tmp19_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_OUT_OF_ORDER_CALL, _tmp18_);
#line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _inner_error_ = _tmp23_;
+ _inner_error_ = _tmp19_;
#line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (_inner_error_->domain == GRAW_EXCEPTION) {
#line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2266,7 +2233,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
_g_free0 (msg);
#line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2270 "GRaw.c"
+#line 2237 "GRaw.c"
} else {
#line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_free0 (msg);
@@ -2276,21 +2243,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
g_clear_error (&_inner_error_);
#line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2280 "GRaw.c"
+#line 2247 "GRaw.c"
}
}
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- case LIBRAW_UNSUFFICIENT_MEMORY:
-#line 2285 "GRaw.c"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ case LIBRAW_NO_THUMBNAIL:
+#line 2252 "GRaw.c"
{
- const gchar* _tmp24_ = NULL;
- GError* _tmp25_ = NULL;
+ const gchar* _tmp20_ = NULL;
+ GError* _tmp21_ = NULL;
#line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _tmp24_ = msg;
+ _tmp20_ = msg;
#line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _tmp25_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_OUT_OF_MEMORY, _tmp24_);
+ _tmp21_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_NO_THUMBNAIL, _tmp20_);
#line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _inner_error_ = _tmp25_;
+ _inner_error_ = _tmp21_;
#line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (_inner_error_->domain == GRAW_EXCEPTION) {
#line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2299,7 +2266,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
_g_free0 (msg);
#line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2303 "GRaw.c"
+#line 2270 "GRaw.c"
} else {
#line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_free0 (msg);
@@ -2309,21 +2276,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
g_clear_error (&_inner_error_);
#line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2313 "GRaw.c"
+#line 2280 "GRaw.c"
}
}
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- case LIBRAW_DATA_ERROR:
-#line 2318 "GRaw.c"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ case LIBRAW_UNSUPPORTED_THUMBNAIL:
+#line 2285 "GRaw.c"
{
- const gchar* _tmp26_ = NULL;
- GError* _tmp27_ = NULL;
+ const gchar* _tmp22_ = NULL;
+ GError* _tmp23_ = NULL;
#line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _tmp26_ = msg;
+ _tmp22_ = msg;
#line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _tmp27_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_DATA_ERROR, _tmp26_);
+ _tmp23_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSUPPORTED_THUMBNAIL, _tmp22_);
#line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _inner_error_ = _tmp27_;
+ _inner_error_ = _tmp23_;
#line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (_inner_error_->domain == GRAW_EXCEPTION) {
#line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2332,7 +2299,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
_g_free0 (msg);
#line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2336 "GRaw.c"
+#line 2303 "GRaw.c"
} else {
#line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_free0 (msg);
@@ -2342,21 +2309,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
g_clear_error (&_inner_error_);
#line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2346 "GRaw.c"
+#line 2313 "GRaw.c"
}
}
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- case LIBRAW_IO_ERROR:
-#line 2351 "GRaw.c"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ case LIBRAW_UNSUFFICIENT_MEMORY:
+#line 2318 "GRaw.c"
{
- const gchar* _tmp28_ = NULL;
- GError* _tmp29_ = NULL;
+ const gchar* _tmp24_ = NULL;
+ GError* _tmp25_ = NULL;
#line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _tmp28_ = msg;
+ _tmp24_ = msg;
#line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _tmp29_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_IO_ERROR, _tmp28_);
+ _tmp25_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_OUT_OF_MEMORY, _tmp24_);
#line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _inner_error_ = _tmp29_;
+ _inner_error_ = _tmp25_;
#line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (_inner_error_->domain == GRAW_EXCEPTION) {
#line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2365,7 +2332,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
_g_free0 (msg);
#line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2369 "GRaw.c"
+#line 2336 "GRaw.c"
} else {
#line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_free0 (msg);
@@ -2375,21 +2342,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
g_clear_error (&_inner_error_);
#line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2379 "GRaw.c"
+#line 2346 "GRaw.c"
}
}
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- case LIBRAW_CANCELLED_BY_CALLBACK:
-#line 2384 "GRaw.c"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ case LIBRAW_DATA_ERROR:
+#line 2351 "GRaw.c"
{
- const gchar* _tmp30_ = NULL;
- GError* _tmp31_ = NULL;
+ const gchar* _tmp26_ = NULL;
+ GError* _tmp27_ = NULL;
#line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _tmp30_ = msg;
+ _tmp26_ = msg;
#line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _tmp31_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_CANCELLED_BY_CALLBACK, _tmp30_);
+ _tmp27_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_DATA_ERROR, _tmp26_);
#line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _inner_error_ = _tmp31_;
+ _inner_error_ = _tmp27_;
#line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (_inner_error_->domain == GRAW_EXCEPTION) {
#line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2398,7 +2365,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
_g_free0 (msg);
#line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2402 "GRaw.c"
+#line 2369 "GRaw.c"
} else {
#line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_free0 (msg);
@@ -2408,21 +2375,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
g_clear_error (&_inner_error_);
#line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2412 "GRaw.c"
+#line 2379 "GRaw.c"
}
}
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- case LIBRAW_BAD_CROP:
-#line 2417 "GRaw.c"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ case LIBRAW_IO_ERROR:
+#line 2384 "GRaw.c"
{
- const gchar* _tmp32_ = NULL;
- GError* _tmp33_ = NULL;
+ const gchar* _tmp28_ = NULL;
+ GError* _tmp29_ = NULL;
#line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _tmp32_ = msg;
+ _tmp28_ = msg;
#line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _tmp33_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_BAD_CROP, _tmp32_);
+ _tmp29_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_IO_ERROR, _tmp28_);
#line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _inner_error_ = _tmp33_;
+ _inner_error_ = _tmp29_;
#line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (_inner_error_->domain == GRAW_EXCEPTION) {
#line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2431,7 +2398,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
_g_free0 (msg);
#line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2435 "GRaw.c"
+#line 2402 "GRaw.c"
} else {
#line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_free0 (msg);
@@ -2441,21 +2408,87 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
g_clear_error (&_inner_error_);
#line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
+#line 2412 "GRaw.c"
+ }
+ }
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ case LIBRAW_CANCELLED_BY_CALLBACK:
+#line 2417 "GRaw.c"
+ {
+ const gchar* _tmp30_ = NULL;
+ GError* _tmp31_ = NULL;
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ _tmp30_ = msg;
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ _tmp31_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_CANCELLED_BY_CALLBACK, _tmp30_);
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ _inner_error_ = _tmp31_;
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ if (_inner_error_->domain == GRAW_EXCEPTION) {
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ g_propagate_error (error, _inner_error_);
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ _g_free0 (msg);
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ return;
+#line 2435 "GRaw.c"
+ } else {
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ _g_free0 (msg);
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ g_clear_error (&_inner_error_);
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ return;
#line 2445 "GRaw.c"
}
}
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ case LIBRAW_BAD_CROP:
+#line 2450 "GRaw.c"
+ {
+ const gchar* _tmp32_ = NULL;
+ GError* _tmp33_ = NULL;
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ _tmp32_ = msg;
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ _tmp33_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_BAD_CROP, _tmp32_);
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ _inner_error_ = _tmp33_;
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ if (_inner_error_->domain == GRAW_EXCEPTION) {
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ g_propagate_error (error, _inner_error_);
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ _g_free0 (msg);
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ return;
+#line 2468 "GRaw.c"
+ } else {
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ _g_free0 (msg);
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ g_clear_error (&_inner_error_);
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+ return;
+#line 2478 "GRaw.c"
+ }
+ }
default:
{
-#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 309 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_free0 (msg);
-#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 309 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2454 "GRaw.c"
+#line 2487 "GRaw.c"
}
}
-#line 260 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_free0 (msg);
-#line 2459 "GRaw.c"
+#line 2492 "GRaw.c"
}
diff --git a/src/photos/GRaw.vala b/src/photos/GRaw.vala
index ec1df8d..19b5cdc 100644
--- a/src/photos/GRaw.vala
+++ b/src/photos/GRaw.vala
@@ -63,6 +63,12 @@ public enum InterpolationQuality {
AHD = 3
}
+public enum UseCameraMatrix {
+ IGNORE = 0,
+ EMBEDDED_COLOR_PROFILE = 1,
+ EMBEDDED_COLOR_DATA = 3
+}
+
public class ProcessedImage {
private LibRaw.ProcessedImage image;
private Gdk.Pixbuf pixbuf = null;
@@ -226,8 +232,8 @@ public class Processor {
// These fields are set to reasonable defaults by libraw.
// greybox
- output_params->set_chromatic_aberrations(1.0, 1.0);
- output_params->set_gamma_curve(GRaw.SRGB_POWER, GRaw.SRGB_SLOPE);
+ LibRaw.OutputParams.set_chromatic_aberrations(output_params, 1.0, 1.0);
+ LibRaw.OutputParams.set_gamma_curve(output_params, GRaw.SRGB_POWER, GRaw.SRGB_SLOPE);
// user_mul
// shot_select
// multi_out
@@ -238,7 +244,7 @@ public class Processor {
output_params->highlight = GRaw.HighlightMode.CLIP;
output_params->use_auto_wb = true;
output_params->use_camera_wb = true;
- output_params->use_camera_matrix = true;
+ output_params->use_camera_matrix = GRaw.UseCameraMatrix.EMBEDDED_COLOR_PROFILE;
output_params->output_color = GRaw.Colorspace.SRGB;
// output_profile
// camera_profile
diff --git a/src/photos/PhotoFileAdapter.c b/src/photos/PhotoFileAdapter.c
index 59a0632..89b0e25 100644
--- a/src/photos/PhotoFileAdapter.c
+++ b/src/photos/PhotoFileAdapter.c
@@ -79,6 +79,8 @@ typedef struct _PhotoMetadataClass PhotoMetadataClass;
#define TYPE_DIMENSIONS (dimensions_get_type ())
typedef struct _Dimensions Dimensions;
+#define PHOTO_FILE_READER_TYPE_ROLE (photo_file_reader_role_get_type ())
+
#define TYPE_PHOTO_FILE_WRITER (photo_file_writer_get_type ())
#define PHOTO_FILE_WRITER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO_FILE_WRITER, PhotoFileWriter))
#define PHOTO_FILE_WRITER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PHOTO_FILE_WRITER, PhotoFileWriterClass))
@@ -153,6 +155,15 @@ struct _PhotoFileReaderClass {
};
typedef enum {
+ PHOTO_FILE_READER_ROLE_DEFAULT,
+ PHOTO_FILE_READER_ROLE_THUMBNAIL
+} PhotoFileReaderRole;
+
+struct _PhotoFileReaderPrivate {
+ PhotoFileReaderRole role;
+};
+
+typedef enum {
PHOTO_FORMAT_ERROR_READ_ONLY
} PhotoFormatError;
#define PHOTO_FORMAT_ERROR photo_format_error_quark ()
@@ -219,6 +230,8 @@ GType photo_metadata_get_type (void) G_GNUC_CONST;
GType dimensions_get_type (void) G_GNUC_CONST;
Dimensions* dimensions_dup (const Dimensions* self);
void dimensions_free (Dimensions* self);
+GType photo_file_reader_role_get_type (void) G_GNUC_CONST;
+#define PHOTO_FILE_READER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PHOTO_FILE_READER, PhotoFileReaderPrivate))
enum {
PHOTO_FILE_READER_DUMMY_PROPERTY
};
@@ -237,6 +250,9 @@ static GdkPixbuf* photo_file_reader_real_unscaled_read (PhotoFileReader* self, G
GdkPixbuf* photo_file_reader_scaled_read (PhotoFileReader* self, Dimensions* full, Dimensions* scaled, GError** error);
static GdkPixbuf* photo_file_reader_real_scaled_read (PhotoFileReader* self, Dimensions* full, Dimensions* scaled, GError** error);
GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType interp);
+void photo_file_reader_set_role (PhotoFileReader* self, PhotoFileReaderRole role);
+PhotoFileReaderRole photo_file_reader_get_role (PhotoFileReader* self);
+static void photo_file_reader_finalize (PhotoFileAdapter* obj);
GType jpeg_quality_get_type (void) G_GNUC_CONST;
enum {
PHOTO_FILE_WRITER_DUMMY_PROPERTY
@@ -278,7 +294,7 @@ PhotoFileAdapter* photo_file_adapter_construct (GType object_type, const gchar*
self->priv->file_format = _tmp2_;
#line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return self;
-#line 282 "PhotoFileAdapter.c"
+#line 298 "PhotoFileAdapter.c"
}
@@ -296,7 +312,7 @@ gboolean photo_file_adapter_file_exists (PhotoFileAdapter* self) {
result = _tmp1_;
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return result;
-#line 300 "PhotoFileAdapter.c"
+#line 316 "PhotoFileAdapter.c"
}
@@ -314,14 +330,14 @@ gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self) {
result = _tmp1_;
#line 35 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return result;
-#line 318 "PhotoFileAdapter.c"
+#line 334 "PhotoFileAdapter.c"
}
static gpointer _g_object_ref0 (gpointer self) {
#line 44 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return self ? g_object_ref (self) : NULL;
-#line 325 "PhotoFileAdapter.c"
+#line 341 "PhotoFileAdapter.c"
}
@@ -331,14 +347,14 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) {
GError * _inner_error_ = NULL;
#line 38 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_return_val_if_fail (IS_PHOTO_FILE_ADAPTER (self), NULL);
-#line 335 "PhotoFileAdapter.c"
+#line 351 "PhotoFileAdapter.c"
{
GFile* _tmp0_ = NULL;
#line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp0_ = self->priv->file;
#line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_rec_mutex_lock (&self->priv->__lock_file);
-#line 342 "PhotoFileAdapter.c"
+#line 358 "PhotoFileAdapter.c"
{
GFile* _tmp1_ = NULL;
GFile* _tmp4_ = NULL;
@@ -347,7 +363,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) {
_tmp1_ = self->priv->file;
#line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
if (_tmp1_ == NULL) {
-#line 351 "PhotoFileAdapter.c"
+#line 367 "PhotoFileAdapter.c"
const gchar* _tmp2_ = NULL;
GFile* _tmp3_ = NULL;
#line 42 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
@@ -358,7 +374,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) {
_g_object_unref0 (self->priv->file);
#line 42 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
self->priv->file = _tmp3_;
-#line 362 "PhotoFileAdapter.c"
+#line 378 "PhotoFileAdapter.c"
}
#line 44 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp4_ = self->priv->file;
@@ -368,7 +384,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) {
_g_object_unref0 (_result_);
#line 44 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_result_ = _tmp5_;
-#line 372 "PhotoFileAdapter.c"
+#line 388 "PhotoFileAdapter.c"
}
__finally24:
{
@@ -377,7 +393,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) {
_tmp6_ = self->priv->file;
#line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_rec_mutex_unlock (&self->priv->__lock_file);
-#line 381 "PhotoFileAdapter.c"
+#line 397 "PhotoFileAdapter.c"
}
#line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -389,14 +405,14 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) {
g_clear_error (&_inner_error_);
#line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return NULL;
-#line 393 "PhotoFileAdapter.c"
+#line 409 "PhotoFileAdapter.c"
}
}
#line 47 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
result = _result_;
#line 47 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return result;
-#line 400 "PhotoFileAdapter.c"
+#line 416 "PhotoFileAdapter.c"
}
@@ -411,14 +427,14 @@ PhotoFileFormat photo_file_adapter_get_file_format (PhotoFileAdapter* self) {
result = _tmp0_;
#line 51 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return result;
-#line 415 "PhotoFileAdapter.c"
+#line 431 "PhotoFileAdapter.c"
}
static void value_photo_file_adapter_init (GValue* value) {
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
value->data[0].v_pointer = NULL;
-#line 422 "PhotoFileAdapter.c"
+#line 438 "PhotoFileAdapter.c"
}
@@ -427,7 +443,7 @@ static void value_photo_file_adapter_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
photo_file_adapter_unref (value->data[0].v_pointer);
-#line 431 "PhotoFileAdapter.c"
+#line 447 "PhotoFileAdapter.c"
}
}
@@ -437,11 +453,11 @@ static void value_photo_file_adapter_copy_value (const GValue* src_value, GValue
if (src_value->data[0].v_pointer) {
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
dest_value->data[0].v_pointer = photo_file_adapter_ref (src_value->data[0].v_pointer);
-#line 441 "PhotoFileAdapter.c"
+#line 457 "PhotoFileAdapter.c"
} else {
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
dest_value->data[0].v_pointer = NULL;
-#line 445 "PhotoFileAdapter.c"
+#line 461 "PhotoFileAdapter.c"
}
}
@@ -449,37 +465,37 @@ static void value_photo_file_adapter_copy_value (const GValue* src_value, GValue
static gpointer value_photo_file_adapter_peek_pointer (const GValue* value) {
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return value->data[0].v_pointer;
-#line 453 "PhotoFileAdapter.c"
+#line 469 "PhotoFileAdapter.c"
}
static gchar* value_photo_file_adapter_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
if (collect_values[0].v_pointer) {
-#line 460 "PhotoFileAdapter.c"
+#line 476 "PhotoFileAdapter.c"
PhotoFileAdapter* object;
object = collect_values[0].v_pointer;
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
if (object->parent_instance.g_class == NULL) {
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 467 "PhotoFileAdapter.c"
+#line 483 "PhotoFileAdapter.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 471 "PhotoFileAdapter.c"
+#line 487 "PhotoFileAdapter.c"
}
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
value->data[0].v_pointer = photo_file_adapter_ref (object);
-#line 475 "PhotoFileAdapter.c"
+#line 491 "PhotoFileAdapter.c"
} else {
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
value->data[0].v_pointer = NULL;
-#line 479 "PhotoFileAdapter.c"
+#line 495 "PhotoFileAdapter.c"
}
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return NULL;
-#line 483 "PhotoFileAdapter.c"
+#line 499 "PhotoFileAdapter.c"
}
@@ -490,25 +506,25 @@ static gchar* value_photo_file_adapter_lcopy_value (const GValue* value, guint n
if (!object_p) {
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 494 "PhotoFileAdapter.c"
+#line 510 "PhotoFileAdapter.c"
}
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
if (!value->data[0].v_pointer) {
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
*object_p = NULL;
-#line 500 "PhotoFileAdapter.c"
+#line 516 "PhotoFileAdapter.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
*object_p = value->data[0].v_pointer;
-#line 504 "PhotoFileAdapter.c"
+#line 520 "PhotoFileAdapter.c"
} else {
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
*object_p = photo_file_adapter_ref (value->data[0].v_pointer);
-#line 508 "PhotoFileAdapter.c"
+#line 524 "PhotoFileAdapter.c"
}
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return NULL;
-#line 512 "PhotoFileAdapter.c"
+#line 528 "PhotoFileAdapter.c"
}
@@ -522,7 +538,7 @@ GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick,
G_PARAM_SPEC (spec)->value_type = object_type;
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return G_PARAM_SPEC (spec);
-#line 526 "PhotoFileAdapter.c"
+#line 542 "PhotoFileAdapter.c"
}
@@ -531,7 +547,7 @@ gpointer value_get_photo_file_adapter (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_ADAPTER), NULL);
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return value->data[0].v_pointer;
-#line 535 "PhotoFileAdapter.c"
+#line 551 "PhotoFileAdapter.c"
}
@@ -551,17 +567,17 @@ void value_set_photo_file_adapter (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
photo_file_adapter_ref (value->data[0].v_pointer);
-#line 555 "PhotoFileAdapter.c"
+#line 571 "PhotoFileAdapter.c"
} else {
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
value->data[0].v_pointer = NULL;
-#line 559 "PhotoFileAdapter.c"
+#line 575 "PhotoFileAdapter.c"
}
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
if (old) {
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
photo_file_adapter_unref (old);
-#line 565 "PhotoFileAdapter.c"
+#line 581 "PhotoFileAdapter.c"
}
}
@@ -580,17 +596,17 @@ void value_take_photo_file_adapter (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
value->data[0].v_pointer = v_object;
-#line 584 "PhotoFileAdapter.c"
+#line 600 "PhotoFileAdapter.c"
} else {
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
value->data[0].v_pointer = NULL;
-#line 588 "PhotoFileAdapter.c"
+#line 604 "PhotoFileAdapter.c"
}
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
if (old) {
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
photo_file_adapter_unref (old);
-#line 594 "PhotoFileAdapter.c"
+#line 610 "PhotoFileAdapter.c"
}
}
@@ -602,7 +618,7 @@ static void photo_file_adapter_class_init (PhotoFileAdapterClass * klass) {
((PhotoFileAdapterClass *) klass)->finalize = photo_file_adapter_finalize;
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_type_class_add_private (klass, sizeof (PhotoFileAdapterPrivate));
-#line 606 "PhotoFileAdapter.c"
+#line 622 "PhotoFileAdapter.c"
}
@@ -615,7 +631,7 @@ static void photo_file_adapter_instance_init (PhotoFileAdapter * self) {
self->priv->file = NULL;
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
self->ref_count = 1;
-#line 619 "PhotoFileAdapter.c"
+#line 635 "PhotoFileAdapter.c"
}
@@ -631,7 +647,7 @@ static void photo_file_adapter_finalize (PhotoFileAdapter* obj) {
g_rec_mutex_clear (&self->priv->__lock_file);
#line 23 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_g_object_unref0 (self->priv->file);
-#line 635 "PhotoFileAdapter.c"
+#line 651 "PhotoFileAdapter.c"
}
@@ -656,7 +672,7 @@ gpointer photo_file_adapter_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return instance;
-#line 660 "PhotoFileAdapter.c"
+#line 676 "PhotoFileAdapter.c"
}
@@ -669,8 +685,20 @@ void photo_file_adapter_unref (gpointer instance) {
PHOTO_FILE_ADAPTER_GET_CLASS (self)->finalize (self);
#line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 673 "PhotoFileAdapter.c"
+#line 689 "PhotoFileAdapter.c"
+ }
+}
+
+
+GType photo_file_reader_role_get_type (void) {
+ static volatile gsize photo_file_reader_role_type_id__volatile = 0;
+ if (g_once_init_enter (&photo_file_reader_role_type_id__volatile)) {
+ static const GEnumValue values[] = {{PHOTO_FILE_READER_ROLE_DEFAULT, "PHOTO_FILE_READER_ROLE_DEFAULT", "default"}, {PHOTO_FILE_READER_ROLE_THUMBNAIL, "PHOTO_FILE_READER_ROLE_THUMBNAIL", "thumbnail"}, {0, NULL, NULL}};
+ GType photo_file_reader_role_type_id;
+ photo_file_reader_role_type_id = g_enum_register_static ("PhotoFileReaderRole", values);
+ g_once_init_leave (&photo_file_reader_role_type_id__volatile, photo_file_reader_role_type_id);
}
+ return photo_file_reader_role_type_id__volatile;
}
@@ -678,17 +706,17 @@ PhotoFileReader* photo_file_reader_construct (GType object_type, const gchar* fi
PhotoFileReader* self = NULL;
const gchar* _tmp0_ = NULL;
PhotoFileFormat _tmp1_ = 0;
-#line 60 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 67 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_return_val_if_fail (filepath != NULL, NULL);
-#line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 68 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp0_ = filepath;
-#line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 68 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp1_ = file_format;
-#line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 68 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
self = (PhotoFileReader*) photo_file_adapter_construct (object_type, _tmp0_, _tmp1_);
-#line 60 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 67 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return self;
-#line 692 "PhotoFileAdapter.c"
+#line 720 "PhotoFileAdapter.c"
}
@@ -702,52 +730,52 @@ PhotoFileWriter* photo_file_reader_create_writer (PhotoFileReader* self, GError*
PhotoFileWriter* _tmp5_ = NULL;
PhotoFileWriter* _tmp6_ = NULL;
GError * _inner_error_ = NULL;
-#line 64 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 71 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL);
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp1_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp2_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp3_ = _tmp2_;
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp4_ = photo_file_format_create_writer (_tmp1_, _tmp3_, &_inner_error_);
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp5_ = _tmp4_;
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_g_free0 (_tmp3_);
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp0_ = _tmp5_;
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
if (_inner_error_->domain == PHOTO_FORMAT_ERROR) {
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_propagate_error (error, _inner_error_);
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return NULL;
-#line 730 "PhotoFileAdapter.c"
+#line 758 "PhotoFileAdapter.c"
} else {
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_clear_error (&_inner_error_);
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return NULL;
-#line 738 "PhotoFileAdapter.c"
+#line 766 "PhotoFileAdapter.c"
}
}
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp6_ = _tmp0_;
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp0_ = NULL;
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
result = _tmp6_;
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_photo_file_adapter_unref0 (_tmp0_);
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return result;
-#line 751 "PhotoFileAdapter.c"
+#line 779 "PhotoFileAdapter.c"
}
@@ -761,88 +789,88 @@ PhotoFileMetadataWriter* photo_file_reader_create_metadata_writer (PhotoFileRead
PhotoFileMetadataWriter* _tmp5_ = NULL;
PhotoFileMetadataWriter* _tmp6_ = NULL;
GError * _inner_error_ = NULL;
-#line 68 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 75 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL);
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp1_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp2_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp3_ = _tmp2_;
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp4_ = photo_file_format_create_metadata_writer (_tmp1_, _tmp3_, &_inner_error_);
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp5_ = _tmp4_;
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_g_free0 (_tmp3_);
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp0_ = _tmp5_;
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
if (_inner_error_->domain == PHOTO_FORMAT_ERROR) {
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_propagate_error (error, _inner_error_);
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return NULL;
-#line 789 "PhotoFileAdapter.c"
+#line 817 "PhotoFileAdapter.c"
} else {
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_clear_error (&_inner_error_);
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return NULL;
-#line 797 "PhotoFileAdapter.c"
+#line 825 "PhotoFileAdapter.c"
}
}
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp6_ = _tmp0_;
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp0_ = NULL;
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
result = _tmp6_;
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_photo_file_adapter_unref0 (_tmp0_);
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return result;
-#line 810 "PhotoFileAdapter.c"
+#line 838 "PhotoFileAdapter.c"
}
static PhotoMetadata* photo_file_reader_real_read_metadata (PhotoFileReader* self, GError** error) {
-#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 79 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_critical ("Type `%s' does not implement abstract method `photo_file_reader_read_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 79 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return NULL;
-#line 819 "PhotoFileAdapter.c"
+#line 847 "PhotoFileAdapter.c"
}
PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, GError** error) {
-#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 79 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL);
-#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 79 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return PHOTO_FILE_READER_GET_CLASS (self)->read_metadata (self, error);
-#line 828 "PhotoFileAdapter.c"
+#line 856 "PhotoFileAdapter.c"
}
static GdkPixbuf* photo_file_reader_real_unscaled_read (PhotoFileReader* self, GError** error) {
-#line 74 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 81 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_critical ("Type `%s' does not implement abstract method `photo_file_reader_unscaled_read'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 74 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 81 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return NULL;
-#line 837 "PhotoFileAdapter.c"
+#line 865 "PhotoFileAdapter.c"
}
GdkPixbuf* photo_file_reader_unscaled_read (PhotoFileReader* self, GError** error) {
-#line 74 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 81 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL);
-#line 74 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 81 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return PHOTO_FILE_READER_GET_CLASS (self)->unscaled_read (self, error);
-#line 846 "PhotoFileAdapter.c"
+#line 874 "PhotoFileAdapter.c"
}
@@ -853,42 +881,69 @@ static GdkPixbuf* photo_file_reader_real_scaled_read (PhotoFileReader* self, Dim
Dimensions _tmp2_ = {0};
GdkPixbuf* _tmp3_ = NULL;
GError * _inner_error_ = NULL;
-#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 83 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_return_val_if_fail (full != NULL, NULL);
-#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 83 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_return_val_if_fail (scaled != NULL, NULL);
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp1_ = photo_file_reader_unscaled_read (self, &_inner_error_);
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp0_ = _tmp1_;
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_propagate_error (error, _inner_error_);
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return NULL;
-#line 871 "PhotoFileAdapter.c"
+#line 899 "PhotoFileAdapter.c"
}
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp2_ = *scaled;
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp3_ = resize_pixbuf (_tmp0_, &_tmp2_, GDK_INTERP_BILINEAR);
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
result = _tmp3_;
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_g_object_unref0 (_tmp0_);
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return result;
-#line 883 "PhotoFileAdapter.c"
+#line 911 "PhotoFileAdapter.c"
}
GdkPixbuf* photo_file_reader_scaled_read (PhotoFileReader* self, Dimensions* full, Dimensions* scaled, GError** error) {
-#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 83 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL);
-#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 83 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return PHOTO_FILE_READER_GET_CLASS (self)->scaled_read (self, full, scaled, error);
-#line 892 "PhotoFileAdapter.c"
+#line 920 "PhotoFileAdapter.c"
+}
+
+
+void photo_file_reader_set_role (PhotoFileReader* self, PhotoFileReaderRole role) {
+ PhotoFileReaderRole _tmp0_ = 0;
+#line 87 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+ g_return_if_fail (IS_PHOTO_FILE_READER (self));
+#line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+ _tmp0_ = role;
+#line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+ self->priv->role = _tmp0_;
+#line 932 "PhotoFileAdapter.c"
+}
+
+
+PhotoFileReaderRole photo_file_reader_get_role (PhotoFileReader* self) {
+ PhotoFileReaderRole result = 0;
+ PhotoFileReaderRole _tmp0_ = 0;
+#line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+ g_return_val_if_fail (IS_PHOTO_FILE_READER (self), 0);
+#line 92 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+ _tmp0_ = self->priv->role;
+#line 92 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+ result = _tmp0_;
+#line 92 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+ return result;
+#line 947 "PhotoFileAdapter.c"
}
@@ -896,16 +951,35 @@ static void photo_file_reader_class_init (PhotoFileReaderClass * klass) {
#line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
photo_file_reader_parent_class = g_type_class_peek_parent (klass);
#line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+ ((PhotoFileAdapterClass *) klass)->finalize = photo_file_reader_finalize;
+#line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+ g_type_class_add_private (klass, sizeof (PhotoFileReaderPrivate));
+#line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
((PhotoFileReaderClass *) klass)->read_metadata = photo_file_reader_real_read_metadata;
#line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
((PhotoFileReaderClass *) klass)->unscaled_read = photo_file_reader_real_unscaled_read;
#line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
((PhotoFileReaderClass *) klass)->scaled_read = photo_file_reader_real_scaled_read;
-#line 905 "PhotoFileAdapter.c"
+#line 964 "PhotoFileAdapter.c"
}
static void photo_file_reader_instance_init (PhotoFileReader * self) {
+#line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+ self->priv = PHOTO_FILE_READER_GET_PRIVATE (self);
+#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+ self->priv->role = PHOTO_FILE_READER_ROLE_DEFAULT;
+#line 973 "PhotoFileAdapter.c"
+}
+
+
+static void photo_file_reader_finalize (PhotoFileAdapter* obj) {
+ PhotoFileReader * self;
+#line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_READER, PhotoFileReader);
+#line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+ PHOTO_FILE_ADAPTER_CLASS (photo_file_reader_parent_class)->finalize (obj);
+#line 983 "PhotoFileAdapter.c"
}
@@ -925,17 +999,17 @@ PhotoFileWriter* photo_file_writer_construct (GType object_type, const gchar* fi
PhotoFileWriter* self = NULL;
const gchar* _tmp0_ = NULL;
PhotoFileFormat _tmp1_ = 0;
-#line 86 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_return_val_if_fail (filepath != NULL, NULL);
-#line 87 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 102 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp0_ = filepath;
-#line 87 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 102 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp1_ = file_format;
-#line 87 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 102 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
self = (PhotoFileWriter*) photo_file_adapter_construct (object_type, _tmp0_, _tmp1_);
-#line 86 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return self;
-#line 939 "PhotoFileAdapter.c"
+#line 1013 "PhotoFileAdapter.c"
}
@@ -946,52 +1020,52 @@ PhotoFileReader* photo_file_writer_create_reader (PhotoFileWriter* self) {
gchar* _tmp2_ = NULL;
PhotoFileReader* _tmp3_ = NULL;
PhotoFileReader* _tmp4_ = NULL;
-#line 90 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 105 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_return_val_if_fail (IS_PHOTO_FILE_WRITER (self), NULL);
-#line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp0_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp1_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp2_ = _tmp1_;
-#line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp3_ = photo_file_format_create_reader (_tmp0_, _tmp2_);
-#line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp4_ = _tmp3_;
-#line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_g_free0 (_tmp2_);
-#line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
result = _tmp4_;
-#line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return result;
-#line 968 "PhotoFileAdapter.c"
+#line 1042 "PhotoFileAdapter.c"
}
static void photo_file_writer_real_write (PhotoFileWriter* self, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) {
-#line 94 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 109 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_critical ("Type `%s' does not implement abstract method `photo_file_writer_write'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 94 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 109 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return;
-#line 977 "PhotoFileAdapter.c"
+#line 1051 "PhotoFileAdapter.c"
}
void photo_file_writer_write (PhotoFileWriter* self, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) {
-#line 94 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 109 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_return_if_fail (IS_PHOTO_FILE_WRITER (self));
-#line 94 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 109 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
PHOTO_FILE_WRITER_GET_CLASS (self)->write (self, pixbuf, quality, error);
-#line 986 "PhotoFileAdapter.c"
+#line 1060 "PhotoFileAdapter.c"
}
static void photo_file_writer_class_init (PhotoFileWriterClass * klass) {
-#line 85 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 100 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
photo_file_writer_parent_class = g_type_class_peek_parent (klass);
-#line 85 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 100 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
((PhotoFileWriterClass *) klass)->write = photo_file_writer_real_write;
-#line 995 "PhotoFileAdapter.c"
+#line 1069 "PhotoFileAdapter.c"
}
@@ -1015,17 +1089,17 @@ PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type
PhotoFileMetadataWriter* self = NULL;
const gchar* _tmp0_ = NULL;
PhotoFileFormat _tmp1_ = 0;
-#line 102 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 117 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_return_val_if_fail (filepath != NULL, NULL);
-#line 103 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 118 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp0_ = filepath;
-#line 103 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 118 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp1_ = file_format;
-#line 103 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 118 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
self = (PhotoFileMetadataWriter*) photo_file_adapter_construct (object_type, _tmp0_, _tmp1_);
-#line 102 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 117 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return self;
-#line 1029 "PhotoFileAdapter.c"
+#line 1103 "PhotoFileAdapter.c"
}
@@ -1036,52 +1110,52 @@ PhotoFileReader* photo_file_metadata_writer_create_reader (PhotoFileMetadataWrit
gchar* _tmp2_ = NULL;
PhotoFileReader* _tmp3_ = NULL;
PhotoFileReader* _tmp4_ = NULL;
-#line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 121 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_return_val_if_fail (IS_PHOTO_FILE_METADATA_WRITER (self), NULL);
-#line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp0_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp1_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp2_ = _tmp1_;
-#line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp3_ = photo_file_format_create_reader (_tmp0_, _tmp2_);
-#line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_tmp4_ = _tmp3_;
-#line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
_g_free0 (_tmp2_);
-#line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
result = _tmp4_;
-#line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return result;
-#line 1058 "PhotoFileAdapter.c"
+#line 1132 "PhotoFileAdapter.c"
}
static void photo_file_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* self, PhotoMetadata* metadata, GError** error) {
-#line 110 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_critical ("Type `%s' does not implement abstract method `photo_file_metadata_writer_write_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 110 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
return;
-#line 1067 "PhotoFileAdapter.c"
+#line 1141 "PhotoFileAdapter.c"
}
void photo_file_metadata_writer_write_metadata (PhotoFileMetadataWriter* self, PhotoMetadata* metadata, GError** error) {
-#line 110 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_return_if_fail (IS_PHOTO_FILE_METADATA_WRITER (self));
-#line 110 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
PHOTO_FILE_METADATA_WRITER_GET_CLASS (self)->write_metadata (self, metadata, error);
-#line 1076 "PhotoFileAdapter.c"
+#line 1150 "PhotoFileAdapter.c"
}
static void photo_file_metadata_writer_class_init (PhotoFileMetadataWriterClass * klass) {
-#line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 116 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
photo_file_metadata_writer_parent_class = g_type_class_peek_parent (klass);
-#line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 116 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
((PhotoFileMetadataWriterClass *) klass)->write_metadata = photo_file_metadata_writer_real_write_metadata;
-#line 1085 "PhotoFileAdapter.c"
+#line 1159 "PhotoFileAdapter.c"
}
diff --git a/src/photos/PhotoFileAdapter.vala b/src/photos/PhotoFileAdapter.vala
index 644917c..df49edb 100644
--- a/src/photos/PhotoFileAdapter.vala
+++ b/src/photos/PhotoFileAdapter.vala
@@ -57,6 +57,13 @@ public abstract class PhotoFileAdapter {
//
public abstract class PhotoFileReader : PhotoFileAdapter {
+ public enum Role {
+ DEFAULT,
+ THUMBNAIL
+ }
+
+ PhotoFileReader.Role role = Role.DEFAULT;
+
protected PhotoFileReader(string filepath, PhotoFileFormat file_format) {
base (filepath, file_format);
}
@@ -76,6 +83,14 @@ public abstract class PhotoFileReader : PhotoFileAdapter {
public virtual Gdk.Pixbuf scaled_read(Dimensions full, Dimensions scaled) throws Error {
return resize_pixbuf(unscaled_read(), scaled, Gdk.InterpType.BILINEAR);
}
+
+ public void set_role (PhotoFileReader.Role role) {
+ this.role = role;
+ }
+
+ public PhotoFileReader.Role get_role () {
+ return this.role;
+ }
}
//
diff --git a/src/photos/RawSupport.c b/src/photos/RawSupport.c
index 6569e3b..1b0d4b8 100644
--- a/src/photos/RawSupport.c
+++ b/src/photos/RawSupport.c
@@ -211,6 +211,8 @@ typedef struct _GRawProcessedImage GRawProcessedImage;
typedef struct _GRawProcessedImageClass GRawProcessedImageClass;
#define _graw_processed_image_unref0(var) ((var == NULL) ? NULL : (var = (graw_processed_image_unref (var), NULL)))
+#define PHOTO_FILE_READER_TYPE_ROLE (photo_file_reader_role_get_type ())
+
#define TYPE_RAW_DEVELOPER (raw_developer_get_type ())
#define TYPE_BACKING_PHOTO_ROW (backing_photo_row_get_type ())
@@ -410,6 +412,11 @@ struct _RawReaderClass {
};
typedef enum {
+ PHOTO_FILE_READER_ROLE_DEFAULT,
+ PHOTO_FILE_READER_ROLE_THUMBNAIL
+} PhotoFileReaderRole;
+
+typedef enum {
RAW_DEVELOPER_SHOTWELL = 0,
RAW_DEVELOPER_CAMERA,
RAW_DEVELOPER_EMBEDDED
@@ -618,6 +625,10 @@ GType graw_processed_image_get_type (void) G_GNUC_CONST;
GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError** error);
GdkPixbuf* graw_processed_image_get_pixbuf_copy (GRawProcessedImage* self);
static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions* full, Dimensions* scaled, GError** error);
+GType photo_file_reader_role_get_type (void) G_GNUC_CONST;
+PhotoFileReaderRole photo_file_reader_get_role (PhotoFileReader* self);
+void graw_processor_unpack_thumb (GRawProcessor* self, GError** error);
+GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError** error);
GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType interp);
GType raw_developer_get_type (void) G_GNUC_CONST;
RawDeveloper* raw_developer_as_array (int* result_length1);
@@ -654,14 +665,14 @@ void raw_file_format_driver_init (void) {
raw_file_format_driver_instance = _tmp0_;
#line 12 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
raw_file_format_properties_init ();
-#line 658 "RawSupport.c"
+#line 669 "RawSupport.c"
}
static gpointer _photo_file_format_driver_ref0 (gpointer self) {
#line 16 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return self ? photo_file_format_driver_ref (self) : NULL;
-#line 665 "RawSupport.c"
+#line 676 "RawSupport.c"
}
@@ -677,7 +688,7 @@ RawFileFormatDriver* raw_file_format_driver_get_instance (void) {
result = _tmp1_;
#line 16 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 681 "RawSupport.c"
+#line 692 "RawSupport.c"
}
@@ -693,7 +704,7 @@ static PhotoFileFormatProperties* raw_file_format_driver_real_get_properties (Ph
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties);
#line 20 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 697 "RawSupport.c"
+#line 708 "RawSupport.c"
}
@@ -714,7 +725,7 @@ static PhotoFileReader* raw_file_format_driver_real_create_reader (PhotoFileForm
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_READER, PhotoFileReader);
#line 24 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 718 "RawSupport.c"
+#line 729 "RawSupport.c"
}
@@ -730,7 +741,7 @@ static PhotoMetadata* raw_file_format_driver_real_create_metadata (PhotoFileForm
result = _tmp0_;
#line 28 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 734 "RawSupport.c"
+#line 745 "RawSupport.c"
}
@@ -743,7 +754,7 @@ static gboolean raw_file_format_driver_real_can_write_image (PhotoFileFormatDriv
result = FALSE;
#line 32 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 747 "RawSupport.c"
+#line 758 "RawSupport.c"
}
@@ -756,7 +767,7 @@ static gboolean raw_file_format_driver_real_can_write_metadata (PhotoFileFormatD
result = FALSE;
#line 36 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 760 "RawSupport.c"
+#line 771 "RawSupport.c"
}
@@ -771,7 +782,7 @@ static PhotoFileWriter* raw_file_format_driver_real_create_writer (PhotoFileForm
result = NULL;
#line 40 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 775 "RawSupport.c"
+#line 786 "RawSupport.c"
}
@@ -786,7 +797,7 @@ static PhotoFileMetadataWriter* raw_file_format_driver_real_create_metadata_writ
result = NULL;
#line 44 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 790 "RawSupport.c"
+#line 801 "RawSupport.c"
}
@@ -810,7 +821,7 @@ static PhotoFileSniffer* raw_file_format_driver_real_create_sniffer (PhotoFileFo
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer);
#line 48 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 814 "RawSupport.c"
+#line 825 "RawSupport.c"
}
@@ -820,14 +831,14 @@ RawFileFormatDriver* raw_file_format_driver_construct (GType object_type) {
self = (RawFileFormatDriver*) photo_file_format_driver_construct (object_type);
#line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return self;
-#line 824 "RawSupport.c"
+#line 835 "RawSupport.c"
}
RawFileFormatDriver* raw_file_format_driver_new (void) {
#line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return raw_file_format_driver_construct (TYPE_RAW_FILE_FORMAT_DRIVER);
-#line 831 "RawSupport.c"
+#line 842 "RawSupport.c"
}
@@ -852,7 +863,7 @@ static void raw_file_format_driver_class_init (RawFileFormatDriverClass * klass)
((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = raw_file_format_driver_real_create_metadata_writer;
#line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
((PhotoFileFormatDriverClass *) klass)->create_sniffer = raw_file_format_driver_real_create_sniffer;
-#line 856 "RawSupport.c"
+#line 867 "RawSupport.c"
}
@@ -866,7 +877,7 @@ static void raw_file_format_driver_finalize (PhotoFileFormatDriver* obj) {
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RAW_FILE_FORMAT_DRIVER, RawFileFormatDriver);
#line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
PHOTO_FILE_FORMAT_DRIVER_CLASS (raw_file_format_driver_parent_class)->finalize (obj);
-#line 870 "RawSupport.c"
+#line 881 "RawSupport.c"
}
@@ -890,14 +901,14 @@ void raw_file_format_properties_init (void) {
_photo_file_format_properties_unref0 (raw_file_format_properties_instance);
#line 122 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
raw_file_format_properties_instance = _tmp0_;
-#line 894 "RawSupport.c"
+#line 905 "RawSupport.c"
}
static gpointer _photo_file_format_properties_ref0 (gpointer self) {
#line 126 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return self ? photo_file_format_properties_ref (self) : NULL;
-#line 901 "RawSupport.c"
+#line 912 "RawSupport.c"
}
@@ -913,7 +924,7 @@ RawFileFormatProperties* raw_file_format_properties_get_instance (void) {
result = _tmp1_;
#line 126 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 917 "RawSupport.c"
+#line 928 "RawSupport.c"
}
@@ -926,7 +937,7 @@ static PhotoFileFormat raw_file_format_properties_real_get_file_format (PhotoFil
result = PHOTO_FILE_FORMAT_RAW;
#line 130 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 930 "RawSupport.c"
+#line 941 "RawSupport.c"
}
@@ -945,7 +956,7 @@ static gchar* raw_file_format_properties_real_get_user_visible_name (PhotoFileFo
result = _tmp1_;
#line 134 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 949 "RawSupport.c"
+#line 960 "RawSupport.c"
}
@@ -958,7 +969,7 @@ static PhotoFileFormatFlags raw_file_format_properties_real_get_flags (PhotoFile
result = PHOTO_FILE_FORMAT_FLAGS_NONE;
#line 138 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 962 "RawSupport.c"
+#line 973 "RawSupport.c"
}
@@ -974,7 +985,7 @@ static gchar* raw_file_format_properties_real_get_default_extension (PhotoFileFo
result = _tmp0_;
#line 145 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 978 "RawSupport.c"
+#line 989 "RawSupport.c"
}
@@ -985,17 +996,17 @@ static gchar** _vala_array_dup12 (gchar** self, int length) {
result = g_new0 (gchar*, length + 1);
#line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
for (i = 0; i < length; i++) {
-#line 989 "RawSupport.c"
+#line 1000 "RawSupport.c"
gchar* _tmp0_ = NULL;
#line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp0_ = g_strdup (self[i]);
#line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
result[i] = _tmp0_;
-#line 995 "RawSupport.c"
+#line 1006 "RawSupport.c"
}
#line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 999 "RawSupport.c"
+#line 1010 "RawSupport.c"
}
@@ -1026,13 +1037,13 @@ static gchar** raw_file_format_properties_real_get_known_extensions (PhotoFileFo
if (result_length1) {
#line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
*result_length1 = _tmp2__length1;
-#line 1030 "RawSupport.c"
+#line 1041 "RawSupport.c"
}
#line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
result = _tmp2_;
#line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 1036 "RawSupport.c"
+#line 1047 "RawSupport.c"
}
@@ -1057,7 +1068,7 @@ static gchar* raw_file_format_properties_real_get_default_mime_type (PhotoFileFo
result = _tmp2_;
#line 153 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 1061 "RawSupport.c"
+#line 1072 "RawSupport.c"
}
@@ -1068,17 +1079,17 @@ static gchar** _vala_array_dup13 (gchar** self, int length) {
result = g_new0 (gchar*, length + 1);
#line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
for (i = 0; i < length; i++) {
-#line 1072 "RawSupport.c"
+#line 1083 "RawSupport.c"
gchar* _tmp0_ = NULL;
#line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp0_ = g_strdup (self[i]);
#line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
result[i] = _tmp0_;
-#line 1078 "RawSupport.c"
+#line 1089 "RawSupport.c"
}
#line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 1082 "RawSupport.c"
+#line 1093 "RawSupport.c"
}
@@ -1109,13 +1120,13 @@ static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatPr
if (result_length1) {
#line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
*result_length1 = _tmp2__length1;
-#line 1113 "RawSupport.c"
+#line 1124 "RawSupport.c"
}
#line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
result = _tmp2_;
#line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 1119 "RawSupport.c"
+#line 1130 "RawSupport.c"
}
@@ -1125,14 +1136,14 @@ RawFileFormatProperties* raw_file_format_properties_construct (GType object_type
self = (RawFileFormatProperties*) photo_file_format_properties_construct (object_type);
#line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return self;
-#line 1129 "RawSupport.c"
+#line 1140 "RawSupport.c"
}
RawFileFormatProperties* raw_file_format_properties_new (void) {
#line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return raw_file_format_properties_construct (TYPE_RAW_FILE_FORMAT_PROPERTIES);
-#line 1136 "RawSupport.c"
+#line 1147 "RawSupport.c"
}
@@ -1604,7 +1615,7 @@ static void raw_file_format_properties_class_init (RawFileFormatPropertiesClass
raw_file_format_properties_KNOWN_MIME_TYPES = _tmp88_;
#line 59 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
raw_file_format_properties_KNOWN_MIME_TYPES_length1 = 51;
-#line 1608 "RawSupport.c"
+#line 1619 "RawSupport.c"
}
@@ -1618,7 +1629,7 @@ static void raw_file_format_properties_finalize (PhotoFileFormatProperties* obj)
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RAW_FILE_FORMAT_PROPERTIES, RawFileFormatProperties);
#line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
PHOTO_FILE_FORMAT_PROPERTIES_CLASS (raw_file_format_properties_parent_class)->finalize (obj);
-#line 1622 "RawSupport.c"
+#line 1633 "RawSupport.c"
}
@@ -1648,21 +1659,21 @@ RawSniffer* raw_sniffer_construct (GType object_type, GFile* file, PhotoFileSnif
self = (RawSniffer*) photo_file_sniffer_construct (object_type, _tmp0_, _tmp1_);
#line 162 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return self;
-#line 1652 "RawSupport.c"
+#line 1663 "RawSupport.c"
}
RawSniffer* raw_sniffer_new (GFile* file, PhotoFileSnifferOptions options) {
#line 162 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return raw_sniffer_construct (TYPE_RAW_SNIFFER, file, options);
-#line 1659 "RawSupport.c"
+#line 1670 "RawSupport.c"
}
static gpointer _g_error_copy0 (gpointer self) {
#line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return self ? g_error_copy (self) : NULL;
-#line 1666 "RawSupport.c"
+#line 1677 "RawSupport.c"
}
@@ -1720,7 +1731,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
_tmp4_ = _tmp3_;
#line 173 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
(*_tmp4_).user_flip = (gint) GRAW_FLIP_NONE;
-#line 1724 "RawSupport.c"
+#line 1735 "RawSupport.c"
{
GRawProcessor* _tmp5_ = NULL;
GFile* _tmp6_ = NULL;
@@ -1744,7 +1755,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 1748 "RawSupport.c"
+#line 1759 "RawSupport.c"
goto __catch32_graw_exception;
}
#line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1757,7 +1768,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
g_clear_error (&_inner_error_);
#line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return NULL;
-#line 1761 "RawSupport.c"
+#line 1772 "RawSupport.c"
}
#line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp9_ = processor;
@@ -1767,7 +1778,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 1771 "RawSupport.c"
+#line 1782 "RawSupport.c"
goto __catch32_graw_exception;
}
#line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1780,7 +1791,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
g_clear_error (&_inner_error_);
#line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return NULL;
-#line 1784 "RawSupport.c"
+#line 1795 "RawSupport.c"
}
#line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp10_ = processor;
@@ -1790,7 +1801,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 1794 "RawSupport.c"
+#line 1805 "RawSupport.c"
goto __catch32_graw_exception;
}
#line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1803,7 +1814,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
g_clear_error (&_inner_error_);
#line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return NULL;
-#line 1807 "RawSupport.c"
+#line 1818 "RawSupport.c"
}
}
goto __finally32;
@@ -1833,11 +1844,11 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
if (is_corrupted) {
#line 181 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
*is_corrupted = _vala_is_corrupted;
-#line 1837 "RawSupport.c"
+#line 1848 "RawSupport.c"
}
#line 181 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 1841 "RawSupport.c"
+#line 1852 "RawSupport.c"
}
#line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp12_ = exception;
@@ -1847,7 +1858,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
_inner_error_ = _tmp13_;
#line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_error_free0 (exception);
-#line 1851 "RawSupport.c"
+#line 1862 "RawSupport.c"
goto __finally32;
}
__finally32:
@@ -1861,7 +1872,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
_detected_photo_information_unref0 (detected);
#line 175 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return NULL;
-#line 1865 "RawSupport.c"
+#line 1876 "RawSupport.c"
}
#line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp14_ = detected;
@@ -1905,7 +1916,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
_g_free0 (_tmp26_);
#line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
reader = _tmp28_;
-#line 1909 "RawSupport.c"
+#line 1920 "RawSupport.c"
{
PhotoMetadata* _tmp29_ = NULL;
RawReader* _tmp30_ = NULL;
@@ -1920,7 +1931,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
_tmp29_ = _tmp31_;
#line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1924 "RawSupport.c"
+#line 1935 "RawSupport.c"
goto __catch33_g_error;
}
#line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1935,7 +1946,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
_tmp32_->metadata = _tmp33_;
#line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_media_metadata_unref0 (_tmp29_);
-#line 1939 "RawSupport.c"
+#line 1950 "RawSupport.c"
}
goto __finally33;
__catch33_g_error:
@@ -1947,7 +1958,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
_inner_error_ = NULL;
#line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_error_free0 (err);
-#line 1951 "RawSupport.c"
+#line 1962 "RawSupport.c"
}
__finally33:
#line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1962,7 +1973,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
_detected_photo_information_unref0 (detected);
#line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return NULL;
-#line 1966 "RawSupport.c"
+#line 1977 "RawSupport.c"
}
#line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp34_ = detected;
@@ -1970,7 +1981,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
_tmp35_ = _tmp34_->metadata;
#line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
if (_tmp35_ != NULL) {
-#line 1974 "RawSupport.c"
+#line 1985 "RawSupport.c"
guint8* flattened_sans_thumbnail = NULL;
DetectedPhotoInformation* _tmp36_ = NULL;
PhotoMetadata* _tmp37_ = NULL;
@@ -2009,7 +2020,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
_tmp41__length1 = flattened_sans_thumbnail_length1;
#line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
if (_tmp41_ != NULL) {
-#line 2013 "RawSupport.c"
+#line 2024 "RawSupport.c"
guint8* _tmp42_ = NULL;
gint _tmp42__length1 = 0;
#line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -2018,15 +2029,15 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
_tmp42__length1 = flattened_sans_thumbnail_length1;
#line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp40_ = _tmp42__length1 > 0;
-#line 2022 "RawSupport.c"
+#line 2033 "RawSupport.c"
} else {
#line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp40_ = FALSE;
-#line 2026 "RawSupport.c"
+#line 2037 "RawSupport.c"
}
#line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
if (_tmp40_) {
-#line 2030 "RawSupport.c"
+#line 2041 "RawSupport.c"
DetectedPhotoInformation* _tmp43_ = NULL;
guint8* _tmp44_ = NULL;
gint _tmp44__length1 = 0;
@@ -2049,7 +2060,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
_g_free0 (_tmp43_->exif_md5);
#line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp43_->exif_md5 = _tmp46_;
-#line 2053 "RawSupport.c"
+#line 2064 "RawSupport.c"
}
#line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp47_ = detected;
@@ -2069,7 +2080,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
_tmp52__length1 = flattened_thumbnail_length1;
#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
if (_tmp52_ != NULL) {
-#line 2073 "RawSupport.c"
+#line 2084 "RawSupport.c"
guint8* _tmp53_ = NULL;
gint _tmp53__length1 = 0;
#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -2078,15 +2089,15 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
_tmp53__length1 = flattened_thumbnail_length1;
#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp51_ = _tmp53__length1 > 0;
-#line 2082 "RawSupport.c"
+#line 2093 "RawSupport.c"
} else {
#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp51_ = FALSE;
-#line 2086 "RawSupport.c"
+#line 2097 "RawSupport.c"
}
#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
if (_tmp51_) {
-#line 2090 "RawSupport.c"
+#line 2101 "RawSupport.c"
DetectedPhotoInformation* _tmp54_ = NULL;
guint8* _tmp55_ = NULL;
gint _tmp55__length1 = 0;
@@ -2109,19 +2120,19 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
_g_free0 (_tmp54_->thumbnail_md5);
#line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp54_->thumbnail_md5 = _tmp57_;
-#line 2113 "RawSupport.c"
+#line 2124 "RawSupport.c"
}
#line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
flattened_thumbnail = (g_free (flattened_thumbnail), NULL);
#line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
flattened_sans_thumbnail = (g_free (flattened_sans_thumbnail), NULL);
-#line 2119 "RawSupport.c"
+#line 2130 "RawSupport.c"
}
#line 208 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp58_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5;
#line 208 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
if (_tmp58_) {
-#line 2125 "RawSupport.c"
+#line 2136 "RawSupport.c"
gchar* _tmp59_ = NULL;
GFile* _tmp60_ = NULL;
gchar* _tmp61_ = NULL;
@@ -2145,7 +2156,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
_detected_photo_information_unref0 (detected);
#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return NULL;
-#line 2149 "RawSupport.c"
+#line 2160 "RawSupport.c"
}
#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp62_ = detected;
@@ -2159,7 +2170,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
_tmp62_->md5 = _tmp63_;
#line 208 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_free0 (_tmp59_);
-#line 2163 "RawSupport.c"
+#line 2174 "RawSupport.c"
}
#line 211 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp64_ = detected;
@@ -2183,11 +2194,11 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
if (is_corrupted) {
#line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
*is_corrupted = _vala_is_corrupted;
-#line 2187 "RawSupport.c"
+#line 2198 "RawSupport.c"
}
#line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 2191 "RawSupport.c"
+#line 2202 "RawSupport.c"
}
@@ -2196,7 +2207,7 @@ static void raw_sniffer_class_init (RawSnifferClass * klass) {
raw_sniffer_parent_class = g_type_class_peek_parent (klass);
#line 161 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
((PhotoFileSnifferClass *) klass)->sniff = raw_sniffer_real_sniff;
-#line 2200 "RawSupport.c"
+#line 2211 "RawSupport.c"
}
@@ -2227,14 +2238,14 @@ RawReader* raw_reader_construct (GType object_type, const gchar* filepath) {
self = (RawReader*) photo_file_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_RAW);
#line 219 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return self;
-#line 2231 "RawSupport.c"
+#line 2242 "RawSupport.c"
}
RawReader* raw_reader_new (const gchar* filepath) {
#line 219 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return raw_reader_construct (TYPE_RAW_READER, filepath);
-#line 2238 "RawSupport.c"
+#line 2249 "RawSupport.c"
}
@@ -2268,13 +2279,13 @@ static PhotoMetadata* raw_reader_real_read_metadata (PhotoFileReader* base, GErr
_media_metadata_unref0 (metadata);
#line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return NULL;
-#line 2272 "RawSupport.c"
+#line 2283 "RawSupport.c"
}
#line 227 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
result = metadata;
#line 227 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 2278 "RawSupport.c"
+#line 2289 "RawSupport.c"
}
@@ -2336,7 +2347,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError**
_graw_processor_unref0 (processor);
#line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return NULL;
-#line 2340 "RawSupport.c"
+#line 2351 "RawSupport.c"
}
#line 236 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp8_ = processor;
@@ -2350,7 +2361,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError**
_graw_processor_unref0 (processor);
#line 236 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return NULL;
-#line 2354 "RawSupport.c"
+#line 2365 "RawSupport.c"
}
#line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp9_ = processor;
@@ -2364,7 +2375,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError**
_graw_processor_unref0 (processor);
#line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return NULL;
-#line 2368 "RawSupport.c"
+#line 2379 "RawSupport.c"
}
#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp11_ = processor;
@@ -2380,7 +2391,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError**
_graw_processor_unref0 (processor);
#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return NULL;
-#line 2384 "RawSupport.c"
+#line 2395 "RawSupport.c"
}
#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp13_ = _tmp10_;
@@ -2402,7 +2413,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError**
_graw_processor_unref0 (processor);
#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 2406 "RawSupport.c"
+#line 2417 "RawSupport.c"
}
@@ -2432,17 +2443,17 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions
GRawProcessor* _tmp17_ = NULL;
gchar* _tmp18_ = NULL;
gchar* _tmp19_ = NULL;
- GRawProcessor* _tmp20_ = NULL;
- GRawProcessor* _tmp21_ = NULL;
+ GRawProcessor* _tmp30_ = NULL;
+ GRawProcessor* _tmp31_ = NULL;
GRawProcessedImage* image = NULL;
- GRawProcessor* _tmp22_ = NULL;
- GRawProcessedImage* _tmp23_ = NULL;
- GRawProcessedImage* _tmp24_ = NULL;
- GdkPixbuf* _tmp25_ = NULL;
- GdkPixbuf* _tmp26_ = NULL;
- Dimensions _tmp27_ = {0};
- GdkPixbuf* _tmp28_ = NULL;
- GdkPixbuf* _tmp29_ = NULL;
+ GRawProcessor* _tmp32_ = NULL;
+ GRawProcessedImage* _tmp33_ = NULL;
+ GRawProcessedImage* _tmp34_ = NULL;
+ GdkPixbuf* _tmp35_ = NULL;
+ GdkPixbuf* _tmp36_ = NULL;
+ Dimensions _tmp37_ = {0};
+ GdkPixbuf* _tmp38_ = NULL;
+ GdkPixbuf* _tmp39_ = NULL;
GError * _inner_error_ = NULL;
#line 242 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_READER, RawReader);
@@ -2450,86 +2461,72 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions
g_return_val_if_fail (full != NULL, NULL);
#line 242 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
g_return_val_if_fail (scaled != NULL, NULL);
-#line 243 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp0_ = *scaled;
-#line 243 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp1_ = _tmp0_.width;
-#line 243 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp2_ = *full;
-#line 243 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp3_ = _tmp2_.width;
-#line 243 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- width_proportion = ((gdouble) _tmp1_) / ((gdouble) _tmp3_);
#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ width_proportion = ((gdouble) _tmp1_) / ((gdouble) _tmp3_);
+#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp4_ = *scaled;
-#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp5_ = _tmp4_.height;
-#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp6_ = *full;
-#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp7_ = _tmp6_.height;
-#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- height_proportion = ((gdouble) _tmp5_) / ((gdouble) _tmp7_);
#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ height_proportion = ((gdouble) _tmp5_) / ((gdouble) _tmp7_);
+#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp9_ = width_proportion;
-#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
if (_tmp9_ < 0.5) {
-#line 2478 "RawSupport.c"
+#line 2489 "RawSupport.c"
gdouble _tmp10_ = 0.0;
-#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp10_ = height_proportion;
-#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp8_ = _tmp10_ < 0.5;
-#line 2484 "RawSupport.c"
+#line 2495 "RawSupport.c"
} else {
-#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp8_ = FALSE;
-#line 2488 "RawSupport.c"
+#line 2499 "RawSupport.c"
}
-#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
half_size = _tmp8_;
-#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp11_ = graw_processor_new (LIBRAW_OPTIONS_NONE);
-#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- processor = _tmp11_;
#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ processor = _tmp11_;
+#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp12_ = processor;
-#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp13_ = half_size;
-#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- graw_processor_configure_for_rgb_display (_tmp12_, _tmp13_);
#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ graw_processor_configure_for_rgb_display (_tmp12_, _tmp13_);
+#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp14_ = processor;
-#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp15_ = graw_processor_get_output_params (_tmp14_);
-#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp16_ = _tmp15_;
-#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
(*_tmp16_).user_flip = (gint) GRAW_FLIP_NONE;
-#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp17_ = processor;
-#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp18_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp19_ = _tmp18_;
-#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- graw_processor_open_file (_tmp17_, _tmp19_, &_inner_error_);
-#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- _g_free0 (_tmp19_);
-#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- g_propagate_error (error, _inner_error_);
-#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- _graw_processor_unref0 (processor);
-#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- return NULL;
-#line 2528 "RawSupport.c"
- }
#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- _tmp20_ = processor;
+ graw_processor_open_file (_tmp17_, _tmp19_, &_inner_error_);
#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- graw_processor_unpack (_tmp20_, &_inner_error_);
+ _g_free0 (_tmp19_);
#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -2538,12 +2535,83 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions
_graw_processor_unref0 (processor);
#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return NULL;
-#line 2542 "RawSupport.c"
+#line 2539 "RawSupport.c"
}
+ {
+ PhotoFileReaderRole _tmp20_ = 0;
+#line 254 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ _tmp20_ = photo_file_reader_get_role (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_READER, PhotoFileReader));
+#line 254 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ if (_tmp20_ == PHOTO_FILE_READER_ROLE_THUMBNAIL) {
+#line 2547 "RawSupport.c"
+ GRawProcessor* _tmp21_ = NULL;
+ GRawProcessedImage* image = NULL;
+ GRawProcessor* _tmp22_ = NULL;
+ GRawProcessedImage* _tmp23_ = NULL;
+ GRawProcessedImage* _tmp24_ = NULL;
+ GdkPixbuf* _tmp25_ = NULL;
+ GdkPixbuf* _tmp26_ = NULL;
+ Dimensions _tmp27_ = {0};
+ GdkPixbuf* _tmp28_ = NULL;
+ GdkPixbuf* _tmp29_ = NULL;
+#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ _tmp21_ = processor;
+#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ graw_processor_unpack_thumb (_tmp21_, &_inner_error_);
+#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 2564 "RawSupport.c"
+ goto __catch34_g_error;
+ }
+#line 256 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ _tmp22_ = processor;
+#line 256 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ _tmp23_ = graw_processor_make_thumb_image (_tmp22_, &_inner_error_);
+#line 256 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ image = _tmp23_;
+#line 256 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 2575 "RawSupport.c"
+ goto __catch34_g_error;
+ }
+#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ _tmp24_ = image;
+#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ _tmp25_ = graw_processed_image_get_pixbuf_copy (_tmp24_);
+#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ _tmp26_ = _tmp25_;
+#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ _tmp27_ = *scaled;
+#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ _tmp28_ = resize_pixbuf (_tmp26_, &_tmp27_, GDK_INTERP_BILINEAR);
+#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ _tmp29_ = _tmp28_;
+#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ _g_object_unref0 (_tmp26_);
+#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ result = _tmp29_;
+#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ _graw_processed_image_unref0 (image);
+#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ _graw_processor_unref0 (processor);
+#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ return result;
+#line 2600 "RawSupport.c"
+ }
+ }
+ goto __finally34;
+ __catch34_g_error:
+ {
+ GError* _error_ = NULL;
#line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- _tmp21_ = processor;
+ _error_ = _inner_error_;
+#line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ _inner_error_ = NULL;
#line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- graw_processor_process (_tmp21_, &_inner_error_);
+ _g_error_free0 (_error_);
+#line 2613 "RawSupport.c"
+ }
+ __finally34:
#line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -2552,47 +2620,75 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions
_graw_processor_unref0 (processor);
#line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return NULL;
-#line 2556 "RawSupport.c"
+#line 2624 "RawSupport.c"
}
-#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- _tmp22_ = processor;
-#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- _tmp23_ = graw_processor_make_mem_image (_tmp22_, &_inner_error_);
-#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- image = _tmp23_;
-#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ _tmp30_ = processor;
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ graw_processor_unpack (_tmp30_, &_inner_error_);
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_graw_processor_unref0 (processor);
-#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return NULL;
-#line 2572 "RawSupport.c"
+#line 2638 "RawSupport.c"
}
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- _tmp24_ = image;
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- _tmp25_ = graw_processed_image_get_pixbuf_copy (_tmp24_);
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- _tmp26_ = _tmp25_;
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- _tmp27_ = *scaled;
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- _tmp28_ = resize_pixbuf (_tmp26_, &_tmp27_, GDK_INTERP_BILINEAR);
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- _tmp29_ = _tmp28_;
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- _g_object_unref0 (_tmp26_);
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- result = _tmp29_;
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ _tmp31_ = processor;
+#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ graw_processor_process (_tmp31_, &_inner_error_);
+#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ g_propagate_error (error, _inner_error_);
+#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ _graw_processor_unref0 (processor);
+#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ return NULL;
+#line 2652 "RawSupport.c"
+ }
+#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ _tmp32_ = processor;
+#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ _tmp33_ = graw_processor_make_mem_image (_tmp32_, &_inner_error_);
+#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ image = _tmp33_;
+#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ g_propagate_error (error, _inner_error_);
+#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ _graw_processor_unref0 (processor);
+#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ return NULL;
+#line 2668 "RawSupport.c"
+ }
+#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ _tmp34_ = image;
+#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ _tmp35_ = graw_processed_image_get_pixbuf_copy (_tmp34_);
+#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ _tmp36_ = _tmp35_;
+#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ _tmp37_ = *scaled;
+#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ _tmp38_ = resize_pixbuf (_tmp36_, &_tmp37_, GDK_INTERP_BILINEAR);
+#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ _tmp39_ = _tmp38_;
+#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ _g_object_unref0 (_tmp36_);
+#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+ result = _tmp39_;
+#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_graw_processed_image_unref0 (image);
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_graw_processor_unref0 (processor);
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 2596 "RawSupport.c"
+#line 2692 "RawSupport.c"
}
@@ -2605,7 +2701,7 @@ static void raw_reader_class_init (RawReaderClass * klass) {
((PhotoFileReaderClass *) klass)->unscaled_read = raw_reader_real_unscaled_read;
#line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
((PhotoFileReaderClass *) klass)->scaled_read = raw_reader_real_scaled_read;
-#line 2609 "RawSupport.c"
+#line 2705 "RawSupport.c"
}
@@ -2630,80 +2726,80 @@ RawDeveloper* raw_developer_as_array (int* result_length1) {
RawDeveloper* _tmp0_ = NULL;
RawDeveloper* _tmp1_ = NULL;
gint _tmp1__length1 = 0;
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp0_ = g_new0 (RawDeveloper, 3);
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp0_[0] = RAW_DEVELOPER_SHOTWELL;
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp0_[1] = RAW_DEVELOPER_CAMERA;
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp0_[2] = RAW_DEVELOPER_EMBEDDED;
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp1_ = _tmp0_;
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp1__length1 = 3;
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
if (result_length1) {
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
*result_length1 = _tmp1__length1;
-#line 2650 "RawSupport.c"
+#line 2746 "RawSupport.c"
}
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
result = _tmp1_;
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 2656 "RawSupport.c"
+#line 2752 "RawSupport.c"
}
gchar* raw_developer_to_string (RawDeveloper self) {
gchar* result = NULL;
-#line 272 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
switch (self) {
-#line 272 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
case RAW_DEVELOPER_SHOTWELL:
-#line 2666 "RawSupport.c"
+#line 2762 "RawSupport.c"
{
gchar* _tmp0_ = NULL;
-#line 274 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp0_ = g_strdup ("SHOTWELL");
-#line 274 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
result = _tmp0_;
-#line 274 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 2675 "RawSupport.c"
+#line 2771 "RawSupport.c"
}
-#line 272 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
case RAW_DEVELOPER_CAMERA:
-#line 2679 "RawSupport.c"
+#line 2775 "RawSupport.c"
{
gchar* _tmp1_ = NULL;
-#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp1_ = g_strdup ("CAMERA");
-#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
result = _tmp1_;
-#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 2688 "RawSupport.c"
+#line 2784 "RawSupport.c"
}
-#line 272 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
case RAW_DEVELOPER_EMBEDDED:
-#line 2692 "RawSupport.c"
+#line 2788 "RawSupport.c"
{
gchar* _tmp2_ = NULL;
-#line 278 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp2_ = g_strdup ("EMBEDDED");
-#line 278 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
result = _tmp2_;
-#line 278 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 2701 "RawSupport.c"
+#line 2797 "RawSupport.c"
}
default:
{
-#line 280 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
g_assert_not_reached ();
-#line 2707 "RawSupport.c"
+#line 2803 "RawSupport.c"
}
}
}
@@ -2714,69 +2810,69 @@ RawDeveloper raw_developer_from_string (const gchar* value) {
const gchar* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
GQuark _tmp3_ = 0U;
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
static GQuark _tmp2_label0 = 0;
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
static GQuark _tmp2_label1 = 0;
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
static GQuark _tmp2_label2 = 0;
-#line 284 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 297 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
g_return_val_if_fail (value != NULL, 0);
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp0_ = value;
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp1_ = _tmp0_;
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_);
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
if (_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("SHOTWELL")))) {
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
switch (0) {
-#line 2736 "RawSupport.c"
+#line 2832 "RawSupport.c"
default:
{
-#line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
result = RAW_DEVELOPER_SHOTWELL;
-#line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 2743 "RawSupport.c"
+#line 2839 "RawSupport.c"
}
}
} else if (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("CAMERA")))) {
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
switch (0) {
-#line 2749 "RawSupport.c"
+#line 2845 "RawSupport.c"
default:
{
-#line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 302 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
result = RAW_DEVELOPER_CAMERA;
-#line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 302 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 2756 "RawSupport.c"
+#line 2852 "RawSupport.c"
}
}
} else if (_tmp3_ == ((0 != _tmp2_label2) ? _tmp2_label2 : (_tmp2_label2 = g_quark_from_static_string ("EMBEDDED")))) {
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
switch (0) {
-#line 2762 "RawSupport.c"
+#line 2858 "RawSupport.c"
default:
{
-#line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 304 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
result = RAW_DEVELOPER_EMBEDDED;
-#line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 304 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 2769 "RawSupport.c"
+#line 2865 "RawSupport.c"
}
}
} else {
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
switch (0) {
-#line 2775 "RawSupport.c"
+#line 2871 "RawSupport.c"
default:
{
-#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
g_assert_not_reached ();
-#line 2780 "RawSupport.c"
+#line 2876 "RawSupport.c"
}
}
}
@@ -2785,47 +2881,47 @@ RawDeveloper raw_developer_from_string (const gchar* value) {
gchar* raw_developer_get_label (RawDeveloper self) {
gchar* result = NULL;
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
switch (self) {
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
case RAW_DEVELOPER_SHOTWELL:
-#line 2793 "RawSupport.c"
+#line 2889 "RawSupport.c"
{
const gchar* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
-#line 300 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp0_ = _ ("Shotwell");
-#line 300 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp1_ = g_strdup (_tmp0_);
-#line 300 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
result = _tmp1_;
-#line 300 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 2805 "RawSupport.c"
+#line 2901 "RawSupport.c"
}
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
case RAW_DEVELOPER_CAMERA:
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
case RAW_DEVELOPER_EMBEDDED:
-#line 2811 "RawSupport.c"
+#line 2907 "RawSupport.c"
{
const gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 303 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp2_ = _ ("Camera");
-#line 303 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp3_ = g_strdup (_tmp2_);
-#line 303 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
result = _tmp3_;
-#line 303 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 2823 "RawSupport.c"
+#line 2919 "RawSupport.c"
}
default:
{
-#line 305 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 318 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
g_assert_not_reached ();
-#line 2829 "RawSupport.c"
+#line 2925 "RawSupport.c"
}
}
}
@@ -2836,68 +2932,68 @@ gboolean raw_developer_is_equivalent (RawDeveloper self, RawDeveloper d) {
RawDeveloper _tmp0_ = 0;
gboolean _tmp1_ = FALSE;
gboolean _tmp2_ = FALSE;
-#line 312 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 325 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp0_ = d;
-#line 312 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 325 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
if (self == _tmp0_) {
-#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 326 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
result = TRUE;
-#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 326 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 2848 "RawSupport.c"
+#line 2944 "RawSupport.c"
}
-#line 315 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
if (self == RAW_DEVELOPER_CAMERA) {
-#line 2852 "RawSupport.c"
+#line 2948 "RawSupport.c"
RawDeveloper _tmp3_ = 0;
-#line 315 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp3_ = d;
-#line 315 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp2_ = _tmp3_ == RAW_DEVELOPER_EMBEDDED;
-#line 2858 "RawSupport.c"
+#line 2954 "RawSupport.c"
} else {
-#line 315 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp2_ = FALSE;
-#line 2862 "RawSupport.c"
+#line 2958 "RawSupport.c"
}
-#line 315 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
if (_tmp2_) {
-#line 315 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp1_ = TRUE;
-#line 2868 "RawSupport.c"
+#line 2964 "RawSupport.c"
} else {
gboolean _tmp4_ = FALSE;
-#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
if (self == RAW_DEVELOPER_EMBEDDED) {
-#line 2873 "RawSupport.c"
+#line 2969 "RawSupport.c"
RawDeveloper _tmp5_ = 0;
-#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp5_ = d;
-#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp4_ = _tmp5_ == RAW_DEVELOPER_CAMERA;
-#line 2879 "RawSupport.c"
+#line 2975 "RawSupport.c"
} else {
-#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp4_ = FALSE;
-#line 2883 "RawSupport.c"
+#line 2979 "RawSupport.c"
}
-#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp1_ = _tmp4_;
-#line 2887 "RawSupport.c"
+#line 2983 "RawSupport.c"
}
-#line 315 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
if (_tmp1_) {
-#line 317 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
result = TRUE;
-#line 317 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 2895 "RawSupport.c"
+#line 2991 "RawSupport.c"
}
-#line 319 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 332 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
result = FALSE;
-#line 319 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 332 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 2901 "RawSupport.c"
+#line 2997 "RawSupport.c"
}
@@ -2932,41 +3028,41 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper
GFile* _tmp37_ = NULL;
gchar* _tmp38_ = NULL;
GError * _inner_error_ = NULL;
-#line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
g_return_val_if_fail (raw_filepath != NULL, NULL);
-#line 326 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 339 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp0_ = backing_photo_row_new ();
-#line 326 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 339 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
ns = _tmp0_;
-#line 327 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 340 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp1_ = raw_filepath;
-#line 327 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 340 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp2_ = g_file_new_for_path (_tmp1_);
-#line 327 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 340 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
master = _tmp2_;
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp3_ = master;
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp4_ = g_file_get_basename (_tmp3_);
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp5_ = _tmp4_;
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
disassemble_filename (_tmp5_, &_tmp6_, &_tmp7_);
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_free0 (name);
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
name = _tmp6_;
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_free0 (ext);
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
ext = _tmp7_;
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_free0 (_tmp5_);
-#line 335 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp8_ = camera_development_filename;
-#line 335 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
if (_tmp8_ == NULL) {
-#line 2970 "RawSupport.c"
+#line 3066 "RawSupport.c"
gchar* _tmp9_ = NULL;
const gchar* _tmp16_ = NULL;
gchar* _tmp17_ = NULL;
@@ -2977,176 +3073,176 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper
gchar* _tmp22_ = NULL;
gchar* _tmp23_ = NULL;
gchar* _tmp24_ = NULL;
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
if (self != RAW_DEVELOPER_CAMERA) {
-#line 2983 "RawSupport.c"
+#line 3079 "RawSupport.c"
gchar* _tmp10_ = NULL;
gchar* _tmp11_ = NULL;
gchar* _tmp12_ = NULL;
gchar* _tmp13_ = NULL;
gchar* _tmp14_ = NULL;
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp10_ = raw_developer_to_string (self);
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp11_ = _tmp10_;
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp12_ = g_utf8_strdown (_tmp11_, (gssize) -1);
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp13_ = _tmp12_;
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp14_ = g_strconcat ("_", _tmp13_, NULL);
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_free0 (_tmp9_);
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp9_ = _tmp14_;
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_free0 (_tmp13_);
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_free0 (_tmp11_);
-#line 3007 "RawSupport.c"
+#line 3103 "RawSupport.c"
} else {
gchar* _tmp15_ = NULL;
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp15_ = g_strdup ("");
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_free0 (_tmp9_);
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp9_ = _tmp15_;
-#line 3016 "RawSupport.c"
+#line 3112 "RawSupport.c"
}
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp16_ = name;
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp17_ = g_strconcat (_tmp16_, "_", NULL);
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp18_ = _tmp17_;
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp19_ = ext;
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp20_ = g_strconcat (_tmp18_, _tmp19_, NULL);
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp21_ = _tmp20_;
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp22_ = g_strconcat (_tmp21_, _tmp9_, NULL);
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp23_ = _tmp22_;
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp24_ = g_strconcat (_tmp23_, ".jpg", NULL);
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_free0 (basename);
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
basename = _tmp24_;
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_free0 (_tmp23_);
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_free0 (_tmp21_);
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_free0 (_tmp18_);
-#line 335 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_free0 (_tmp9_);
-#line 3048 "RawSupport.c"
+#line 3144 "RawSupport.c"
} else {
const gchar* _tmp25_ = NULL;
gchar* _tmp26_ = NULL;
-#line 339 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp25_ = camera_development_filename;
-#line 339 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp26_ = g_strdup (_tmp25_);
-#line 339 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_free0 (basename);
-#line 339 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
basename = _tmp26_;
-#line 3060 "RawSupport.c"
+#line 3156 "RawSupport.c"
}
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp27_ = master;
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp28_ = g_file_get_parent (_tmp27_);
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp29_ = _tmp28_;
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp30_ = basename;
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp32_ = generate_unique_file (_tmp29_, _tmp30_, &_tmp31_, &_inner_error_);
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
c = _tmp31_;
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp33_ = _tmp32_;
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_object_unref0 (_tmp29_);
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
new_back = _tmp33_;
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_free0 (basename);
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_free0 (ext);
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_free0 (name);
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_object_unref0 (master);
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_backing_photo_row_unref0 (ns);
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return NULL;
-#line 3096 "RawSupport.c"
+#line 3192 "RawSupport.c"
}
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp34_ = new_back;
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
claim_file (_tmp34_, &_inner_error_);
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_object_unref0 (new_back);
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_free0 (basename);
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_free0 (ext);
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_free0 (name);
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_object_unref0 (master);
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_backing_photo_row_unref0 (ns);
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return NULL;
-#line 3120 "RawSupport.c"
+#line 3216 "RawSupport.c"
}
-#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp35_ = ns;
-#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp35_->file_format = PHOTO_FILE_FORMAT_JFIF;
-#line 346 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp36_ = ns;
-#line 346 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp37_ = new_back;
-#line 346 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp38_ = g_file_get_path (_tmp37_);
-#line 346 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_free0 (_tmp36_->filepath);
-#line 346 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp36_->filepath = _tmp38_;
-#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
result = ns;
-#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_object_unref0 (new_back);
-#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_free0 (basename);
-#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_free0 (ext);
-#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_free0 (name);
-#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_g_object_unref0 (master);
-#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
return result;
-#line 3150 "RawSupport.c"
+#line 3246 "RawSupport.c"
}
diff --git a/src/photos/RawSupport.vala b/src/photos/RawSupport.vala
index 441b899..05f652c 100644
--- a/src/photos/RawSupport.vala
+++ b/src/photos/RawSupport.vala
@@ -240,6 +240,7 @@ public class RawReader : PhotoFileReader {
}
public override Gdk.Pixbuf scaled_read(Dimensions full, Dimensions scaled) throws Error {
+ // Try to get the embedded thumbnail first
double width_proportion = (double) scaled.width / (double) full.width;
double height_proportion = (double) scaled.height / (double) full.height;
bool half_size = width_proportion < 0.5 && height_proportion < 0.5;
@@ -249,6 +250,18 @@ public class RawReader : PhotoFileReader {
processor.output_params->user_flip = GRaw.Flip.NONE;
processor.open_file(get_filepath());
+ try {
+ if (this.get_role () == Role.THUMBNAIL) {
+ processor.unpack_thumb();
+ var image = processor.make_thumb_image ();
+ return resize_pixbuf (image.get_pixbuf_copy (),
+ scaled,
+ Gdk.InterpType.BILINEAR);
+ }
+ } catch (Error error) {
+ // Nothing to do, continue with raw developer
+ }
+
processor.unpack();
processor.process();
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 21:39:15 +0000