|
 |
93953c8 |
Index: src/core/command.c
|
|
|
93953c8 |
===================================================================
|
|
|
93953c8 |
--- src/core/command.c (révision 2434)
|
|
|
93953c8 |
+++ src/core/command.c (copie de travail)
|
|
|
93953c8 |
@@ -358,7 +358,7 @@
|
|
|
93953c8 |
norm = atof(word[2]);
|
|
|
93953c8 |
if (readfits(word[1], &fit, NULL))
|
|
|
93953c8 |
return -1;
|
|
|
93953c8 |
- fdiv(&gfit, &fit, norm);
|
|
|
93953c8 |
+ siril_fdiv(&gfit, &fit, norm);
|
|
|
93953c8 |
adjust_cutoff_from_updated_gfit();
|
|
|
93953c8 |
redraw(com.cvport, REMAP_ALL);
|
|
|
93953c8 |
redraw_previews();
|
|
|
93953c8 |
Index: src/core/proto.h
|
|
|
93953c8 |
===================================================================
|
|
|
93953c8 |
--- src/core/proto.h (révision 2434)
|
|
|
93953c8 |
+++ src/core/proto.h (copie de travail)
|
|
|
93953c8 |
@@ -181,9 +181,8 @@
|
|
|
93953c8 |
int imoper(fits *a, fits *b, char oper);
|
|
|
93953c8 |
int sub_background(fits* image, fits* background, int layer);
|
|
|
93953c8 |
int addmax(fits *a, fits *b);
|
|
|
93953c8 |
-int fdiv(fits *a, fits *b, float scalar);
|
|
|
93953c8 |
-int ndiv(fits *a, fits *b);
|
|
|
93953c8 |
-int fmul(fits *a, float coeff);
|
|
|
93953c8 |
+int siril_fdiv(fits *a, fits *b, float scalar);
|
|
|
93953c8 |
+int siril_ndiv(fits *a, fits *b);
|
|
|
93953c8 |
double gaussienne(double sigma, int size, double *gauss);
|
|
|
93953c8 |
int unsharp(fits *,double sigma, double mult, gboolean verbose);
|
|
|
93953c8 |
int crop(fits *fit, rectangle *bounds);
|
|
|
93953c8 |
Index: src/core/siril.c
|
|
|
93953c8 |
===================================================================
|
|
|
93953c8 |
--- src/core/siril.c (révision 2434)
|
|
|
93953c8 |
+++ src/core/siril.c (copie de travail)
|
|
|
93953c8 |
@@ -260,8 +260,8 @@
|
|
|
93953c8 |
return 0;
|
|
|
93953c8 |
}
|
|
|
93953c8 |
|
|
|
93953c8 |
-/* If fdiv is ok, function returns 0. If overflow, fdiv returns 1*/
|
|
|
93953c8 |
-int fdiv(fits *a, fits *b, float coef) {
|
|
|
93953c8 |
+/* If siril_fdiv is ok, function returns 0. If overflow, siril_fdiv returns 1*/
|
|
|
93953c8 |
+int siril_fdiv(fits *a, fits *b, float coef) {
|
|
|
93953c8 |
int i, layer;
|
|
|
93953c8 |
int retvalue = 0;
|
|
|
93953c8 |
double temp;
|
|
|
93953c8 |
@@ -289,7 +289,7 @@
|
|
|
93953c8 |
|
|
|
93953c8 |
/* normalized division a/b, stored in a, with max value equal to the original
|
|
|
93953c8 |
* max value of a, for each layer. */
|
|
|
93953c8 |
-int ndiv(fits *a, fits *b) {
|
|
|
93953c8 |
+int siril_ndiv(fits *a, fits *b) {
|
|
|
93953c8 |
double *div;
|
|
|
93953c8 |
int layer, i, nb_pixels;
|
|
|
93953c8 |
if (a->rx != b->rx || a->ry != b->ry || a->naxes[2] != b->naxes[2]) {
|
|
|
93953c8 |
@@ -489,7 +489,7 @@
|
|
|
93953c8 |
unsharp(&fit, sigma, 0, FALSE);
|
|
|
93953c8 |
soper(&fit, (double) level, OPER_ADD);
|
|
|
93953c8 |
nozero(&fit, 1);
|
|
|
93953c8 |
- fdiv(a, &fit, level);
|
|
|
93953c8 |
+ siril_fdiv(a, &fit, level);
|
|
|
93953c8 |
soper(a, (double) coeff, OPER_MUL);
|
|
|
93953c8 |
clearfits(&fit;;
|
|
|
93953c8 |
invalidate_stats_from_fit(a);
|
|
|
93953c8 |
@@ -824,7 +824,7 @@
|
|
|
93953c8 |
}
|
|
|
93953c8 |
|
|
|
93953c8 |
if (com.preprostatus & USE_FLAT) {
|
|
|
93953c8 |
- fdiv(brut, flat, level);
|
|
|
93953c8 |
+ siril_fdiv(brut, flat, level);
|
|
|
93953c8 |
}
|
|
|
93953c8 |
|
|
|
93953c8 |
return 0;
|
|
|
93953c8 |
Index: src/gui/callbacks.c
|
|
|
93953c8 |
===================================================================
|
|
|
93953c8 |
--- src/gui/callbacks.c (révision 2434)
|
|
|
93953c8 |
+++ src/gui/callbacks.c (copie de travail)
|
|
|
93953c8 |
@@ -4775,7 +4775,7 @@
|
|
|
93953c8 |
siril_log_message(_("Subtraction done ...\n"));
|
|
|
93953c8 |
break;
|
|
|
93953c8 |
case 1:
|
|
|
93953c8 |
- if (ndiv(&gfit, &background_fit)) {
|
|
|
93953c8 |
+ if (siril_ndiv(&gfit, &background_fit)) {
|
|
|
93953c8 |
set_cursor_waiting(FALSE);
|
|
|
93953c8 |
return;
|
|
|
93953c8 |
}
|