projects/aports·blob master · refs

99 lines · 2.1 KiB

1Patch-Source: https://gitlab.com/free-astro/siril/-/commit/9186b0c0110aa332a99d578664e69cd26cae953b
2
3--- a/src/filters/da3d/DA3D.cpp
4+++ b/src/filters/da3d/DA3D.cpp
5@@ -15,10 +15,10 @@
6 #include "WeightMap.hpp"
7 #include "Utils.hpp"
8 #include "DftPatch.hpp"
9-extern "C" {
10+
11 #include "core/processing.h"
12 #include "gui/progress_and_log.h"
13-}
14+
15
16 #ifdef _OPENMP
17 #include <omp.h>
18--- a/src/filters/nlbayes/NlBayes.cpp
19+++ b/src/filters/nlbayes/NlBayes.cpp
20@@ -27,11 +27,9 @@
21 #include "LibMatrix.h"
22 #include "LibImages.h"
23 #include "Utilities.h"
24-extern "C" {
25 #include "algos/anscombe.h"
26 #include "core/processing.h"
27 #include "gui/progress_and_log.h"
28-}
29
30 #ifdef _OPENMP
31 #include <omp.h>
32--- a/src/opencv/opencv.h
33+++ b/src/opencv/opencv.h
34@@ -5,10 +5,6 @@
35 # include <config.h>
36 #endif
37
38-#ifdef __cplusplus
39-extern "C" {
40-#endif
41-
42 #include <stdint.h>
43 #include "registration/registration.h"
44 #include "registration/distorsion.h"
45@@ -18,6 +14,10 @@ extern "C" {
46 #include "io/sequence.h"
47 #include "io/image_format_fits.h"
48
49+#ifdef __cplusplus
50+extern "C" {
51+#endif
52+
53 WORD *fits_to_bgrbgr_ushort(fits *image);
54 float *fits_to_bgrbgr_float(fits *image);
55
56--- a/src/core/processing.h
57+++ b/src/core/processing.h
58@@ -39,6 +39,10 @@
59 * image processing.
60 */
61
62+#ifdef __cplusplus
63+extern "C" {
64+#endif
65+
66 /** Main structure of the generic function */
67 struct generic_seq_args {
68 /** sequence that will be processed */
69@@ -184,4 +188,8 @@ gpointer generic_sequence_metadata_worker(gpointer args);
70
71 void kill_child_process(gboolean on_exit);
72
73+#ifdef __cplusplus
74+}
75+#endif
76+
77 #endif
78--- a/src/gui/progress_and_log.h
79+++ b/src/gui/progress_and_log.h
80@@ -4,6 +4,10 @@
81 #include <sys/time.h>
82 #include <gtk/gtk.h>
83
84+#ifdef __cplusplus
85+extern "C" {
86+#endif
87+
88 #define PROGRESS_NONE -2.0 // don't update the progress bar value
89 #define PROGRESS_PULSATE -1.0 // pulsate the progress bar
90 #define PROGRESS_RESET 0.0 // reset the progress bar
91@@ -17,4 +21,8 @@ void set_progress_bar_data(const char *text, double percent);
92 void set_cursor_waiting(gboolean waiting);
93 void set_cursor(const gchar* cursor_name);
94
95+#ifdef __cplusplus
96+}
97+#endif
98+
99 #endif