From 9d20de8d29ab6694f69b74ee6ce3a745711a5876 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Fri, 29 May 2020 11:12:52 +0800 Subject: [PATCH 1/2] fix UWP build error - fix the following UWP build errors caught by vcpkg's CI src\wavelib.c(3673): error C4703: potentially uninitialized local pointer variable 'out' used src\wavelib.c(3499): error C4703: potentially uninitialized local pointer variable 'wavecoeff' used - move the definition of `out` variable to support old C89 compilers; --- src/wavelib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wavelib.c b/src/wavelib.c index a7d4ae8..d40f491 100644 --- a/src/wavelib.c +++ b/src/wavelib.c @@ -3353,7 +3353,7 @@ void setWTConv(wt_object wt, const char *cmethod) { } double* dwt2(wt2_object wt, double *inp) { - double *wavecoeff; + double *wavecoeff = NULL; int i, J, iter, N, lp, rows_n, cols_n, rows_i, cols_i; int ir, ic, istride,ostride; int aLL, aLH, aHL, aHH, cdim,clen; @@ -3504,11 +3504,11 @@ void idwt2(wt2_object wt, double *wavecoeff, double *oup) { int istride, ostride, iter, J; int aLL, aLH, aHL, aHH; double *cL, *cH, *X_lp,*orig; + double *out = NULL; rows = wt->rows; cols = wt->cols; J = wt->J; - double *out; if (!strcmp(wt->ext, "per")) { From d4351d7f1c860779c2af6d3510d8166489ed2f57 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Fri, 29 May 2020 11:36:21 +0800 Subject: [PATCH 2/2] no need to link against libm any more --- test/CMakeLists.txt | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 5ff909d..64f5017 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -42,20 +42,6 @@ add_executable(modwt2test modwt2test.c) target_link_libraries(modwt2test wavelib) -if(UNIX) - target_link_libraries(cwttest m) - target_link_libraries(dwttest m) - target_link_libraries(swttest m) - target_link_libraries(modwttest m) - target_link_libraries(dwpttest m) - target_link_libraries(wtreetest m) - target_link_libraries(denoisetest m) - target_link_libraries(modwtdenoisetest m) - target_link_libraries(dwt2test m) - target_link_libraries(swt2test m) - target_link_libraries(modwt2test m) -endif() - set_target_properties(cwttest dwttest swttest modwttest dwpttest wtreetest denoisetest modwtdenoisetest dwt2test swt2test modwt2test PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/test"