]>
Commit | Line | Data |
---|---|---|
1e59de90 TL |
1 | diff --git a/vl/generic.c b/vl/generic.c |
2 | index c6f84a9..8617ed2 100644 | |
3 | --- a/vl/generic.c | |
4 | +++ b/vl/generic.c | |
5 | @@ -1513,13 +1513,13 @@ vl_thread_specific_state_delete (VlThreadState * self) | |
6 | */ | |
7 | ||
8 | #if (defined(VL_OS_LINUX) || defined(VL_OS_MACOSX)) && defined(VL_COMPILER_GNUC) | |
9 | -static void vl_constructor () __attribute__ ((constructor)) ; | |
10 | -static void vl_destructor () __attribute__ ((destructor)) ; | |
11 | +//static void vl_constructor () __attribute__ ((constructor)) ; | |
12 | +//static void vl_destructor () __attribute__ ((destructor)) ; | |
13 | #endif | |
14 | ||
15 | #if defined(VL_OS_WIN) | |
16 | -static void vl_constructor () ; | |
17 | -static void vl_destructor () ; | |
18 | +//static void vl_constructor () ; | |
19 | +//static void vl_destructor () ; | |
20 | ||
21 | BOOL WINAPI DllMain( | |
22 | HINSTANCE hinstDLL, // handle to DLL module | |
23 | @@ -1563,7 +1563,7 @@ BOOL WINAPI DllMain( | |
24 | /* ---------------------------------------------------------------- */ | |
25 | ||
26 | /** @internal @brief Initialize VLFeat state */ | |
27 | -static void | |
28 | +void | |
29 | vl_constructor (void) | |
30 | { | |
31 | VlState * state ; | |
32 | @@ -1637,7 +1637,7 @@ vl_constructor (void) | |
33 | } | |
34 | ||
35 | /** @internal @brief Destruct VLFeat */ | |
36 | -static void | |
37 | +void | |
38 | vl_destructor () | |
39 | { | |
40 | VlState * state ; | |
41 | diff --git a/vl/generic.h b/vl/generic.h | |
42 | index 4ef87f2..30a974e 100644 | |
43 | --- a/vl/generic.h | |
44 | +++ b/vl/generic.h | |
45 | @@ -206,5 +206,7 @@ VL_EXPORT double vl_toc (void) ; | |
46 | VL_EXPORT double vl_get_cpu_time (void) ; | |
47 | /** @} */ | |
48 | ||
49 | +VL_EXPORT void vl_constructor(); | |
50 | +VL_EXPORT void vl_destructor(); | |
51 | /* VL_GENERIC_H */ | |
52 | #endif | |
53 | diff --git a/vl/sift.c b/vl/sift.c | |
54 | index 03963fe..6477a81 100644 | |
55 | --- a/vl/sift.c | |
56 | +++ b/vl/sift.c | |
57 | @@ -1443,7 +1443,7 @@ vl_sift_detect (VlSiftFilt * f) | |
58 | ** @remark The minimum octave size is 2x2xS. | |
59 | **/ | |
60 | ||
61 | -static void | |
62 | +void | |
63 | update_gradient (VlSiftFilt *f) | |
64 | { | |
65 | int s_min = f->s_min ; | |
66 | diff --git a/vl/sift.h b/vl/sift.h | |
67 | index 50e03f4..f9558ad 100644 | |
68 | --- a/vl/sift.h | |
69 | +++ b/vl/sift.h | |
70 | @@ -138,7 +138,8 @@ void vl_sift_keypoint_init (VlSiftFilt const *f, | |
71 | double y, | |
72 | double sigma) ; | |
73 | /** @} */ | |
74 | - | |
75 | +VL_EXPORT | |
76 | +void update_gradient(VlSiftFilt* f); | |
77 | /** @name Retrieve data and parameters | |
78 | ** @{ | |
79 | **/ |