Blob Blame History Raw
From 38a67c27d764e636597cd5bf82cb41ae6e56ac6b Mon Sep 17 00:00:00 2001
From: Vincent Hourdin <vh@free-astro.org>
Date: Tue, 28 Jan 2020 22:29:04 +0100
Subject: [PATCH] fixing gcc10 compilation and some warnings, fixes #424

---
 configure.ac            |  2 +-
 src/algos/Def_Wavelet.h | 38 +++++++++++++++++++-------------------
 src/core/command.c      |  3 +++
 src/core/command_list.h |  2 +-
 src/core/siril.h        |  2 +-
 src/gui/save_dialog.h   |  2 +-
 6 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/src/algos/Def_Wavelet.h b/src/algos/Def_Wavelet.h
index 3dd48f80..88954aec 100644
--- a/src/algos/Def_Wavelet.h
+++ b/src/algos/Def_Wavelet.h
@@ -58,24 +58,24 @@ typedef struct 	{
 	int Size;
 	float Freq_Coup; /* Frequency cutt-off */
 	float *Data;
-	        } pyramid_cf_des;
+} pyramid_cf_des;
 
 /* Data  structure for an algorithm without reduction of sampling */
 typedef struct 	{
 	float *Data;
 	float Freq_Coup;  /* Frequency cutt-off */
-	        } pave_f_des;
+} pave_f_des;
 
 
 /* Data structure for Mallat's algorithm */
 struct mallat_plan_des	{
 	int Nl,Nc;
-        float *Coef_Horiz;
-        float *Coef_Diag;
-        float *Coef_Vert;
-        float *Low_Resol;
-        struct mallat_plan_des *Smooth_Imag;
-        } mallat_plan_des;
+	float *Coef_Horiz;
+	float *Coef_Diag;
+	float *Coef_Vert;
+	float *Low_Resol;
+	struct mallat_plan_des *Smooth_Imag;
+};
 
 /* Data structure for a wavelet transform */
 typedef struct 	{
@@ -91,29 +91,29 @@ typedef struct 	{
 	pyramid_f_des Pyramid;
 	pave_f_des Pave;
 	struct mallat_plan_des Mallat;
-	         } wave_transf_des;
+} wave_transf_des;
 
 /* Data structure for image information */
 typedef struct {
-        float Sigma;
-        float Mean;
-        float Min, Max;
-        float Energ, Entrop;
-        float Correl_Plan[MAX_PLAN_WAVELET];
-	         } plan_info_des;
+	float Sigma;
+	float Mean;
+	float Min, Max;
+	float Energ, Entrop;
+	float Correl_Plan[MAX_PLAN_WAVELET];
+} plan_info_des;
 
 /* Filtering */
 
-    /* Thresholding */
+/* Thresholding */
 #define FILTER_TRESHOLD 1     
 
-    /* Adaptative thresholding */
+/* Adaptative thresholding */
 #define FILTER_HIERARCHICAL_TRESHOLD 2
 
-    /* Hierarchical Wiener filtering */
+/* Hierarchical Wiener filtering */
 #define FILTER_HIERARCHICAL 3
 
-    /* Multiresolution Wiener filtering */
+/* Multiresolution Wiener filtering */
 #define FILTER_MULTI_RES_WIENER 4
 
 #define TO1_FRENCH 1
diff --git a/src/gui/save_dialog.h b/src/gui/save_dialog.h
index 2567d11e..6a2d5c4f 100644
--- a/src/gui/save_dialog.h
+++ b/src/gui/save_dialog.h
@@ -14,7 +14,7 @@ struct savedial_data {
 
 enum {
 	PAGE_TIFF, PAGE_JPG, PAGE_FITS, PAGE_MISC
-} confirm;
+};
 
 void on_header_save_button_clicked();
 
-- 
2.20.1