Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10853
Modified Files:
curveeditor_widget.c curveeditor_widget.h dcraw.h dcraw_api.cc
dcraw_api.h dcraw_indi.c iccjpeg.c iccjpeg.h nikon_curve.c
nikon_curve.h uf_glib.h uf_gtk.cc uf_gtk.h uf_progress.h
ufobject.cc ufobject.h ufraw-batch.c ufraw-gimp.c ufraw.c
ufraw.h ufraw_chooser.c ufraw_conf.c ufraw_delete.c
ufraw_developer.c ufraw_embedded.c ufraw_exiv2.cc
ufraw_icons.c ufraw_lens_ui.c ufraw_lensfun.cc ufraw_message.c
ufraw_preview.c ufraw_routines.c ufraw_saver.c
ufraw_settings.cc ufraw_ufraw.c ufraw_ui.h ufraw_writer.c
wb_presets.c
Log Message:
Update coding style to match astyle 2.04.
Index: ufraw_developer.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_developer.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- ufraw_developer.c 24 Jan 2015 10:00:16 -0000 1.96
+++ ufraw_developer.c 26 Mar 2015 04:00:27 -0000 1.97
@@ -1149,3 +1149,4 @@
out[c] = MIN(MAX(tmppix[c], 0), 0xFFFF);
develop_grayscale(out, d);
}
+
Index: ufraw-batch.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw-batch.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- ufraw-batch.c 24 Jan 2015 10:00:16 -0000 1.48
+++ ufraw-batch.c 26 Mar 2015 04:00:27 -0000 1.49
@@ -164,3 +164,4 @@
parentWindow = parentWindow;
if (!silentMessenger) ufraw_batch_messenger(message);
}
+
Index: curveeditor_widget.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/curveeditor_widget.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- curveeditor_widget.c 31 Jan 2015 09:00:07 -0000 1.28
+++ curveeditor_widget.c 26 Mar 2015 04:00:27 -0000 1.29
@@ -604,3 +604,4 @@
return FALSE;
}
}
+
Index: dcraw_api.h
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw_api.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- dcraw_api.h 20 Feb 2015 05:30:26 -0000 1.54
+++ dcraw_api.h 26 Mar 2015 04:00:27 -0000 1.55
@@ -90,3 +90,4 @@
#endif
#endif /*_DCRAW_API_H*/
+
Index: uf_glib.h
===================================================================
RCS file: /cvsroot/ufraw/ufraw/uf_glib.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- uf_glib.h 24 Jan 2015 10:00:16 -0000 1.14
+++ uf_glib.h 26 Mar 2015 04:00:27 -0000 1.15
@@ -45,3 +45,4 @@
#endif
#endif /*_UF_GLIB_H*/
+
Index: curveeditor_widget.h
===================================================================
RCS file: /cvsroot/ufraw/ufraw/curveeditor_widget.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- curveeditor_widget.h 31 Jan 2015 09:00:07 -0000 1.13
+++ curveeditor_widget.h 26 Mar 2015 04:00:27 -0000 1.14
@@ -19,3 +19,4 @@
gboolean curveeditor_widget_get_coordinates(GtkWidget *widget,
double *x, double *y);
+
Index: dcraw.h
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw.h,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- dcraw.h 23 Feb 2015 05:30:09 -0000 1.86
+++ dcraw.h 26 Mar 2015 04:00:27 -0000 1.87
@@ -297,3 +297,4 @@
void write_ppm_tiff();
int main(int argc, const char **argv);
};
+
Index: uf_gtk.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/uf_gtk.cc,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- uf_gtk.cc 11 Feb 2015 06:00:07 -0000 1.35
+++ uf_gtk.cc 26 Mar 2015 04:00:27 -0000 1.36
@@ -219,17 +219,20 @@
public:
GObject **gobject;
GtkButton *button;
- explicit _UFWidgetData(int size = 1) {
+ explicit _UFWidgetData(int size = 1)
+ {
if (size != 0)
gobject = g_new0(GObject *, size);
else
gobject = NULL;
button = NULL;
}
- ~_UFWidgetData() {
+ ~_UFWidgetData()
+ {
g_free(gobject);
}
- GtkAdjustment *adjustment(int index) {
+ GtkAdjustment *adjustment(int index)
+ {
return GTK_ADJUSTMENT(gobject[index]);
}
};
@@ -584,3 +587,4 @@
}
} // extern "C"
+
Index: ufraw_writer.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_writer.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- ufraw_writer.c 24 Jan 2015 10:00:17 -0000 1.96
+++ ufraw_writer.c 26 Mar 2015 04:00:28 -0000 1.97
@@ -892,3 +892,4 @@
png_free(ping, text);
}
#endif /*HAVE_LIBPNG*/
+
Index: ufobject.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufobject.cc,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- ufobject.cc 24 Jan 2015 10:00:16 -0000 1.21
+++ ufobject.cc 26 Mar 2015 04:00:27 -0000 1.22
@@ -37,14 +37,16 @@
UFEventHandle *EventHandle;
explicit _UFObject(UFName name) : Name(name), UserData(NULL), String(NULL),
Parent(NULL), EventHandle(NULL) { }
- virtual ~_UFObject() {
+ virtual ~_UFObject()
+ {
g_free(String);
if (Parent != NULL)
g_warning("%s: Destroyed while having a parent.", Name);
}
virtual bool Changing() const;
virtual void SetChanging(bool state);
- void CallValueChangedEvent(UFObject *that) {
+ void CallValueChangedEvent(UFObject *that)
+ {
bool saveChanging = Changing();
if (!Changing()) {
SetChanging(true);
@@ -349,17 +351,20 @@
double minimum, double maximum, double defaultValue,
int accuracyDigits, double step, double jump) :
_UFNumberCommon(name, minimum, maximum, accuracyDigits, step, jump),
- Size(size), Array(new double[size]), Default(new double[size]) {
+ Size(size), Array(new double[size]), Default(new double[size])
+ {
for (int i = 0; i < size; i++)
Array[i] = defaultValue;
for (int i = 0; i < size; i++)
Default[i] = defaultValue;
}
- ~_UFNumberArray() {
+ ~_UFNumberArray()
+ {
delete [] Array;
delete [] Default;
}
- bool SilentChange(UFNumberArray *that, int index, double number) {
+ bool SilentChange(UFNumberArray *that, int index, double number)
+ {
if (index < 0 || index >= Size)
that->Throw("index (%d) out of range 0..%d", index, Size - 1);
if (number > Maximum) {
@@ -535,7 +540,8 @@
public:
char *Default;
_UFString(UFName name) : _UFObject(name) { }
- ~_UFString() {
+ ~_UFString()
+ {
g_free(Default);
}
};
@@ -607,7 +613,8 @@
class _UFNameCompare
{
public:
- bool operator()(char const *a, char const *b) const {
+ bool operator()(char const *a, char const *b) const
+ {
return strcmp(a, b) < 0;
}
};
@@ -625,15 +632,18 @@
char *DefaultIndex;
_UFGroup(UFGroup *that, UFName name, const char *label) :
_UFObject(name), This(that), GroupChanging(false),
- Index(-1), DefaultIndex(NULL) {
+ Index(-1), DefaultIndex(NULL)
+ {
String = g_strdup(label);
}
- bool Changing() const {
+ bool Changing() const
+ {
if (Parent != NULL)
return Parent->Changing();
return GroupChanging;
}
- void SetChanging(bool state) {
+ void SetChanging(bool state)
+ {
if (Parent != NULL)
Parent->SetChanging(state);
else
@@ -1217,3 +1227,4 @@
}
} // extern "C"
+
Index: ufraw_delete.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_delete.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ufraw_delete.c 24 Jan 2015 10:00:16 -0000 1.18
+++ ufraw_delete.c 26 Mar 2015 04:00:27 -0000 1.19
@@ -117,3 +117,4 @@
gtk_widget_destroy(GTK_WIDGET(dialog));
return status;
}
+
Index: dcraw_indi.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw_indi.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- dcraw_indi.c 24 Feb 2015 03:00:31 -0000 1.122
+++ dcraw_indi.c 26 Mar 2015 04:00:27 -0000 1.123
@@ -1171,3 +1171,4 @@
*width_p = width;
}
+
Index: ufraw_routines.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_routines.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- ufraw_routines.c 20 Mar 2015 17:00:14 -0000 1.127
+++ ufraw_routines.c 26 Mar 2015 04:00:28 -0000 1.128
@@ -606,3 +606,4 @@
root [index] = item;
}
+
Index: nikon_curve.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/nikon_curve.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- nikon_curve.c 24 Jan 2015 10:00:15 -0000 1.46
+++ nikon_curve.c 26 Mar 2015 04:00:27 -0000 1.47
@@ -2320,3 +2320,4 @@
return NC_SUCCESS;
}
#endif
+
Index: ufraw_saver.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_saver.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- ufraw_saver.c 24 Jan 2015 10:00:16 -0000 1.69
+++ ufraw_saver.c 26 Mar 2015 04:00:28 -0000 1.70
@@ -152,3 +152,4 @@
g_usleep(200 * 1000);
return UFRAW_SUCCESS;
}
+
Index: nikon_curve.h
===================================================================
RCS file: /cvsroot/ufraw/ufraw/nikon_curve.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- nikon_curve.h 31 Jan 2015 09:00:07 -0000 1.24
+++ nikon_curve.h 26 Mar 2015 04:00:27 -0000 1.25
@@ -197,3 +197,4 @@
CurveSample **sample_p);
#endif
+
Index: iccjpeg.h
===================================================================
RCS file: /cvsroot/ufraw/ufraw/iccjpeg.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- iccjpeg.h 1 Jan 2013 04:30:06 -0000 1.5
+++ iccjpeg.h 26 Mar 2015 04:00:27 -0000 1.6
@@ -73,3 +73,4 @@
extern boolean read_icc_profile JPP((j_decompress_ptr cinfo,
JOCTET **icc_data_ptr,
unsigned int *icc_data_len));
+
Index: ufraw_message.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_message.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ufraw_message.c 24 Jan 2015 10:00:16 -0000 1.18
+++ ufraw_message.c 26 Mar 2015 04:00:28 -0000 1.19
@@ -192,3 +192,4 @@
return NULL;
}
}
+
Index: ufraw_chooser.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_chooser.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- ufraw_chooser.c 24 Jan 2015 10:00:16 -0000 1.41
+++ ufraw_chooser.c 26 Mar 2015 04:00:27 -0000 1.42
@@ -172,3 +172,4 @@
gtk_widget_destroy(GTK_WIDGET(fileChooser));
ufraw_message(UFRAW_SET_PARENT, NULL);
}
+
Index: ufraw_settings.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_settings.cc,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- ufraw_settings.cc 10 Feb 2015 06:00:17 -0000 1.29
+++ ufraw_settings.cc 26 Mar 2015 04:00:28 -0000 1.30
@@ -69,7 +69,8 @@
public:
explicit Image(UFObject *root = NULL);
void SetUFRawData(ufraw_data *data);
- static ufraw_data *UFRawData(UFObject *object) {
+ static ufraw_data *UFRawData(UFObject *object)
+ {
if (object->Name() == ufRawImage)
return dynamic_cast<Image *>(object)->uf;
if (!object->HasParent())
@@ -77,7 +78,8 @@
return Image::UFRawData(&object->Parent());
}
void SetWB(const char *mode = NULL);
- void Message(const char *Format, ...) const {
+ void Message(const char *Format, ...) const
+ {
if (Format == NULL)
return;
va_list ap;
@@ -106,12 +108,14 @@
{
public:
WB() : UFArray(ufWB, uf_camera_wb) { }
- void Event(UFEventType type) {
+ void Event(UFEventType type)
+ {
// spot_wb is a temporary value, that would be changed in SetWB()
if (!this->IsEqual(uf_spot_wb))
UFObject::Event(type);
}
- void OriginalValueChangedEvent() {
+ void OriginalValueChangedEvent()
+ {
/* Keep compatibility with old numbers from ufraw-0.6 */
int i;
if (strlen(StringValue()) <= 2 &&
@@ -156,7 +160,8 @@
}
// Use the original XML format instead of UFArray's format.
// Output XML block even if IsDefault().
- std::string XML(const char *indent) const {
+ std::string XML(const char *indent) const
+ {
char *value = g_markup_escape_text(StringValue(), -1);
std::string str = (std::string)indent +
"<" + Name() + ">" + value + "</" + Name() + ">\n";
@@ -172,7 +177,8 @@
{
public:
WBFineTuning() : UFNumber(ufWBFineTuning, -9, 9, 0, 0, 1, 1) { }
- void OriginalValueChangedEvent() {
+ void OriginalValueChangedEvent()
+ {
if (!HasParent())
return;
UFArray &wb = ParentImage(this)[ufWB];
@@ -183,7 +189,8 @@
ParentImage(this).SetWB();
}
// Output XML block even if IsDefault().
- std::string XML(const char *indent) const {
+ std::string XML(const char *indent) const
+ {
char *value = g_markup_escape_text(StringValue(), -1);
std::string str = (std::string)indent +
"<" + Name() + ">" + value + "</" + Name() + ">\n";
@@ -199,7 +206,8 @@
{
public:
Temperature() : UFNumber(ufTemperature, 2000, 23000, 6500, 0, 50, 200) { }
- void OriginalValueChangedEvent() {
+ void OriginalValueChangedEvent()
+ {
if (HasParent())
ParentImage(this).SetWB(uf_manual_wb);
}
@@ -212,7 +220,8 @@
{
public:
Green() : UFNumber(ufGreen, 0.2, 2.5, 1.0, 3, 0.01, 0.05) { };
- void OriginalValueChangedEvent() {
+ void OriginalValueChangedEvent()
+ {
if (HasParent())
ParentImage(this).SetWB(uf_manual_wb);
}
@@ -227,7 +236,8 @@
ChannelMultipliers() : UFNumberArray(ufChannelMultipliers, 4,
0.010, 99.000, 1.0, 3, 0.001,
0.001) { };
- void Event(UFEventType type) {
+ void Event(UFEventType type)
+ {
if (type != uf_value_changed)
return UFObject::Event(type);
if (!HasParent())
@@ -253,12 +263,14 @@
UFObject::Event(type);
}
- void OriginalValueChangedEvent() {
+ void OriginalValueChangedEvent()
+ {
if (HasParent())
ParentImage(this).SetWB(uf_spot_wb);
}
// Output XML block even if IsDefault().
- std::string XML(const char *indent) const {
+ std::string XML(const char *indent) const
+ {
std::string str = "";
char num[10];
for (int i = 0; i < Size(); i++) {
@@ -282,7 +294,8 @@
{
public:
LensfunAuto() : UFString(ufLensfunAuto, "yes") { }
- void OriginalValueChangedEvent() {
+ void OriginalValueChangedEvent()
+ {
if (!HasParent())
return;
if (IsEqual("auto")) {
@@ -414,7 +427,8 @@
class Resources : public UFGroup
{
public:
- Resources(): UFGroup(ufRawResources) {
+ Resources(): UFGroup(ufRawResources)
+ {
*this << new Image(this);
}
};
@@ -423,7 +437,8 @@
{
public:
CommandLineImage(): ImageCommon() { }
- void Event(UFEventType type) {
+ void Event(UFEventType type)
+ {
if (type != uf_element_added)
return UFObject::Event(type);
if (Has(ufTemperature) || Has(ufGreen)) {
@@ -463,10 +478,12 @@
class CommandLine : public UFGroup
{
public:
- CommandLine(): UFGroup(ufCommandLine) {
+ CommandLine(): UFGroup(ufCommandLine)
+ {
*this << new CommandLineImage;
}
- void Message(const char *Format, ...) const {
+ void Message(const char *Format, ...) const
+ {
if (Format == NULL)
return;
va_list ap;
@@ -508,3 +525,4 @@
}
} // extern "C"
+
Index: iccjpeg.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/iccjpeg.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- iccjpeg.c 1 Jan 2013 04:30:06 -0000 1.10
+++ iccjpeg.c 26 Mar 2015 04:00:27 -0000 1.11
@@ -255,3 +255,4 @@
}
#endif /* HAVE_LIBJPEG */
+
Index: ufraw_preview.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_preview.c,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -d -r1.386 -r1.387
--- ufraw_preview.c 9 Feb 2015 16:30:14 -0000 1.386
+++ ufraw_preview.c 26 Mar 2015 04:00:28 -0000 1.387
@@ -4663,7 +4663,7 @@
for (i = 0; i < data->UF->colors; ++i) {
button = gtk_toggle_button_new();
gtk_container_add(GTK_CONTAINER(button), gtk_image_new_from_stock(
- i == 0 ? data->UF->colors == 1 ? "channel-grey" :
"channel-red" :
+ i == 0 ? data->UF->colors == 1 ? "channel-grey"
: "channel-red" :
i == 1 || i == 3 ? "channel-green" :
"channel-blue",
GTK_ICON_SIZE_BUTTON));
data->ChannelSelectButton[i] = GTK_TOGGLE_BUTTON(button);
@@ -5977,3 +5977,4 @@
if (status != GTK_RESPONSE_OK) return UFRAW_CANCEL;
return UFRAW_SUCCESS;
}
+
Index: ufraw_conf.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_conf.c,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -d -r1.200 -r1.201
--- ufraw_conf.c 28 Feb 2015 10:00:32 -0000 1.200
+++ ufraw_conf.c 26 Mar 2015 04:00:27 -0000 1.201
@@ -2457,3 +2457,4 @@
ufobject_delete(tmpImage);
return optind;
}
+
Index: ufraw-gimp.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw-gimp.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- ufraw-gimp.c 24 Jan 2015 10:00:16 -0000 1.84
+++ ufraw-gimp.c 26 Mar 2015 04:00:27 -0000 1.85
@@ -492,3 +492,4 @@
return UFRAW_SUCCESS;
}
+
Index: ufraw_ufraw.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_ufraw.c,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -d -r1.288 -r1.289
--- ufraw_ufraw.c 21 Feb 2015 04:00:29 -0000 1.288
+++ ufraw_ufraw.c 26 Mar 2015 04:00:28 -0000 1.289
@@ -1043,7 +1043,7 @@
#ifdef _OPENMP
#pragma omp parallel for schedule(static) default(none) \
shared(uf,img,width,height,colors,rgbMax,delta) \
-reduction(+:count) \
+ reduction(+:count) \
private(h,p,w,c,t,v,hi,i)
#endif
for (h = 1; h < height - 1; ++h) {
@@ -2375,3 +2375,4 @@
curve->m_numAnchors = j + 1;
}
}
+
Index: ufobject.h
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufobject.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ufobject.h 24 Jan 2015 10:00:16 -0000 1.17
+++ ufobject.h 26 Mar 2015 04:00:27 -0000 1.18
@@ -495,3 +495,4 @@
#endif
#endif /*_UFOBJECT_H*/
+
Index: ufraw_lensfun.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_lensfun.cc,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- ufraw_lensfun.cc 24 Jan 2015 10:00:16 -0000 1.35
+++ ufraw_lensfun.cc 26 Mar 2015 04:00:28 -0000 1.36
@@ -47,23 +47,27 @@
double DistanceValue;
Lensfun();
#ifdef UFRAW_VALGRIND // Can be useful for valgrind --leak-check=full
- ~Lensfun() {
+ ~Lensfun()
+ {
if (_LensDB != NULL)
lf_db_destroy(_LensDB);
_LensDB = NULL;
}
#endif
- static Lensfun &Parent(UFObject &object) {
+ static Lensfun &Parent(UFObject &object)
+ {
if (strcmp(object.Parent().Name(), ufLensfun) == 0)
return static_cast<Lensfun &>(object.Parent());
return Lensfun::Parent(object.Parent());
}
- static const Lensfun &Parent(const UFObject &object) {
+ static const Lensfun &Parent(const UFObject &object)
+ {
if (strcmp(object.Parent().Name(), ufLensfun) == 0)
return static_cast<Lensfun &>(object.Parent());
return Lensfun::Parent(object.Parent());
}
- static lfDatabase *LensDB() {
+ static lfDatabase *LensDB()
+ {
/* Load lens database only once */
if (_LensDB == NULL) {
_LensDB = lfDatabase::Create();
@@ -71,7 +75,8 @@
}
return _LensDB;
}
- void SetCamera(const lfCamera &camera) {
+ void SetCamera(const lfCamera &camera)
+ {
Camera = camera;
const char *maker = lf_mlstr_get(camera.Maker);
const char *model = lf_mlstr_get(camera.Model);
@@ -94,7 +99,8 @@
// Interpolate the TCA, Vignetting and Distortion models.
void Interpolate();
// Mark settings as manual (not from LensDB).
- void Manual() {
+ void Manual()
+ {
char *lens_model = g_strdup_printf("Generic, Crop factor %.4g",
Transformation.CropFactor);
(*this)[ufLensModel].Set(lens_model);
@@ -138,7 +144,8 @@
{
public:
LensModel() : UFString(ufLensModel) { }
- void Event(UFEventType type) {
+ void Event(UFEventType type)
+ {
if (type != uf_value_changed)
return UFObject::Event(type);
if (!HasParent())
@@ -148,7 +155,8 @@
Lensfun.Interpolate();
return UFObject::Event(type);
}
- void OriginalValueChangedEvent() {
+ void OriginalValueChangedEvent()
+ {
if (!HasParent())
return;
Lensfun &Lensfun = Lensfun::Parent(*this);
@@ -187,7 +195,8 @@
{
public:
FocalLength() : UFArray(ufFocalLength) { }
- void Event(UFEventType type) {
+ void Event(UFEventType type)
+ {
if (type == uf_default_changed && Index() == -1) {
// Default value is changed during Init. Reset to this default
// value if no other value was set.
@@ -208,7 +217,8 @@
ufraw_invalidate_layer(uf, ufraw_transform_phase);
return UFObject::Event(type);
}
- void CreatePresets() {
+ void CreatePresets()
+ {
if (!HasParent())
return;
Clear();
@@ -243,7 +253,8 @@
{
public:
Aperture() : UFArray(ufAperture) { }
- void Event(UFEventType type) {
+ void Event(UFEventType type)
+ {
if (type == uf_default_changed && Index() == -1) {
// Default value is changed during Init. Reset to this default
// value if no other value was set.
@@ -263,7 +274,8 @@
Lensfun::Parent(*this).Interpolate();
return UFObject::Event(type);
}
- void CreatePresets() {
+ void CreatePresets()
+ {
if (!HasParent())
return;
Clear();
@@ -297,7 +309,8 @@
{
public:
Distance() : UFArray(ufDistance) { }
- void Event(UFEventType type) {
+ void Event(UFEventType type)
+ {
if (type == uf_default_changed && Index() == -1) {
// Default value is changed during Init. Reset to this default
// value if no other value was set.
@@ -317,7 +330,8 @@
Lensfun::Parent(*this).Interpolate();
return UFObject::Event(type);
}
- void CreatePresets() {
+ void CreatePresets()
+ {
Clear();
char buffer[_buffer_size];
double value = 0.25;
@@ -338,13 +352,15 @@
public:
Param(UFName name, double min, double max, double defaultValue) :
UFNumber(name, min, max, defaultValue) { }
- std::string XML(const char *indent) const {
+ std::string XML(const char *indent) const
+ {
char num[10];
g_snprintf(num, 10, "%.*lf", AccuracyDigits() + 2, DoubleValue());
return (std::string)indent +
"<" + Name() + ">" + num + "</" + Name() + ">\n";
}
- void OriginalValueChangedEvent() {
+ void OriginalValueChangedEvent()
+ {
if (!HasParent())
return;
// While loading rc/cmd/conf data, do not reset other settings
@@ -362,7 +378,8 @@
{
public:
TCA() : UFArray(ufTCA,
- lfLens::GetTCAModelDesc(LF_TCA_MODEL_NONE, NULL,
NULL)) {
+ lfLens::GetTCAModelDesc(LF_TCA_MODEL_NONE, NULL, NULL))
+ {
for (lfTCAModel model = LF_TCA_MODEL_NONE; ;
model = lfTCAModel(model + 1)) {
const lfParameter **params;
@@ -378,7 +395,8 @@
params[i]->Max, params[i]->Default);
}
}
- void Event(UFEventType type) {
+ void Event(UFEventType type)
+ {
if (type != uf_value_changed)
return UFObject::Event(type);
ufraw_data *uf = ufraw_image_get_data(this);
@@ -404,7 +422,8 @@
ufraw_invalidate_tca_layer(uf);
return UFObject::Event(type);
}
- void Interpolate() {
+ void Interpolate()
+ {
if (!HasParent())
return;
Lensfun &Lensfun = Lensfun::Parent(*this);
@@ -434,7 +453,8 @@
public:
Vignetting() : UFArray(ufVignetting,
lfLens::GetVignettingModelDesc(LF_VIGNETTING_MODEL_NONE,
- NULL, NULL)) {
+ NULL, NULL))
+ {
for (lfVignettingModel model = LF_VIGNETTING_MODEL_NONE; ;
model = lfVignettingModel(model + 1)) {
const lfParameter **params;
@@ -450,7 +470,8 @@
params[i]->Max, params[i]->Default);
}
}
- void Event(UFEventType type) {
+ void Event(UFEventType type)
+ {
if (type != uf_value_changed)
return UFObject::Event(type);
ufraw_data *uf = ufraw_image_get_data(this);
@@ -478,7 +499,8 @@
ufraw_invalidate_layer(uf, ufraw_first_phase);
return UFObject::Event(type);
}
- void Interpolate() {
+ void Interpolate()
+ {
ufraw_data *uf = ufraw_image_get_data(this);
if (uf == NULL)
return;
@@ -524,7 +546,8 @@
// </Model>
// </Distortion>
Distortion() : UFArray(ufDistortion,
-
lfLens::GetDistortionModelDesc(LF_DIST_MODEL_NONE, NULL, NULL)) {
+
lfLens::GetDistortionModelDesc(LF_DIST_MODEL_NONE, NULL, NULL))
+ {
for (lfDistortionModel model = LF_DIST_MODEL_NONE; ;
model = lfDistortionModel(model + 1)) {
const lfParameter **params;
@@ -540,7 +563,8 @@
params[i]->Max, params[i]->Default);
}
}
- void Event(UFEventType type) {
+ void Event(UFEventType type)
+ {
if (type != uf_value_changed)
return UFObject::Event(type);
ufraw_data *uf = ufraw_image_get_data(this);
@@ -566,7 +590,8 @@
ufraw_invalidate_layer(uf, ufraw_transform_phase);
return UFObject::Event(type);
}
- void Interpolate() {
+ void Interpolate()
+ {
if (!HasParent())
return;
Lensfun &Lensfun = Lensfun::Parent(*this);
@@ -595,7 +620,8 @@
{
public:
explicit LensGeometry(UFName name = ufLensGeometry) : UFArray(name,
- lfLens::GetLensTypeDesc(LF_UNKNOWN, NULL)) {
+ lfLens::GetLensTypeDesc(LF_UNKNOWN, NULL))
+ {
for (lfLensType type = LF_UNKNOWN; ; type = lfLensType(type + 1)) {
const char *typeName = lfLens::GetLensTypeDesc(type, NULL);
if (typeName == NULL)
@@ -603,7 +629,8 @@
*this << new UFString("Type", typeName);
}
}
- void Event(UFEventType type) {
+ void Event(UFEventType type)
+ {
if (type != uf_value_changed)
return UFObject::Event(type);
ufraw_data *uf = ufraw_image_get_data(this);
@@ -613,7 +640,8 @@
ufraw_invalidate_layer(uf, ufraw_transform_phase);
return UFObject::Event(type);
}
- void OriginalValueChangedEvent() {
+ void OriginalValueChangedEvent()
+ {
if (!HasParent())
return;
// While loading rc/cmd/conf data, do not reset other settings
@@ -631,7 +659,8 @@
{
public:
explicit TargetLensGeometry(UFName name = ufTargetLensGeometry) :
- UFArray(name, lfLens::GetLensTypeDesc(LF_UNKNOWN, NULL)) {
+ UFArray(name, lfLens::GetLensTypeDesc(LF_UNKNOWN, NULL))
+ {
for (lfLensType type = LF_UNKNOWN; ; type = lfLensType(type + 1)) {
const char *typeName = lfLens::GetLensTypeDesc(type, NULL);
if (typeName == NULL)
@@ -639,7 +668,8 @@
*this << new UFString("Type", typeName);
}
}
- void OriginalValueChangedEvent() {
+ void OriginalValueChangedEvent()
+ {
ufraw_data *uf = ufraw_image_get_data(this);
if (uf == NULL)
return;
@@ -903,3 +933,4 @@
} // namespace UFRaw
#endif // HAVE_LENSFUN
+
Index: ufraw_ui.h
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_ui.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- ufraw_ui.h 24 Jan 2015 10:00:17 -0000 1.51
+++ ufraw_ui.h 26 Mar 2015 04:00:28 -0000 1.52
@@ -196,3 +196,4 @@
GtkTable *table, int x, int y, const char
*label, const char *tip);
#endif /* _UFRAW_UI_H */
+
Index: dcraw_api.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw_api.cc,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- dcraw_api.cc 20 Feb 2015 05:30:26 -0000 1.101
+++ dcraw_api.cc 26 Mar 2015 04:00:27 -0000 1.102
@@ -842,3 +842,4 @@
}
} /*extern "C"*/
+
Index: wb_presets.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -d -r1.308 -r1.309
--- wb_presets.c 26 Mar 2015 03:30:32 -0000 1.308
+++ wb_presets.c 26 Mar 2015 04:00:28 -0000 1.309
@@ -8102,3 +8102,4 @@
};
const int wb_preset_count = sizeof(wb_preset) / sizeof(wb_data);
+
Index: uf_gtk.h
===================================================================
RCS file: /cvsroot/ufraw/ufraw/uf_gtk.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- uf_gtk.h 24 Jan 2015 10:00:16 -0000 1.21
+++ uf_gtk.h 26 Mar 2015 04:00:27 -0000 1.22
@@ -63,3 +63,4 @@
#endif
#endif /*_UF_GTK_H*/
+
Index: ufraw_exiv2.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_exiv2.cc,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- ufraw_exiv2.cc 24 Jan 2015 10:00:16 -0000 1.68
+++ ufraw_exiv2.cc 26 Mar 2015 04:00:28 -0000 1.69
@@ -392,3 +392,4 @@
return UFRAW_ERROR;
}
#endif /* HAVE_EXIV2 */
+
Index: ufraw_lens_ui.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_lens_ui.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- ufraw_lens_ui.c 24 Jan 2015 10:00:16 -0000 1.49
+++ ufraw_lens_ui.c 26 Mar 2015 04:00:28 -0000 1.50
@@ -732,3 +732,4 @@
}
#endif /* HAVE_LENSFUN */
+
Index: ufraw.h
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw.h,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -d -r1.177 -r1.178
--- ufraw.h 9 Feb 2015 16:30:13 -0000 1.177
+++ ufraw.h 26 Mar 2015 04:00:27 -0000 1.178
@@ -558,3 +558,4 @@
#define UFRAW_SET_PARENT 211 /* Set parent window for message dialog */
#endif /*_UFRAW_H*/
+
Index: ufraw_icons.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_icons.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- ufraw_icons.c 24 Jan 2015 10:00:16 -0000 1.29
+++ ufraw_icons.c 26 Mar 2015 04:00:28 -0000 1.30
@@ -68,3 +68,4 @@
load_icon(factory, geometry_24, "geometry");
load_icon(factory, hueadjust_24, "hueadjust");
}
+
Index: ufraw_embedded.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_embedded.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- ufraw_embedded.c 24 Jan 2015 10:00:16 -0000 1.37
+++ ufraw_embedded.c 26 Mar 2015 04:00:28 -0000 1.38
@@ -378,3 +378,4 @@
return status;
}
+
Index: ufraw.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- ufraw.c 24 Jan 2015 10:00:16 -0000 1.72
+++ ufraw.c 26 Mar 2015 04:00:27 -0000 1.73
@@ -153,3 +153,4 @@
#endif
exit(exitCode);
}
+
Index: uf_progress.h
===================================================================
RCS file: /cvsroot/ufraw/ufraw/uf_progress.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- uf_progress.h 24 Jan 2015 10:00:16 -0000 1.10
+++ uf_progress.h 26 Mar 2015 04:00:27 -0000 1.11
@@ -39,3 +39,4 @@
}
#endif /* _UF_PROGRESS_H */
+
------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
