Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10386
Modified Files:
dcraw_api.h dcraw_indi.c nikon_curve.c uf_gtk.h ufobject.cc
ufobject.h ufraw.h ufraw_embedded.c ufraw_lensfun.cc
ufraw_preview.c ufraw_settings.cc ufraw_writer.c
Log Message:
Disable bilinear interpolation for the FUJIFILM X-Trans sensors. Update coding
style to astyle 2.03 (Ubuntu 14.04.1).
Index: dcraw_api.h
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw_api.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- dcraw_api.h 1 Jan 2014 06:00:23 -0000 1.50
+++ dcraw_api.h 26 Jul 2014 03:30:09 -0000 1.51
@@ -20,58 +20,58 @@
extern "C" {
#endif
- typedef guint16 dcraw_image_type[4];
+typedef guint16 dcraw_image_type[4];
- typedef struct {
- dcraw_image_type *image;
- int width, height, colors;
- } dcraw_image_data;
+typedef struct {
+ dcraw_image_type *image;
+ int width, height, colors;
+} dcraw_image_data;
- typedef struct {
- void *dcraw;
- FILE *ifp;
- int width, height, colors, fourColorFilters, filters, raw_color;
- int top_margin, left_margin, flip, shrink;
- double pixel_aspect;
- dcraw_image_data raw;
- dcraw_image_type thresholds;
- float pre_mul[4], post_mul[4], cam_mul[4], rgb_cam[3][4];
- double cam_rgb[4][3];
- int rgbMax, black, fuji_width;
- double fuji_step;
- int toneCurveSize, toneCurveOffset;
- int toneModeSize, toneModeOffset;
- char *message, xtrans[6][6];
- float iso_speed, shutter, aperture, focal_len;
- time_t timestamp;
- char make[80], model[80];
- int thumbType, thumbOffset;
- size_t thumbBufferLength;
- } dcraw_data;
+typedef struct {
+ void *dcraw;
+ FILE *ifp;
+ int width, height, colors, fourColorFilters, filters, raw_color;
+ int top_margin, left_margin, flip, shrink;
+ double pixel_aspect;
+ dcraw_image_data raw;
+ dcraw_image_type thresholds;
+ float pre_mul[4], post_mul[4], cam_mul[4], rgb_cam[3][4];
+ double cam_rgb[4][3];
+ int rgbMax, black, fuji_width;
+ double fuji_step;
+ int toneCurveSize, toneCurveOffset;
+ int toneModeSize, toneModeOffset;
+ char *message, xtrans[6][6];
+ float iso_speed, shutter, aperture, focal_len;
+ time_t timestamp;
+ char make[80], model[80];
+ int thumbType, thumbOffset;
+ size_t thumbBufferLength;
+} dcraw_data;
- enum { dcraw_ahd_interpolation,
- dcraw_vng_interpolation, dcraw_four_color_interpolation,
- dcraw_ppg_interpolation, dcraw_bilinear_interpolation,
- dcraw_xtrans_interpolation, dcraw_none_interpolation
- };
- enum { unknown_thumb_type, jpeg_thumb_type, ppm_thumb_type };
- int dcraw_open(dcraw_data *h, char *filename);
- int dcraw_load_raw(dcraw_data *h);
- int dcraw_load_thumb(dcraw_data *h, dcraw_image_data *thumb);
- int dcraw_finalize_shrink(dcraw_image_data *f, dcraw_data *h,
- int scale);
- int dcraw_image_resize(dcraw_image_data *image, int size);
- int dcraw_image_stretch(dcraw_image_data *image, double pixel_aspect);
- int dcraw_flip_image(dcraw_image_data *image, int flip);
- int dcraw_set_color_scale(dcraw_data *h, int useCameraWB);
- void dcraw_wavelet_denoise(dcraw_data *h, float threshold);
- void dcraw_wavelet_denoise_shrinked(dcraw_image_data *f, float threshold);
- void dcraw_finalize_raw(dcraw_data *h, dcraw_data *dark, int rgbWB[4]);
- int dcraw_finalize_interpolate(dcraw_image_data *f, dcraw_data *h,
- int interpolation, int smoothing);
- void dcraw_close(dcraw_data *h);
- void dcraw_image_dimensions(dcraw_data *raw, int flip, int shrink,
- int *height, int *width);
+enum { dcraw_ahd_interpolation,
+ dcraw_vng_interpolation, dcraw_four_color_interpolation,
+ dcraw_ppg_interpolation, dcraw_bilinear_interpolation,
+ dcraw_xtrans_interpolation, dcraw_none_interpolation
+ };
+enum { unknown_thumb_type, jpeg_thumb_type, ppm_thumb_type };
+int dcraw_open(dcraw_data *h, char *filename);
+int dcraw_load_raw(dcraw_data *h);
+int dcraw_load_thumb(dcraw_data *h, dcraw_image_data *thumb);
+int dcraw_finalize_shrink(dcraw_image_data *f, dcraw_data *h,
+ int scale);
+int dcraw_image_resize(dcraw_image_data *image, int size);
+int dcraw_image_stretch(dcraw_image_data *image, double pixel_aspect);
+int dcraw_flip_image(dcraw_image_data *image, int flip);
+int dcraw_set_color_scale(dcraw_data *h, int useCameraWB);
+void dcraw_wavelet_denoise(dcraw_data *h, float threshold);
+void dcraw_wavelet_denoise_shrinked(dcraw_image_data *f, float threshold);
+void dcraw_finalize_raw(dcraw_data *h, dcraw_data *dark, int rgbWB[4]);
+int dcraw_finalize_interpolate(dcraw_image_data *f, dcraw_data *h,
+ int interpolation, int smoothing);
+void dcraw_close(dcraw_data *h);
+void dcraw_image_dimensions(dcraw_data *raw, int flip, int shrink,
+ int *height, int *width);
#define DCRAW_SUCCESS 0
#define DCRAW_ERROR 1
@@ -81,7 +81,7 @@
#define DCRAW_WARNING 5
#define DCRAW_OPEN_ERROR 6
- void dcraw_message(void *dcraw, int code, char *format, ...);
+void dcraw_message(void *dcraw, int code, char *format, ...);
#ifdef __cplusplus
}
Index: ufraw_writer.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_writer.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- ufraw_writer.c 27 Jan 2014 04:00:07 -0000 1.93
+++ ufraw_writer.c 26 Jul 2014 03:30:10 -0000 1.94
@@ -220,7 +220,8 @@
#if defined(HAVE_LIBCFITSIO) && defined(_WIN32)
/* localtime_r() is not included in the _WIN32 API. */
-static struct tm *localtime_r(const time_t *timep, struct tm *result) {
+static struct tm *localtime_r(const time_t *timep, struct tm *result)
+{
struct tm *p = localtime(timep);
memset(result, 0, sizeof(*result));
if (p) {
Index: ufobject.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufobject.cc,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- ufobject.cc 1 Jan 2014 06:00:23 -0000 1.19
+++ ufobject.cc 26 Jul 2014 03:30:10 -0000 1.20
@@ -85,9 +85,9 @@
}
UFObject::operator const class UFNumber&() const
- {
- return dynamic_cast<const UFNumber &>(*this);
- }
+{
+ return dynamic_cast<const UFNumber &>(*this);
+}
UFObject::operator class UFNumberArray&()
{
@@ -95,9 +95,9 @@
}
UFObject::operator const class UFNumberArray&() const
- {
- return dynamic_cast<const UFNumberArray &>(*this);
- }
+{
+ return dynamic_cast<const UFNumberArray &>(*this);
+}
UFObject::operator class UFString&()
{
@@ -105,9 +105,9 @@
}
UFObject::operator const class UFString&() const
- {
- return dynamic_cast<const UFString &>(*this);
- }
+{
+ return dynamic_cast<const UFString &>(*this);
+}
UFObject::operator class UFGroup&()
{
@@ -115,9 +115,9 @@
}
UFObject::operator const class UFGroup&() const
- {
- return dynamic_cast<const UFGroup &>(*this);
- }
+{
+ return dynamic_cast<const UFGroup &>(*this);
+}
UFObject::operator class UFArray&()
{
@@ -125,9 +125,9 @@
}
UFObject::operator const class UFArray&() const
- {
- return dynamic_cast<const UFArray &>(*this);
- }
+{
+ return dynamic_cast<const UFArray &>(*this);
+}
bool UFObject::HasParent() const
{
Index: dcraw_indi.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw_indi.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- dcraw_indi.c 4 Jul 2014 02:45:16 -0000 1.116
+++ dcraw_indi.c 26 Jul 2014 03:30:10 -0000 1.117
@@ -638,8 +638,8 @@
if (ng == g + 1) FORC(8) {
v = orth[d ] * patt[g][c * 2] + orth[d + 1] * patt[g][c *
2 + 1];
h = orth[d + 2] * patt[g][c * 2] + orth[d + 3] * patt[g][c
* 2 + 1];
- allhex[row][col][0][c ^(g * 2 & d)] = h + v * width;
- allhex[row][col][1][c ^(g * 2 & d)] = h + v * TS;
+ allhex[row][col][0][c ^ (g * 2 & d)] = h + v * width;
+ allhex[row][col][1][c ^ (g * 2 & d)] = h + v * TS;
}
}
@@ -987,7 +987,7 @@
PIX_SORT(p[4], p[2]) ;
PIX_SORT(p[6], p[4]) ;
PIX_SORT(p[4], p[2]) ;
- return(p[4]) ;
+ return (p[4]) ;
}
#undef PIX_SWAP
Index: nikon_curve.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/nikon_curve.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- nikon_curve.c 1 Jan 2014 06:00:23 -0000 1.44
+++ nikon_curve.c 26 Jul 2014 03:30:10 -0000 1.45
@@ -320,33 +320,33 @@
//file header indicating ntc file
static const unsigned char NTCFileHeader[] = {0x9d, 0xdc, 0x7d, 0x00, 0x65,
0xd4,
- 0x11, 0xd1, 0x91, 0x94, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00
+ 0x11, 0xd1, 0x91, 0x94, 0x44,
0x45, 0x53, 0x54, 0x00, 0x00
};
//file header indicating an ncv file
static const unsigned char NCVFileHeader[] = {0x40, 0xa9, 0x86, 0x7a, 0x1b,
0xe9,
- 0xd2, 0x11, 0xa9, 0x0a, 0x00, 0xaa, 0x00, 0xb1, 0xc1, 0xb7
+ 0xd2, 0x11, 0xa9, 0x0a, 0x00,
0xaa, 0x00, 0xb1, 0xc1, 0xb7
};
//This is an additional header chunk at the beginning of the file
//There are some similarities between the headers, but not enough to fully
crack.
//This does not appear to change.
static const unsigned char NCVSecondFileHeader[] = {0x01, 0x32, 0xa4, 0x76,
0xa2,
- 0x17, 0xd4, 0x11, 0xa9, 0x0a, 0x00, 0xaa, 0x00, 0xb1, 0xc1,
- 0xb7, 0x01, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01
+ 0x17, 0xd4, 0x11, 0xa9,
0x0a, 0x00, 0xaa, 0x00, 0xb1, 0xc1,
+ 0xb7, 0x01, 0x00, 0x05,
0x00, 0x00, 0x00, 0x01
};
//This is the terminator of an NCV file. Again there are some similarites
//to other sections, but not enough for to crack what it means. However,
//it does not appear to change.
static const unsigned char NCVFileTerminator[] = {0x45, 0xd3, 0x0d, 0x77,
0xa3, 0x6e,
- 0x1e, 0x4e, 0xa4, 0xbe, 0xcf, 0xc1, 0x8e, 0xb5, 0xb7, 0x47,
- 0x01, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01
+ 0x1e, 0x4e, 0xa4, 0xbe,
0xcf, 0xc1, 0x8e, 0xb5, 0xb7, 0x47,
+ 0x01, 0x00, 0x05, 0x00,
0x00, 0x00, 0x01
};
//File section header. Only a one byte difference between this and an NTC file
header
static const unsigned char FileSectionHeader[] = {0x9d, 0xdc, 0x7d, 0x03,
0x65, 0xd4,
- 0x11, 0xd1, 0x91, 0x94, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00
+ 0x11, 0xd1, 0x91, 0x94,
0x44, 0x45, 0x53, 0x54, 0x00, 0x00
};
//file type header array
static const unsigned char *FileTypeHeaders[NUM_FILE_TYPES] = {
Index: ufraw_settings.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_settings.cc,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- ufraw_settings.cc 1 Jan 2014 06:00:24 -0000 1.26
+++ ufraw_settings.cc 26 Jul 2014 03:30:10 -0000 1.27
@@ -492,7 +492,8 @@
dynamic_cast<UFRaw::Image *>(obj)->SetUFRawData(uf);
}
- struct ufraw_struct *ufraw_image_get_data(UFObject *obj) {
+ struct ufraw_struct *ufraw_image_get_data(UFObject *obj)
+ {
return UFRaw::Image::UFRawData(obj);
}
Index: ufraw_preview.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_preview.c,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -d -r1.373 -r1.374
--- ufraw_preview.c 1 Jan 2014 06:00:23 -0000 1.373
+++ ufraw_preview.c 26 Jul 2014 03:30:10 -0000 1.374
@@ -4425,8 +4425,6 @@
if (data->UF->IsXTrans) {
uf_combo_box_append_text(combo, _("X-Trans interpolation"),
(void*)xtrans_interpolation);
- uf_combo_box_append_text(combo, _("Bilinear interpolation"),
- (void*)bilinear_interpolation);
} else if (data->UF->colors == 4) {
uf_combo_box_append_text(combo, _("VNG four color interpolation"),
(void*)four_color_interpolation);
Index: ufobject.h
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufobject.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ufobject.h 1 Jan 2014 06:00:23 -0000 1.15
+++ ufobject.h 26 Jul 2014 03:30:10 -0000 1.16
@@ -423,72 +423,72 @@
#endif
/// Delete a UFObject and free its resources. Never use free() on UFObject s.
- UFObject *ufobject_delete(UFObject *object);
+UFObject *ufobject_delete(UFObject *object);
/// Retrieve the name of the UFObject.
- UFName ufobject_name(UFObject *object);
- UFObject *ufobject_parent(UFObject *object);
+UFName ufobject_name(UFObject *object);
+UFObject *ufobject_parent(UFObject *object);
/// Translate object to a string. See UFObject::StringValue() for details.
- const char *ufobject_string_value(UFObject *object);
+const char *ufobject_string_value(UFObject *object);
/// Set the value of the object from the string value.
/// Returns false on failure.
/// See \ref C-interface and UFObject::Set(const char *string) for details.
- UFBoolean ufobject_set_string(UFObject *object, const char *string);
+UFBoolean ufobject_set_string(UFObject *object, const char *string);
/// Copy the value of the source object to the destination object.
/// Returns false on failure.
/// See \ref C-interface and UFObject::Set(const UFObject &object) for details.
- UFBoolean ufobject_copy(UFObject *destination, UFObject *source);
+UFBoolean ufobject_copy(UFObject *destination, UFObject *source);
/// Create an XML block for the object. The returned buffer should be
/// free()'d by the caller. See UFObject::XML() for details.
- char *ufobject_xml(UFObject *object, const char *indent);
- void *ufobject_user_data(UFObject *object);
- void ufobject_set_user_data(UFObject *object, void *user_data);
- void ufobject_set_changed_event_handle(UFObject *object,
- UFEventHandle *handle);
+char *ufobject_xml(UFObject *object, const char *indent);
+void *ufobject_user_data(UFObject *object);
+void ufobject_set_user_data(UFObject *object, void *user_data);
+void ufobject_set_changed_event_handle(UFObject *object,
+ UFEventHandle *handle);
/// Return TRUE if object is set to its default value.
- UFBoolean ufobject_is_default(UFObject *object);
+UFBoolean ufobject_is_default(UFObject *object);
/// Set the current object value to its default value.
- void ufobject_set_default(UFObject *object);
+void ufobject_set_default(UFObject *object);
/// Return the numerical value of the object. Returns NaN if object is not a
/// UFNumber. See \ref C-interface and UFNumber::DoubleValue() for more
details.
- double ufnumber_value(UFObject *object);
+double ufnumber_value(UFObject *object);
/// Set the value of the object to the given number. Returns false if @a object
/// is not a UFNumber. See \ref C-interface and UFNumber::Set(double number)
/// for more details.
- UFBoolean ufnumber_set(UFObject *object, double number);
+UFBoolean ufnumber_set(UFObject *object, double number);
/// Return the numerical value of the @a index element of the object.
/// Returns NaN if @a object is not a UFNumberArray or @a index is out of
range.
/// See \ref C-interface and UFNumberArray::DoubleValue() for more details.
- double ufnumber_array_value(UFObject *object, int index);
+double ufnumber_array_value(UFObject *object, int index);
/// Set the value of all the array elements at once.
/// Returns false if @a object is not a UFNumberArray. See \ref C-interface
/// and UFNumberArray::Set(const double array[]) for more details.
- UFBoolean ufnumber_array_set(UFObject *object, const double array[]);
+UFBoolean ufnumber_array_set(UFObject *object, const double array[]);
/// Return true if string value is equal to @a string.
/// Return false if it is not equal or if object is not a UFString.
/// See \ref C-interface for more details.
- UFBoolean ufstring_is_equal(UFObject *object, const char *string);
+UFBoolean ufstring_is_equal(UFObject *object, const char *string);
/// Return true if the UFGroup @a object contains an object called name.
/// Return false if it does not, or if object is not a UFGroup.
/// See \ref C-interface for more details.
- UFBoolean ufgroup_has(UFObject *object, UFName name);
+UFBoolean ufgroup_has(UFObject *object, UFName name);
/// Return a UFObject element in a UFGroup. Return NULL if element is not found
/// or if @a object is not a UFGroup. See \ref C-interface for more details.
- UFObject *ufgroup_element(UFObject *object, UFName name);
+UFObject *ufgroup_element(UFObject *object, UFName name);
/// Add a UFObject to a UFGroup. Return false if UFGroup already contains
/// an object with the same name. See \ref C-interface for more details.
- UFBoolean ufgroup_add(UFObject *group, UFObject *object);
+UFBoolean ufgroup_add(UFObject *group, UFObject *object);
/// Drop an object from the group. The dropped object is returned.
/// If it is not needed any more it should be deleted to free its memory.
- UFObject *ufgroup_drop(UFObject *group, UFName name);
+UFObject *ufgroup_drop(UFObject *group, UFName name);
/// Set the current index position in the array.
- UFBoolean ufarray_set_index(UFObject *object, int index);
+UFBoolean ufarray_set_index(UFObject *object, int index);
/// Retriew the current index location in the array. -1 is returned
/// if the string index value corresponds to no element's label.
- int ufarray_index(UFObject *object);
+int ufarray_index(UFObject *object);
/// Return true if array's string value is equal to @a string.
/// Return false if it is not equal or if object is not a UFArray.
/// See \ref C-interface for more details.
- UFBoolean ufarray_is_equal(UFObject *object, const char *string);
+UFBoolean ufarray_is_equal(UFObject *object, const char *string);
#ifdef __cplusplus
} // extern "C"
Index: ufraw_lensfun.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_lensfun.cc,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- ufraw_lensfun.cc 1 Jan 2014 06:00:23 -0000 1.33
+++ ufraw_lensfun.cc 26 Jul 2014 03:30:10 -0000 1.34
@@ -873,7 +873,8 @@
return new Lensfun();
}
- const struct lfCamera *ufraw_lensfun_camera(const UFObject *lensfun) {
+ const struct lfCamera *ufraw_lensfun_camera(const UFObject *lensfun)
+ {
return &static_cast<const UFRaw::Lensfun *>(lensfun)->Camera;
}
@@ -882,7 +883,8 @@
static_cast<UFRaw::Lensfun *>(lensfun)->SetCamera(*camera);
}
- const struct lfLens *ufraw_lensfun_interpolation_lens(const UFObject
*lensfun) {
+ const struct lfLens *ufraw_lensfun_interpolation_lens(const UFObject
*lensfun)
+ {
return &static_cast<const UFRaw::Lensfun *>(lensfun)->Interpolation;
}
Index: uf_gtk.h
===================================================================
RCS file: /cvsroot/ufraw/ufraw/uf_gtk.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- uf_gtk.h 1 Jan 2014 06:00:23 -0000 1.19
+++ uf_gtk.h 26 Jul 2014 03:30:10 -0000 1.20
@@ -21,42 +21,42 @@
#endif
// Create a GtkCheckButton with a label and a value that gets updated
- GtkWidget *uf_check_button_new(const char *label, gboolean *valuep);
+GtkWidget *uf_check_button_new(const char *label, gboolean *valuep);
// Create a new ComboBox text with small width.
// The widget must be added with GTK_EXPAND|GTK_FILL.
- GtkWidget *uf_combo_box_new_text();
+GtkWidget *uf_combo_box_new_text();
// Append text with data to combo box
- void uf_combo_box_append_text(GtkComboBox *combo, const char *text, void
*data);
+void uf_combo_box_append_text(GtkComboBox *combo, const char *text, void
*data);
// activate combo box according to data or index, if there is no data
- void uf_combo_box_set_active(GtkComboBox *combo, int value);
+void uf_combo_box_set_active(GtkComboBox *combo, int value);
// remove combo box entry according to data or index, if there is no data
- void uf_combo_box_remove_text(GtkComboBox *combo, int value);
+void uf_combo_box_remove_text(GtkComboBox *combo, int value);
// Set combo box data and keep it up to date
- void uf_combo_box_set_data(GtkComboBox *combo, int *valuep);
+void uf_combo_box_set_data(GtkComboBox *combo, int *valuep);
// Get the display ICC profile of the monitor associated with the widget.
- void uf_get_display_profile(GtkWidget *widget,
- guint8 **buffer, gint *buffer_size);
+void uf_get_display_profile(GtkWidget *widget,
+ guint8 **buffer, gint *buffer_size);
- /*
- * The following functions create GtkWidgets for UFObjects.
- * These widgets are already created with callbacks, so that changes
- * in the widget value are applied to the UFObjects and vice-versa.
- */
- GtkWidget *ufnumber_hscale_new(UFObject *object);
- GtkWidget *ufnumber_spin_button_new(UFObject *object);
- GtkWidget *ufnumber_array_hscale_new(UFObject *object, int index);
- GtkWidget *ufnumber_array_spin_button_new(UFObject *object, int index);
- GtkWidget *ufobject_reset_button_new(const char *tip);
- void ufobject_reset_button_add(GtkWidget *button, UFObject *object);
- GtkWidget *ufstring_entry_new(UFObject *object);
- GtkWidget *ufarray_combo_box_new(UFObject *object);
- GtkWidget *ufarray_combo_box_entry_new(UFObject *object);
+/*
+ * The following functions create GtkWidgets for UFObjects.
+ * These widgets are already created with callbacks, so that changes
+ * in the widget value are applied to the UFObjects and vice-versa.
+ */
+GtkWidget *ufnumber_hscale_new(UFObject *object);
+GtkWidget *ufnumber_spin_button_new(UFObject *object);
+GtkWidget *ufnumber_array_hscale_new(UFObject *object, int index);
+GtkWidget *ufnumber_array_spin_button_new(UFObject *object, int index);
+GtkWidget *ufobject_reset_button_new(const char *tip);
+void ufobject_reset_button_add(GtkWidget *button, UFObject *object);
+GtkWidget *ufstring_entry_new(UFObject *object);
+GtkWidget *ufarray_combo_box_new(UFObject *object);
+GtkWidget *ufarray_combo_box_entry_new(UFObject *object);
#ifdef __cplusplus
}
Index: ufraw.h
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw.h,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- ufraw.h 12 Jan 2014 01:45:12 -0000 1.174
+++ ufraw.h 26 Jul 2014 03:30:10 -0000 1.175
@@ -49,59 +49,59 @@
extern "C" {
#endif // __cplusplus
- /* Options, like auto-adjust buttons can be in 3 states. Enabled and
disabled
- * are obvious. Apply means that the option was selected and some function
- * has to act accourdingly, before changing to one of the first two states
*/
- enum {
- disabled_state, enabled_state, apply_state
- };
+/* Options, like auto-adjust buttons can be in 3 states. Enabled and disabled
+ * are obvious. Apply means that the option was selected and some function
+ * has to act accourdingly, before changing to one of the first two states */
+enum {
+ disabled_state, enabled_state, apply_state
+};
- extern const char uf_spot_wb[];
- extern const char uf_manual_wb[];
- extern const char uf_camera_wb[];
- extern const char uf_auto_wb[];
+extern const char uf_spot_wb[];
+extern const char uf_manual_wb[];
+extern const char uf_camera_wb[];
+extern const char uf_auto_wb[];
- /*
- * UFObject Definitions for ufraw_settings.cc
- */
+/*
+ * UFObject Definitions for ufraw_settings.cc
+ */
- extern UFName ufWB;
- extern UFName ufPreset;
- extern UFName ufWBFineTuning;
- extern UFName ufTemperature;
- extern UFName ufGreen;
- extern UFName ufChannelMultipliers;
- extern UFName ufLensfunAuto;
- extern UFName ufLensfun;
- extern UFName ufCameraModel;
- extern UFName ufLensModel;
- extern UFName ufFocalLength;
- extern UFName ufAperture;
- extern UFName ufDistance;
- extern UFName ufTCA;
- extern UFName ufVignetting;
- extern UFName ufDistortion;
- extern UFName ufModel;
- extern UFName ufLensGeometry;
- extern UFName ufTargetLensGeometry;
- extern UFName ufRawImage;
- extern UFName ufRawResources;
- extern UFName ufCommandLine;
+extern UFName ufWB;
+extern UFName ufPreset;
+extern UFName ufWBFineTuning;
+extern UFName ufTemperature;
+extern UFName ufGreen;
+extern UFName ufChannelMultipliers;
+extern UFName ufLensfunAuto;
+extern UFName ufLensfun;
+extern UFName ufCameraModel;
+extern UFName ufLensModel;
+extern UFName ufFocalLength;
+extern UFName ufAperture;
+extern UFName ufDistance;
+extern UFName ufTCA;
+extern UFName ufVignetting;
+extern UFName ufDistortion;
+extern UFName ufModel;
+extern UFName ufLensGeometry;
+extern UFName ufTargetLensGeometry;
+extern UFName ufRawImage;
+extern UFName ufRawResources;
+extern UFName ufCommandLine;
- UFObject *ufraw_image_new();
+UFObject *ufraw_image_new();
#ifdef HAVE_LENSFUN
- UFObject *ufraw_lensfun_new();
- void ufraw_lensfun_init(UFObject *lensfun, UFBoolean reset);
- struct lfDatabase *ufraw_lensfun_db(); /* mount/camera/lens database */
- const struct lfCamera *ufraw_lensfun_camera(const UFObject *lensfun);
- void ufraw_lensfun_set_camera(UFObject *lensfun, const struct lfCamera
*camera);
- const struct lfLens *ufraw_lensfun_interpolation_lens(const UFObject
*lensfun);
- void ufraw_lensfun_set_lens(UFObject *lensfun, const struct lfLens *lens);
+UFObject *ufraw_lensfun_new();
+void ufraw_lensfun_init(UFObject *lensfun, UFBoolean reset);
+struct lfDatabase *ufraw_lensfun_db(); /* mount/camera/lens database */
+const struct lfCamera *ufraw_lensfun_camera(const UFObject *lensfun);
+void ufraw_lensfun_set_camera(UFObject *lensfun, const struct lfCamera
*camera);
+const struct lfLens *ufraw_lensfun_interpolation_lens(const UFObject *lensfun);
+void ufraw_lensfun_set_lens(UFObject *lensfun, const struct lfLens *lens);
#endif
- struct ufraw_struct *ufraw_image_get_data(UFObject *obj);
- void ufraw_image_set_data(UFObject *obj, struct ufraw_struct *uf);
- UFObject *ufraw_resources_new();
- UFObject *ufraw_command_line_new();
+struct ufraw_struct *ufraw_image_get_data(UFObject *obj);
+void ufraw_image_set_data(UFObject *obj, struct ufraw_struct *uf);
+UFObject *ufraw_resources_new();
+UFObject *ufraw_command_line_new();
#ifdef __cplusplus
} // extern "C"
@@ -384,148 +384,148 @@
extern "C" {
#endif
- /* prototypes for functions in ufraw_ufraw.c */
- ufraw_data *ufraw_open(char *filename);
- int ufraw_config(ufraw_data *uf, conf_data *rc, conf_data *conf, conf_data
*cmd);
- int ufraw_load_raw(ufraw_data *uf);
- int ufraw_load_darkframe(ufraw_data *uf);
- void ufraw_developer_prepare(ufraw_data *uf, DeveloperMode mode);
- int ufraw_convert_image(ufraw_data *uf);
- ufraw_image_data *ufraw_get_image(ufraw_data *uf, UFRawPhase phase,
- gboolean bufferok);
- ufraw_image_data *ufraw_convert_image_area(ufraw_data *uf, unsigned saidx,
- UFRawPhase phase);
- void ufraw_close_darkframe(conf_data *uf);
- void ufraw_close(ufraw_data *uf);
- void ufraw_flip_orientation(ufraw_data *uf, int flip);
- void ufraw_flip_image(ufraw_data *uf, int flip);
- void ufraw_invalidate_layer(ufraw_data *uf, UFRawPhase phase);
- void ufraw_invalidate_tca_layer(ufraw_data *uf);
- void ufraw_invalidate_hotpixel_layer(ufraw_data *uf);
- void ufraw_invalidate_denoise_layer(ufraw_data *uf);
- void ufraw_invalidate_darkframe_layer(ufraw_data *uf);
- void ufraw_invalidate_despeckle_layer(ufraw_data *uf);
- void ufraw_invalidate_whitebalance_layer(ufraw_data *uf);
- void ufraw_invalidate_smoothing_layer(ufraw_data *uf);
- int ufraw_set_wb(ufraw_data *uf);
- void ufraw_auto_expose(ufraw_data *uf);
- void ufraw_auto_black(ufraw_data *uf);
- void ufraw_auto_curve(ufraw_data *uf);
- void ufraw_normalize_rotation(ufraw_data *uf);
- void ufraw_unnormalize_rotation(ufraw_data *uf);
- void ufraw_get_image_dimensions(ufraw_data *uf);
- /* Get scaled crop coordinates in final image coordinates */
- void ufraw_get_scaled_crop(ufraw_data *uf, UFRectangle *crop);
+/* prototypes for functions in ufraw_ufraw.c */
+ufraw_data *ufraw_open(char *filename);
+int ufraw_config(ufraw_data *uf, conf_data *rc, conf_data *conf, conf_data
*cmd);
+int ufraw_load_raw(ufraw_data *uf);
+int ufraw_load_darkframe(ufraw_data *uf);
+void ufraw_developer_prepare(ufraw_data *uf, DeveloperMode mode);
+int ufraw_convert_image(ufraw_data *uf);
+ufraw_image_data *ufraw_get_image(ufraw_data *uf, UFRawPhase phase,
+ gboolean bufferok);
+ufraw_image_data *ufraw_convert_image_area(ufraw_data *uf, unsigned saidx,
+ UFRawPhase phase);
+void ufraw_close_darkframe(conf_data *uf);
+void ufraw_close(ufraw_data *uf);
+void ufraw_flip_orientation(ufraw_data *uf, int flip);
+void ufraw_flip_image(ufraw_data *uf, int flip);
+void ufraw_invalidate_layer(ufraw_data *uf, UFRawPhase phase);
+void ufraw_invalidate_tca_layer(ufraw_data *uf);
+void ufraw_invalidate_hotpixel_layer(ufraw_data *uf);
+void ufraw_invalidate_denoise_layer(ufraw_data *uf);
+void ufraw_invalidate_darkframe_layer(ufraw_data *uf);
+void ufraw_invalidate_despeckle_layer(ufraw_data *uf);
+void ufraw_invalidate_whitebalance_layer(ufraw_data *uf);
+void ufraw_invalidate_smoothing_layer(ufraw_data *uf);
+int ufraw_set_wb(ufraw_data *uf);
+void ufraw_auto_expose(ufraw_data *uf);
+void ufraw_auto_black(ufraw_data *uf);
+void ufraw_auto_curve(ufraw_data *uf);
+void ufraw_normalize_rotation(ufraw_data *uf);
+void ufraw_unnormalize_rotation(ufraw_data *uf);
+void ufraw_get_image_dimensions(ufraw_data *uf);
+/* Get scaled crop coordinates in final image coordinates */
+void ufraw_get_scaled_crop(ufraw_data *uf, UFRectangle *crop);
- UFRectangle ufraw_image_get_subarea_rectangle(ufraw_image_data *img,
- unsigned saidx);
- unsigned ufraw_img_get_subarea_idx(ufraw_image_data *img, int x, int y);
+UFRectangle ufraw_image_get_subarea_rectangle(ufraw_image_data *img,
+ unsigned saidx);
+unsigned ufraw_img_get_subarea_idx(ufraw_image_data *img, int x, int y);
- /* prototypes for functions in ufraw_message.c */
- char *ufraw_get_message(ufraw_data *uf);
- /* The following functions should only be used internally */
- void ufraw_message_init(ufraw_data *uf);
- void ufraw_message_reset(ufraw_data *uf);
- void ufraw_set_error(ufraw_data *uf, const char *format, ...);
- void ufraw_set_warning(ufraw_data *uf, const char *format, ...);
- void ufraw_set_info(ufraw_data *uf, const char *format, ...);
- int ufraw_get_status(ufraw_data *uf);
- int ufraw_is_error(ufraw_data *uf);
+/* prototypes for functions in ufraw_message.c */
+char *ufraw_get_message(ufraw_data *uf);
+/* The following functions should only be used internally */
+void ufraw_message_init(ufraw_data *uf);
+void ufraw_message_reset(ufraw_data *uf);
+void ufraw_set_error(ufraw_data *uf, const char *format, ...);
+void ufraw_set_warning(ufraw_data *uf, const char *format, ...);
+void ufraw_set_info(ufraw_data *uf, const char *format, ...);
+int ufraw_get_status(ufraw_data *uf);
+int ufraw_is_error(ufraw_data *uf);
// Old error handling, should be removed after being fully implemented.
- char *ufraw_message(int code, const char *format, ...);
- void ufraw_batch_messenger(char *message);
+char *ufraw_message(int code, const char *format, ...);
+void ufraw_batch_messenger(char *message);
- /* prototypes for functions in ufraw_preview.c */
- int ufraw_preview(ufraw_data *uf, conf_data *rc, int plugin,
- long(*save_func)());
- void ufraw_focus(void *window, gboolean focus);
- void ufraw_messenger(char *message, void *parentWindow);
+/* prototypes for functions in ufraw_preview.c */
+int ufraw_preview(ufraw_data *uf, conf_data *rc, int plugin,
+ long(*save_func)());
+void ufraw_focus(void *window, gboolean focus);
+void ufraw_messenger(char *message, void *parentWindow);
- /* prototypes for functions in ufraw_routines.c */
- const char *uf_get_home_dir();
- void uf_init_locale(const char *exename);
- char *uf_file_set_type(const char *filename, const char *type);
- char *uf_file_set_absolute(const char *filename);
- /* Set locale of LC_NUMERIC to "C" to make sure that printf behaves
correctly.*/
- char *uf_set_locale_C();
- void uf_reset_locale(char *locale);
- char *uf_markup_buf(char *buffer, const char *format, ...);
- double profile_default_linear(profile_data *p);
- double profile_default_gamma(profile_data *p);
- void Temperature_to_RGB(double T, double RGB[3]);
- void RGB_to_Temperature(double RGB[3], double *T, double *Green);
- int curve_load(CurveData *cp, char *filename);
- int curve_save(CurveData *cp, char *filename);
- char *curve_buffer(CurveData *cp);
- /* Useful functions for handling the underappreciated Glib ptr arrays */
- int ptr_array_insert_sorted(GPtrArray *array, const void *item,
GCompareFunc compare);
- int ptr_array_find_sorted(const GPtrArray *array, const void *item,
GCompareFunc compare);
- void ptr_array_insert_index(GPtrArray *array, const void *item, int index);
+/* prototypes for functions in ufraw_routines.c */
+const char *uf_get_home_dir();
+void uf_init_locale(const char *exename);
+char *uf_file_set_type(const char *filename, const char *type);
+char *uf_file_set_absolute(const char *filename);
+/* Set locale of LC_NUMERIC to "C" to make sure that printf behaves
correctly.*/
+char *uf_set_locale_C();
+void uf_reset_locale(char *locale);
+char *uf_markup_buf(char *buffer, const char *format, ...);
+double profile_default_linear(profile_data *p);
+double profile_default_gamma(profile_data *p);
+void Temperature_to_RGB(double T, double RGB[3]);
+void RGB_to_Temperature(double RGB[3], double *T, double *Green);
+int curve_load(CurveData *cp, char *filename);
+int curve_save(CurveData *cp, char *filename);
+char *curve_buffer(CurveData *cp);
+/* Useful functions for handling the underappreciated Glib ptr arrays */
+int ptr_array_insert_sorted(GPtrArray *array, const void *item, GCompareFunc
compare);
+int ptr_array_find_sorted(const GPtrArray *array, const void *item,
GCompareFunc compare);
+void ptr_array_insert_index(GPtrArray *array, const void *item, int index);
- /* prototypes for functions in ufraw_conf.c */
- int conf_load(conf_data *c, const char *confFilename);
- void conf_file_load(conf_data *conf, char *confFilename);
- int conf_save(conf_data *c, char *confFilename, char **confBuffer);
- /* copy default config to given instance and initialize non-const fields */
- void conf_init(conf_data *c);
- /* Copy the image manipulation options from *src to *dst */
- void conf_copy_image(conf_data *dst, const conf_data *src);
- /* Copy the transformation options from *src to *dst */
- void conf_copy_transform(conf_data *dst, const conf_data *src);
- /* Copy the 'save options' from *src to *dst */
- void conf_copy_save(conf_data *dst, const conf_data *src);
- int conf_set_cmd(conf_data *conf, const conf_data *cmd);
- int ufraw_process_args(int *argc, char ***argv, conf_data *cmd, conf_data
*rc);
+/* prototypes for functions in ufraw_conf.c */
+int conf_load(conf_data *c, const char *confFilename);
+void conf_file_load(conf_data *conf, char *confFilename);
+int conf_save(conf_data *c, char *confFilename, char **confBuffer);
+/* copy default config to given instance and initialize non-const fields */
+void conf_init(conf_data *c);
+/* Copy the image manipulation options from *src to *dst */
+void conf_copy_image(conf_data *dst, const conf_data *src);
+/* Copy the transformation options from *src to *dst */
+void conf_copy_transform(conf_data *dst, const conf_data *src);
+/* Copy the 'save options' from *src to *dst */
+void conf_copy_save(conf_data *dst, const conf_data *src);
+int conf_set_cmd(conf_data *conf, const conf_data *cmd);
+int ufraw_process_args(int *argc, char ***argv, conf_data *cmd, conf_data *rc);
- /* prototype for functions in ufraw_developer.c */
+/* prototype for functions in ufraw_developer.c */
// Convert linear RGB to CIE-LCh
- void uf_rgb_to_cielch(gint64 rgb[3], float lch[3]);
+void uf_rgb_to_cielch(gint64 rgb[3], float lch[3]);
// Convert CIE-LCh to linear RGB
- void uf_cielch_to_rgb(float lch[3], gint64 rgb[3]);
- void uf_raw_to_cielch(const developer_data *d,
- const guint16 raw[4], float lch[3]);
- developer_data *developer_init();
- void developer_destroy(developer_data *d);
- void developer_profile(developer_data *d, int type, profile_data *p);
- void developer_display_profile(developer_data *d,
- unsigned char *profile, int size, char
productName[]);
- void developer_prepare(developer_data *d, conf_data *conf,
- int rgbMax, float rgb_cam[3][4], int colors, int
useMatrix,
- DeveloperMode mode);
- void develop(void *po, guint16 pix[4], developer_data *d, int mode, int
count);
- void develop_display(void *pout, void *pin, developer_data *d, int count);
- void develop_linear(guint16 in[4], guint16 out[3], developer_data *d);
+void uf_cielch_to_rgb(float lch[3], gint64 rgb[3]);
+void uf_raw_to_cielch(const developer_data *d,
+ const guint16 raw[4], float lch[3]);
+developer_data *developer_init();
+void developer_destroy(developer_data *d);
+void developer_profile(developer_data *d, int type, profile_data *p);
+void developer_display_profile(developer_data *d,
+ unsigned char *profile, int size, char
productName[]);
+void developer_prepare(developer_data *d, conf_data *conf,
+ int rgbMax, float rgb_cam[3][4], int colors, int
useMatrix,
+ DeveloperMode mode);
+void develop(void *po, guint16 pix[4], developer_data *d, int mode, int count);
+void develop_display(void *pout, void *pin, developer_data *d, int count);
+void develop_linear(guint16 in[4], guint16 out[3], developer_data *d);
- /* prototype for functions in ufraw_saver.c */
- long ufraw_save_now(ufraw_data *uf, void *widget);
- long ufraw_send_to_gimp(ufraw_data *uf);
+/* prototype for functions in ufraw_saver.c */
+long ufraw_save_now(ufraw_data *uf, void *widget);
+long ufraw_send_to_gimp(ufraw_data *uf);
- /* prototype for functions in ufraw_writer.c */
- int ufraw_write_image(ufraw_data *uf);
- void ufraw_write_image_data(
- ufraw_data *uf, void * volatile out,
- const UFRectangle *Crop, int bitDepth, int grayscaleMode,
- int (*row_writer)(ufraw_data *, void * volatile, void *, int, int,
int, int, int));
+/* prototype for functions in ufraw_writer.c */
+int ufraw_write_image(ufraw_data *uf);
+void ufraw_write_image_data(
+ ufraw_data *uf, void * volatile out,
+ const UFRectangle *Crop, int bitDepth, int grayscaleMode,
+ int (*row_writer)(ufraw_data *, void * volatile, void *, int, int, int,
int, int));
- /* prototype for functions in ufraw_delete.c */
- long ufraw_delete(void *widget, ufraw_data *uf);
+/* prototype for functions in ufraw_delete.c */
+long ufraw_delete(void *widget, ufraw_data *uf);
- /* prototype for functions in ufraw_embedded.c */
- int ufraw_read_embedded(ufraw_data *uf);
- int ufraw_convert_embedded(ufraw_data *uf);
- int ufraw_write_embedded(ufraw_data *uf);
+/* prototype for functions in ufraw_embedded.c */
+int ufraw_read_embedded(ufraw_data *uf);
+int ufraw_convert_embedded(ufraw_data *uf);
+int ufraw_write_embedded(ufraw_data *uf);
- /* prototype for functions in ufraw_chooser.c */
- void ufraw_chooser(conf_data *conf, conf_data *rc, conf_data *cmd,
- const char *defPath);
+/* prototype for functions in ufraw_chooser.c */
+void ufraw_chooser(conf_data *conf, conf_data *rc, conf_data *cmd,
+ const char *defPath);
- /* prototype for functions in ufraw_icons.c */
- void ufraw_icons_init();
+/* prototype for functions in ufraw_icons.c */
+void ufraw_icons_init();
- /* prototype for functions in ufraw_exiv2.cc */
- int ufraw_exif_read_input(ufraw_data *uf);
- int ufraw_exif_prepare_output(ufraw_data *uf);
- int ufraw_exif_write(ufraw_data *uf);
+/* prototype for functions in ufraw_exiv2.cc */
+int ufraw_exif_read_input(ufraw_data *uf);
+int ufraw_exif_prepare_output(ufraw_data *uf);
+int ufraw_exif_write(ufraw_data *uf);
#ifdef __cplusplus
} // extern "C"
Index: ufraw_embedded.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_embedded.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- ufraw_embedded.c 1 Jan 2014 06:00:23 -0000 1.35
+++ ufraw_embedded.c 26 Jul 2014 03:30:10 -0000 1.36
@@ -102,7 +102,7 @@
scaleDenom = uf->conf->shrink;
}
if (raw->thumbType == ppm_thumb_type) {
- if (srcHeight*srcWidth * 3 != (unsigned)raw->thumbBufferLength) {
+ if (srcHeight * srcWidth * 3 != (unsigned)raw->thumbBufferLength) {
ufraw_message(UFRAW_ERROR, _("ppm thumb mismatch, "
"height %d, width %d, while
buffer %d."),
srcHeight, srcWidth, raw->thumbBufferLength);
------------------------------------------------------------------------------
Want fast and easy access to all the code in your enterprise? Index and
search up to 200,000 lines of code with a free copy of Black Duck
Code Sight - the same software that powers the world's largest code
search on Ohloh, the Black Duck Open Hub! Try it now.
http://p.sf.net/sfu/bds
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
