Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7405
Modified Files:
dcraw.h uf_gtk.cc ufobject.cc ufraw_lensfun.cc ufraw_preview.c
ufraw_settings.cc ufraw_ufraw.c
Log Message:
Fix typo in Spanish translation.
Index: dcraw.h
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw.h,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- dcraw.h 12 May 2016 03:30:03 -0000 1.92
+++ dcraw.h 30 Jul 2016 03:00:16 -0000 1.93
@@ -152,7 +152,7 @@
void lossless_jpeg_load_raw();
void canon_sraw_load_raw();
void adobe_copy_pixel(unsigned row, unsigned col, ushort **rp);
- void ljpeg_idct (struct jhead *jh);
+ void ljpeg_idct(struct jhead *jh);
void lossless_dng_load_raw();
void packed_dng_load_raw();
void pentax_load_raw();
Index: uf_gtk.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/uf_gtk.cc,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- uf_gtk.cc 2 Jan 2016 16:00:20 -0000 1.38
+++ uf_gtk.cc 30 Jul 2016 03:00:16 -0000 1.39
@@ -219,20 +219,17 @@
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]);
}
};
Index: ufobject.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufobject.cc,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ufobject.cc 2 Jan 2016 16:00:20 -0000 1.24
+++ ufobject.cc 30 Jul 2016 03:00:16 -0000 1.25
@@ -37,16 +37,14 @@
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);
@@ -351,20 +349,17 @@
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) {
@@ -540,8 +535,7 @@
public:
char *Default;
_UFString(UFName name) : _UFObject(name) { }
- ~_UFString()
- {
+ ~_UFString() {
g_free(Default);
}
};
@@ -613,8 +607,7 @@
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;
}
};
@@ -632,18 +625,15 @@
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
Index: ufraw_settings.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_settings.cc,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- ufraw_settings.cc 2 Jan 2016 16:00:21 -0000 1.33
+++ ufraw_settings.cc 30 Jul 2016 03:00:16 -0000 1.34
@@ -69,8 +69,7 @@
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())
@@ -78,8 +77,7 @@
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;
@@ -108,14 +106,12 @@
{
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 &&
@@ -160,8 +156,7 @@
}
// 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";
@@ -177,8 +172,7 @@
{
public:
WBFineTuning() : UFNumber(ufWBFineTuning, -9, 9, 0, 0, 1, 1) { }
- void OriginalValueChangedEvent()
- {
+ void OriginalValueChangedEvent() {
if (!HasParent())
return;
UFArray &wb = ParentImage(this)[ufWB];
@@ -189,8 +183,7 @@
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";
@@ -206,8 +199,7 @@
{
public:
Temperature() : UFNumber(ufTemperature, 2000, 23000, 6500, 0, 50, 200) { }
- void OriginalValueChangedEvent()
- {
+ void OriginalValueChangedEvent() {
if (HasParent())
ParentImage(this).SetWB(uf_manual_wb);
}
@@ -220,8 +212,7 @@
{
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);
}
@@ -236,8 +227,7 @@
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())
@@ -263,14 +253,12 @@
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++) {
@@ -294,8 +282,7 @@
{
public:
LensfunAuto() : UFString(ufLensfunAuto, "yes") { }
- void OriginalValueChangedEvent()
- {
+ void OriginalValueChangedEvent() {
if (!HasParent())
return;
if (IsEqual("auto")) {
@@ -368,7 +355,7 @@
dcraw_data *raw = static_cast<dcraw_data *>(uf->raw);
if (strcasecmp(uf->conf->make, raw->make) != 0 ||
- strcasecmp(uf->conf->model, raw->model) != 0)
+ strcasecmp(uf->conf->model, raw->model) != 0)
uf->WBDirty = TRUE; // Re-calculate channel multipliers.
if (uf->LoadingID)
uf->WBDirty = TRUE; // Re-calculate channel multipliers.
@@ -427,8 +414,7 @@
class Resources : public UFGroup
{
public:
- Resources(): UFGroup(ufRawResources)
- {
+ Resources(): UFGroup(ufRawResources) {
*this << new Image(this);
}
};
@@ -437,8 +423,7 @@
{
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)) {
@@ -478,12 +463,10 @@
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;
Index: ufraw_preview.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_preview.c,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -d -r1.389 -r1.390
--- ufraw_preview.c 2 Jan 2016 16:00:21 -0000 1.389
+++ ufraw_preview.c 30 Jul 2016 03:00:16 -0000 1.390
@@ -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);
Index: ufraw_ufraw.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_ufraw.c,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -d -r1.293 -r1.294
--- ufraw_ufraw.c 2 Jan 2016 16:00:21 -0000 1.293
+++ ufraw_ufraw.c 30 Jul 2016 03:00:16 -0000 1.294
@@ -1044,7 +1044,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) {
Index: ufraw_lensfun.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_lensfun.cc,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- ufraw_lensfun.cc 2 Jan 2016 16:00:21 -0000 1.38
+++ ufraw_lensfun.cc 30 Jul 2016 03:00:16 -0000 1.39
@@ -47,27 +47,23 @@
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();
@@ -75,8 +71,7 @@
}
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);
@@ -99,8 +94,7 @@
// 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);
@@ -144,8 +138,7 @@
{
public:
LensModel() : UFString(ufLensModel) { }
- void Event(UFEventType type)
- {
+ void Event(UFEventType type) {
if (type != uf_value_changed)
return UFObject::Event(type);
if (!HasParent())
@@ -155,8 +148,7 @@
Lensfun.Interpolate();
return UFObject::Event(type);
}
- void OriginalValueChangedEvent()
- {
+ void OriginalValueChangedEvent() {
if (!HasParent())
return;
Lensfun &Lensfun = Lensfun::Parent(*this);
@@ -195,8 +187,7 @@
{
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.
@@ -217,8 +208,7 @@
ufraw_invalidate_layer(uf, ufraw_transform_phase);
return UFObject::Event(type);
}
- void CreatePresets()
- {
+ void CreatePresets() {
if (!HasParent())
return;
Clear();
@@ -253,8 +243,7 @@
{
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.
@@ -274,8 +263,7 @@
Lensfun::Parent(*this).Interpolate();
return UFObject::Event(type);
}
- void CreatePresets()
- {
+ void CreatePresets() {
if (!HasParent())
return;
Clear();
@@ -309,8 +297,7 @@
{
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.
@@ -330,8 +317,7 @@
Lensfun::Parent(*this).Interpolate();
return UFObject::Event(type);
}
- void CreatePresets()
- {
+ void CreatePresets() {
Clear();
char buffer[_buffer_size];
double value = 0.25;
@@ -352,15 +338,13 @@
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
@@ -378,8 +362,7 @@
{
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;
@@ -395,8 +378,7 @@
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);
@@ -422,8 +404,7 @@
ufraw_invalidate_tca_layer(uf);
return UFObject::Event(type);
}
- void Interpolate()
- {
+ void Interpolate() {
if (!HasParent())
return;
Lensfun &Lensfun = Lensfun::Parent(*this);
@@ -453,8 +434,7 @@
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;
@@ -470,8 +450,7 @@
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);
@@ -499,8 +478,7 @@
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;
@@ -546,8 +524,7 @@
// </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;
@@ -563,8 +540,7 @@
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);
@@ -590,8 +566,7 @@
ufraw_invalidate_layer(uf, ufraw_transform_phase);
return UFObject::Event(type);
}
- void Interpolate()
- {
+ void Interpolate() {
if (!HasParent())
return;
Lensfun &Lensfun = Lensfun::Parent(*this);
@@ -620,8 +595,7 @@
{
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)
@@ -629,8 +603,7 @@
*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);
@@ -640,8 +613,7 @@
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
@@ -659,8 +631,7 @@
{
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)
@@ -668,8 +639,7 @@
*this << new UFString("Type", typeName);
}
}
- void OriginalValueChangedEvent()
- {
+ void OriginalValueChangedEvent() {
ufraw_data *uf = ufraw_image_get_data(this);
if (uf == NULL)
return;
------------------------------------------------------------------------------
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
