[shotwell/shotwell-0.24] graw, libraw.vapi: Use the correct type for use_camera_matrix
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [shotwell/shotwell-0.24] graw, libraw.vapi: Use the correct type for use_camera_matrix
- Date: Sun, 5 Feb 2017 10:30:57 +0000 (UTC)
commit d750c124bbd84ea75c0ac988b16ea37caf968c4f
Author: Debarshi Ray <debarshir gnome org>
Date: Sat Feb 4 16:48:24 2017 +0100
graw, libraw.vapi: Use the correct type for use_camera_matrix
libraw_output_params_t.use_camera_matrix is a tri-state value, not a
boolean. Since any non-zero value counts as 'true', let's use the
default unless someone finds a reason not to.
See:
http://www.libraw.org/docs/API-datastruct-eng.html#libraw_output_params_t
https://bugzilla.gnome.org/show_bug.cgi?id=778174
src/photos/GRaw.vala | 8 +++++++-
vapi/libraw.vapi | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/src/photos/GRaw.vala b/src/photos/GRaw.vala
index ec1df8d..fc43760 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;
@@ -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/vapi/libraw.vapi b/vapi/libraw.vapi
index ae498ed..3caf3b2 100644
--- a/vapi/libraw.vapi
+++ b/vapi/libraw.vapi
@@ -107,7 +107,7 @@ public struct OutputParams {
public int highlight;
public bool use_auto_wb;
public bool use_camera_wb;
- public bool use_camera_matrix;
+ public int use_camera_matrix;
public int output_color;
public int output_bps;
public bool output_tiff;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]