From de82d12658979cd70439f977742f80fac9f6521f Mon Sep 17 00:00:00 2001 From: Siddhesh Wani Date: Thu, 4 May 2017 16:15:18 +0530 Subject: Basic functions and image processing working with MSVC on windows x64 --- 2.3-1/builder.sce | 2 +- 2.3-1/loader.sce | 2 +- 2.3-1/macros/ASTManagement/lib | Bin 0 -> 1780 bytes 2.3-1/macros/ASTManagement/names | 55 +++++++++++++++ .../macros/CCodeGeneration/C_GenerateMakefile.sci | 37 +---------- .../CCodeGeneration/C_GenerateMakefile_msvc.sci | 57 +++++++++++----- 2.3-1/macros/CCodeGeneration/lib | Bin 0 -> 1020 bytes 2.3-1/macros/CCodeGeneration/names | 23 +++++++ 2.3-1/macros/ErrorMessages/lib | Bin 0 -> 532 bytes 2.3-1/macros/ErrorMessages/names | 3 + 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.sci | 2 +- 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.sci | 2 +- 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.sci | 2 +- 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.sci | 2 +- 2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.sci | 2 +- 2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci | 2 +- .../FunctionAnnotation/FA_SZ_LINSPACE_ROW.sci | 2 +- 2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.sci | 2 +- .../FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci | 2 +- 2.3-1/macros/FunctionAnnotation/lib | Bin 0 -> 2256 bytes 2.3-1/macros/FunctionAnnotation/names | 74 +++++++++++++++++++++ 2.3-1/macros/FunctionList/lib | Bin 0 -> 600 bytes 2.3-1/macros/FunctionList/names | 6 ++ 2.3-1/macros/GeneralFunctions/lib | Bin 0 -> 1144 bytes 2.3-1/macros/GeneralFunctions/names | 28 ++++++++ 2.3-1/macros/Hardware/AVR/lib | Bin 0 -> 984 bytes 2.3-1/macros/Hardware/AVR/names | 22 ++++++ 2.3-1/macros/Hardware/RasberryPi/lib | Bin 0 -> 988 bytes 2.3-1/macros/Hardware/RasberryPi/names | 21 ++++++ 2.3-1/macros/ImageProcessing/core/lib | Bin 0 -> 536 bytes 2.3-1/macros/ImageProcessing/core/names | 2 + 2.3-1/macros/ImageProcessing/highgui/lib | Bin 0 -> 596 bytes 2.3-1/macros/ImageProcessing/highgui/names | 4 ++ 2.3-1/macros/ImageProcessing/imgproc/lib | Bin 0 -> 764 bytes 2.3-1/macros/ImageProcessing/imgproc/names | 11 +++ 2.3-1/macros/Scilab-Arduino/lib | Bin 0 -> 608 bytes 2.3-1/macros/Scilab-Arduino/names | 6 ++ 2.3-1/macros/SymbolTable/lib | Bin 0 -> 740 bytes 2.3-1/macros/SymbolTable/names | 12 ++++ .../ToolInitialization/INIT_FillSCI2LibCDirs.sci | 12 ++-- 2.3-1/macros/ToolInitialization/lib | Bin 0 -> 816 bytes 2.3-1/macros/ToolInitialization/names | 14 ++++ 2.3-1/macros/findDeps/getAllLibraries.sci | 2 +- 2.3-1/macros/findDeps/lib | Bin 0 -> 608 bytes 2.3-1/macros/findDeps/names | 7 ++ 2.3-1/macros/lib | Bin 0 -> 548 bytes 2.3-1/macros/names | 6 ++ 2.3-1/macros/runsci2c.sci | 2 +- 2.3-1/src/c/CACSD/lqe/dlqea.c | 5 +- 2.3-1/src/c/CACSD/lqr/dlqra.c | 10 +-- 2.3-1/src/c/CACSD/obscont/dobsconta.c | 6 +- 2.3-1/src/c/auxiliaryFunctions/isnan/cisnans.c | 11 ++- 2.3-1/src/c/auxiliaryFunctions/isnan/disnans.c | 8 +-- 2.3-1/src/c/auxiliaryFunctions/isnan/sisnans.c | 8 +-- 2.3-1/src/c/auxiliaryFunctions/isnan/zisnans.c | 7 +- .../elementaryFunctions/Trigonometry/cosd/dcosda.c | 16 ++++- .../elementaryFunctions/Trigonometry/cosd/dcosds.c | 16 +++++ .../elementaryFunctions/Trigonometry/cosd/scosda.c | 15 ++++- .../elementaryFunctions/Trigonometry/cosd/scosds.c | 16 +++++ .../elementaryFunctions/Trigonometry/cotd/dcotda.c | 19 ++++-- .../elementaryFunctions/Trigonometry/cotd/dcotds.c | 18 ++++- .../elementaryFunctions/Trigonometry/cotd/scotda.c | 13 +++- .../elementaryFunctions/Trigonometry/cotd/scotds.c | 16 +++++ .../elementaryFunctions/Trigonometry/coth/ccotha.c | 14 +++- .../elementaryFunctions/Trigonometry/coth/ccoths.c | 12 ++++ .../elementaryFunctions/Trigonometry/coth/dcotha.c | 14 +++- .../elementaryFunctions/Trigonometry/coth/dcoths.c | 12 ++++ .../elementaryFunctions/Trigonometry/coth/scotha.c | 15 ++++- .../elementaryFunctions/Trigonometry/coth/scoths.c | 12 ++++ .../elementaryFunctions/Trigonometry/coth/zcotha.c | 12 ++++ .../elementaryFunctions/Trigonometry/coth/zcoths.c | 12 ++++ .../c/elementaryFunctions/Trigonometry/csc/ccsca.c | 12 ++++ .../c/elementaryFunctions/Trigonometry/csc/ccscs.c | 12 ++++ .../c/elementaryFunctions/Trigonometry/csc/dcsca.c | 12 ++++ .../c/elementaryFunctions/Trigonometry/csc/dcscs.c | 12 ++++ .../c/elementaryFunctions/Trigonometry/csc/scsca.c | 12 ++++ .../c/elementaryFunctions/Trigonometry/csc/scscs.c | 12 ++++ .../c/elementaryFunctions/Trigonometry/csc/zcsca.c | 12 ++++ .../c/elementaryFunctions/Trigonometry/csc/zcscs.c | 15 ++++- .../elementaryFunctions/Trigonometry/cscd/ccscda.c | 12 ++++ .../elementaryFunctions/Trigonometry/cscd/ccscds.c | 12 ++++ .../elementaryFunctions/Trigonometry/cscd/dcscda.c | 17 +++-- .../elementaryFunctions/Trigonometry/cscd/dcscds.c | 16 +++++ .../elementaryFunctions/Trigonometry/cscd/scscda.c | 12 ++++ .../elementaryFunctions/Trigonometry/cscd/scscds.c | 17 +++++ .../elementaryFunctions/Trigonometry/cscd/zcscda.c | 12 ++++ .../elementaryFunctions/Trigonometry/cscd/zcscds.c | 12 ++++ .../elementaryFunctions/Trigonometry/csch/ccscha.c | 12 ++++ .../elementaryFunctions/Trigonometry/csch/ccschs.c | 12 ++++ .../elementaryFunctions/Trigonometry/csch/dcscha.c | 12 ++++ .../elementaryFunctions/Trigonometry/csch/dcschs.c | 12 ++++ .../elementaryFunctions/Trigonometry/csch/scscha.c | 12 ++++ .../elementaryFunctions/Trigonometry/csch/scschs.c | 12 ++++ .../elementaryFunctions/Trigonometry/csch/zcscha.c | 12 ++++ .../elementaryFunctions/Trigonometry/csch/zcschs.c | 12 ++++ .../c/elementaryFunctions/Trigonometry/sec/cseca.c | 12 ++++ .../c/elementaryFunctions/Trigonometry/sec/csecs.c | 12 ++++ .../c/elementaryFunctions/Trigonometry/sec/dseca.c | 12 ++++ .../c/elementaryFunctions/Trigonometry/sec/dsecs.c | 12 ++++ .../c/elementaryFunctions/Trigonometry/sec/sseca.c | 12 ++++ .../c/elementaryFunctions/Trigonometry/sec/ssecs.c | 12 ++++ .../c/elementaryFunctions/Trigonometry/sec/zseca.c | 12 ++++ .../c/elementaryFunctions/Trigonometry/sec/zsecs.c | 63 +++++------------- .../elementaryFunctions/Trigonometry/secd/dsecda.c | 12 ++++ .../elementaryFunctions/Trigonometry/secd/dsecds.c | 18 +++++ .../elementaryFunctions/Trigonometry/secd/ssecda.c | 13 ++++ .../elementaryFunctions/Trigonometry/secd/ssecds.c | 17 +++++ .../elementaryFunctions/Trigonometry/sech/csecha.c | 12 ++++ .../elementaryFunctions/Trigonometry/sech/csechs.c | 12 ++++ .../elementaryFunctions/Trigonometry/sech/dsecha.c | 12 ++++ .../elementaryFunctions/Trigonometry/sech/dsechs.c | 12 ++++ .../elementaryFunctions/Trigonometry/sech/ssecha.c | 12 ++++ .../elementaryFunctions/Trigonometry/sech/ssechs.c | 12 ++++ .../elementaryFunctions/Trigonometry/sech/zsecha.c | 12 ++++ .../elementaryFunctions/Trigonometry/sech/zsechs.c | 12 ++++ 2.3-1/src/c/elementaryFunctions/acoth/dacoths.c | 1 + 2.3-1/src/c/elementaryFunctions/acoth/sacoths.c | 1 + 2.3-1/src/c/elementaryFunctions/cos/i16coss.c | 2 +- 2.3-1/src/c/elementaryFunctions/cos/i8coss.c | 2 +- 2.3-1/src/c/elementaryFunctions/cos/u16coss.c | 2 +- 2.3-1/src/c/elementaryFunctions/cos/u8coss.c | 2 +- .../discrete_mathematics/factor/dfactors.c | 9 +-- .../discrete_mathematics/factor/sfactors.c | 13 ++-- 2.3-1/src/c/elementaryFunctions/includes/bin2dec.h | 4 +- .../src/c/elementaryFunctions/includes/get_float.h | 2 + 2.3-1/src/c/elementaryFunctions/includes/sec.h | 4 +- .../c/elementaryFunctions/linspace/dlinspacea.c | 6 +- .../c/elementaryFunctions/logspace/dlogspacea.c | 8 ++- .../radix_conversions/base2dec/gbase2decs.c | 7 +- .../radix_conversions/hex2dec/ghex2decs.c | 7 +- 2.3-1/src/c/elementaryFunctions/sin/i16sins.c | 2 +- 2.3-1/src/c/elementaryFunctions/sin/i8sins.c | 2 +- 2.3-1/src/c/elementaryFunctions/sin/u16sins.c | 2 +- 2.3-1/src/c/elementaryFunctions/sin/u8sins.c | 2 +- 2.3-1/src/c/elementaryFunctions/sinh/i16sinhs.c | 2 +- 2.3-1/src/c/elementaryFunctions/sinh/i8sinhs.c | 2 +- 2.3-1/src/c/elementaryFunctions/sinh/u16sinhs.c | 2 +- 2.3-1/src/c/elementaryFunctions/sinh/u8sinhs.c | 2 +- 2.3-1/src/c/linearAlgebra/balanc/dbalanca.c | 2 +- 2.3-1/src/c/linearAlgebra/rcond/drconda.c | 8 +-- 2.3-1/src/c/string/convstr/gconvstrs.c | 2 + .../lib/pc/windows/x64/Lapack/blasplus.lib | Bin 0 -> 23128 bytes .../lib/pc/windows/x64/Lapack/lapack.lib | Bin 0 -> 119452 bytes .../lib/pc/windows/x64/OpenCV/IlmImf.lib | Bin 0 -> 30821686 bytes .../lib/pc/windows/x64/OpenCV/IlmImfd.lib | Bin 0 -> 41688642 bytes .../lib/pc/windows/x64/OpenCV/libjasper.lib | Bin 0 -> 1728614 bytes .../lib/pc/windows/x64/OpenCV/libjpeg.lib | Bin 0 -> 808624 bytes .../lib/pc/windows/x64/OpenCV/libpng.lib | Bin 0 -> 1096298 bytes .../lib/pc/windows/x64/OpenCV/libtiff.lib | Bin 0 -> 2601558 bytes .../pc/windows/x64/OpenCV/opencv_calib3d2413.lib | Bin 0 -> 8149714 bytes .../pc/windows/x64/OpenCV/opencv_contrib2413.lib | Bin 0 -> 16512622 bytes .../lib/pc/windows/x64/OpenCV/opencv_core2413.lib | Bin 0 -> 18600420 bytes .../windows/x64/OpenCV/opencv_features2d2413.lib | Bin 0 -> 9824282 bytes .../lib/pc/windows/x64/OpenCV/opencv_flann2413.lib | Bin 0 -> 9237126 bytes .../lib/pc/windows/x64/OpenCV/opencv_gpu2413.lib | Bin 0 -> 4052944 bytes .../x64/OpenCV/opencv_haartraining_engine.lib | Bin 0 -> 4460472 bytes .../pc/windows/x64/OpenCV/opencv_highgui2413.lib | Bin 0 -> 3786262 bytes .../pc/windows/x64/OpenCV/opencv_imgproc2413.lib | Bin 0 -> 15578966 bytes .../pc/windows/x64/OpenCV/opencv_legacy2413.lib | Bin 0 -> 12106470 bytes .../lib/pc/windows/x64/OpenCV/opencv_ml2413.lib | Bin 0 -> 4094228 bytes .../pc/windows/x64/OpenCV/opencv_nonfree2413.lib | Bin 0 -> 2755892 bytes .../pc/windows/x64/OpenCV/opencv_objdetect2413.lib | Bin 0 -> 9044850 bytes .../lib/pc/windows/x64/OpenCV/opencv_ocl2413.lib | Bin 0 -> 24626172 bytes .../lib/pc/windows/x64/OpenCV/opencv_photo2413.lib | Bin 0 -> 961556 bytes .../pc/windows/x64/OpenCV/opencv_stitching2413.lib | Bin 0 -> 9902982 bytes .../pc/windows/x64/OpenCV/opencv_superres2413.lib | Bin 0 -> 2607060 bytes .../lib/pc/windows/x64/OpenCV/opencv_ts2413.lib | Bin 0 -> 11379948 bytes .../lib/pc/windows/x64/OpenCV/opencv_video2413.lib | Bin 0 -> 2636090 bytes .../pc/windows/x64/OpenCV/opencv_videostab2413.lib | Bin 0 -> 2836214 bytes .../thirdparty/lib/pc/windows/x64/OpenCV/zlib.lib | Bin 0 -> 273732 bytes .../lib/pc/windows/x86/Lapack/libblas.lib | Bin 0 -> 25800 bytes .../lib/pc/windows/x86/Lapack/liblapack.lib | Bin 0 -> 312486 bytes .../lib/pc/windows/x86/OpenCV/IlmImf.lib | Bin 0 -> 25531120 bytes .../lib/pc/windows/x86/OpenCV/libjasper.lib | Bin 0 -> 1500168 bytes .../lib/pc/windows/x86/OpenCV/libjpeg.lib | Bin 0 -> 696800 bytes .../lib/pc/windows/x86/OpenCV/libpng.lib | Bin 0 -> 980466 bytes .../lib/pc/windows/x86/OpenCV/libtiff.lib | Bin 0 -> 2338734 bytes .../pc/windows/x86/OpenCV/opencv_calib3d2413.lib | Bin 0 -> 6521202 bytes .../pc/windows/x86/OpenCV/opencv_contrib2413.lib | Bin 0 -> 13176010 bytes .../lib/pc/windows/x86/OpenCV/opencv_core2413.lib | Bin 0 -> 14730290 bytes .../windows/x86/OpenCV/opencv_features2d2413.lib | Bin 0 -> 7805440 bytes .../lib/pc/windows/x86/OpenCV/opencv_flann2413.lib | Bin 0 -> 7382376 bytes .../lib/pc/windows/x86/OpenCV/opencv_gpu2413.lib | Bin 0 -> 3357130 bytes .../pc/windows/x86/OpenCV/opencv_highgui2413.lib | Bin 0 -> 3142058 bytes .../pc/windows/x86/OpenCV/opencv_imgproc2413.lib | Bin 0 -> 12539382 bytes .../pc/windows/x86/OpenCV/opencv_legacy2413.lib | Bin 0 -> 9628532 bytes .../lib/pc/windows/x86/OpenCV/opencv_ml2413.lib | Bin 0 -> 3360184 bytes .../pc/windows/x86/OpenCV/opencv_nonfree2413.lib | Bin 0 -> 2191940 bytes .../pc/windows/x86/OpenCV/opencv_objdetect2413.lib | Bin 0 -> 7106550 bytes .../lib/pc/windows/x86/OpenCV/opencv_ocl2413.lib | Bin 0 -> 17881828 bytes .../lib/pc/windows/x86/OpenCV/opencv_photo2413.lib | Bin 0 -> 816104 bytes .../pc/windows/x86/OpenCV/opencv_stitching2413.lib | Bin 0 -> 7875508 bytes .../pc/windows/x86/OpenCV/opencv_superres2413.lib | Bin 0 -> 2047200 bytes .../lib/pc/windows/x86/OpenCV/opencv_ts2413.lib | Bin 0 -> 8971116 bytes .../lib/pc/windows/x86/OpenCV/opencv_video2413.lib | Bin 0 -> 2127446 bytes .../pc/windows/x86/OpenCV/opencv_videostab2413.lib | Bin 0 -> 2354896 bytes .../thirdparty/lib/pc/windows/x86/OpenCV/zlib.lib | Bin 0 -> 238394 bytes 2.3-1/unloader.sce | 2 +- 198 files changed, 1194 insertions(+), 227 deletions(-) create mode 100644 2.3-1/macros/ASTManagement/lib create mode 100644 2.3-1/macros/ASTManagement/names create mode 100644 2.3-1/macros/CCodeGeneration/lib create mode 100644 2.3-1/macros/CCodeGeneration/names create mode 100644 2.3-1/macros/ErrorMessages/lib create mode 100644 2.3-1/macros/ErrorMessages/names create mode 100644 2.3-1/macros/FunctionAnnotation/lib create mode 100644 2.3-1/macros/FunctionAnnotation/names create mode 100644 2.3-1/macros/FunctionList/lib create mode 100644 2.3-1/macros/FunctionList/names create mode 100644 2.3-1/macros/GeneralFunctions/lib create mode 100644 2.3-1/macros/GeneralFunctions/names create mode 100644 2.3-1/macros/Hardware/AVR/lib create mode 100644 2.3-1/macros/Hardware/AVR/names create mode 100644 2.3-1/macros/Hardware/RasberryPi/lib create mode 100644 2.3-1/macros/Hardware/RasberryPi/names create mode 100644 2.3-1/macros/ImageProcessing/core/lib create mode 100644 2.3-1/macros/ImageProcessing/core/names create mode 100644 2.3-1/macros/ImageProcessing/highgui/lib create mode 100644 2.3-1/macros/ImageProcessing/highgui/names create mode 100644 2.3-1/macros/ImageProcessing/imgproc/lib create mode 100644 2.3-1/macros/ImageProcessing/imgproc/names create mode 100644 2.3-1/macros/Scilab-Arduino/lib create mode 100644 2.3-1/macros/Scilab-Arduino/names create mode 100644 2.3-1/macros/SymbolTable/lib create mode 100644 2.3-1/macros/SymbolTable/names create mode 100644 2.3-1/macros/ToolInitialization/lib create mode 100644 2.3-1/macros/ToolInitialization/names create mode 100644 2.3-1/macros/findDeps/lib create mode 100644 2.3-1/macros/findDeps/names create mode 100644 2.3-1/macros/lib create mode 100644 2.3-1/macros/names create mode 100644 2.3-1/thirdparty/lib/pc/windows/x64/Lapack/blasplus.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x64/Lapack/lapack.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/IlmImf.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/IlmImfd.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/libjasper.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/libjpeg.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/libpng.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/libtiff.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_calib3d2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_contrib2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_core2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_features2d2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_flann2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_gpu2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_haartraining_engine.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_highgui2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_imgproc2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_legacy2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_ml2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_nonfree2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_objdetect2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_ocl2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_photo2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_stitching2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_superres2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_ts2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_video2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_videostab2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/zlib.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x86/Lapack/libblas.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x86/Lapack/liblapack.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/IlmImf.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/libjasper.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/libjpeg.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/libpng.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/libtiff.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_calib3d2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_contrib2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_core2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_features2d2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_flann2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_gpu2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_highgui2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_imgproc2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_legacy2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_ml2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_nonfree2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_objdetect2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_ocl2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_photo2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_stitching2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_superres2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_ts2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_video2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_videostab2413.lib create mode 100644 2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/zlib.lib (limited to '2.3-1') diff --git a/2.3-1/builder.sce b/2.3-1/builder.sce index 71523a6b..5938a588 100644 --- a/2.3-1/builder.sce +++ b/2.3-1/builder.sce @@ -18,7 +18,7 @@ catch end; // ==================================================================== if ~with_module('development_tools') then - error(msprintf(gettext('%s module not installed."),'development_tools')); + error(msprintf(gettext('%s module not installed.'),'development_tools')); end // ==================================================================== TOOLBOX_NAME = 'scilab2c'; diff --git a/2.3-1/loader.sce b/2.3-1/loader.sce index 92d68830..ddfe6370 100644 --- a/2.3-1/loader.sce +++ b/2.3-1/loader.sce @@ -7,4 +7,4 @@ catch error("Scilab 5.0 or more is required."); end; -exec(get_absolute_file_path("loader.sce")+"etc/"+"scilab2c.start"); +exec(get_absolute_file_path("loader.sce")+"etc\"+"scilab2c.start"); diff --git a/2.3-1/macros/ASTManagement/lib b/2.3-1/macros/ASTManagement/lib new file mode 100644 index 00000000..ae21cfc5 Binary files /dev/null and b/2.3-1/macros/ASTManagement/lib differ diff --git a/2.3-1/macros/ASTManagement/names b/2.3-1/macros/ASTManagement/names new file mode 100644 index 00000000..43522229 --- /dev/null +++ b/2.3-1/macros/ASTManagement/names @@ -0,0 +1,55 @@ +%comment_string +%cste_string +%equal_string +%for_string +%funcall_string +%ifthenel_string +%operatio_string +%program_p +%program_string +%variable_string +%while_string +AST2Ccode +AST_CheckCommonInOutArgs +AST_CheckLastFunc +AST_CheckLineLength +AST_CheckPrecSpecifier +AST_DisplayStack +AST_ExtractNameAndScope +AST_GetASTFile +AST_GetFuncallPrm +AST_GetPrecAndLhsArg +AST_HandleEOL +AST_HandleEndFor +AST_HandleEndGenFun +AST_HandleEndProgram +AST_HandleEndWhile +AST_HandleFor +AST_HandleForStatem +AST_HandleHeader +AST_HandleIfElse +AST_HandleWhileExpr +AST_HandleWhileStatem +AST_ParseEqualStruct +AST_ParseFuncallStruct +AST_ParseIfExprStruct +AST_ParseOperStruct +AST_PopASTStack +AST_PushASTStack +AST_ReadASTHeader +AST_ReadEqualRhsNames +GenOutArgNames +Operator2FunName +SciFile2ASTFile +_comment_string +_cste_string +_equal_string +_for_string +_funcall_string +_ifthenel_string +_operatio_string +_program_p +_program_string +_variable_string +_while_string +objectlist2string diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci index 07891c56..7dfb4da4 100644 --- a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci +++ b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci @@ -71,31 +71,20 @@ else PrintStringInfo('CFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('CXXFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('LDFLAGS = -llapack -lrefblas -lgfortran -lwiringPi',FileInfo.MakefileFilename,'file','y','y'); - if(SharedInfo.OpenCVUsed == %T) - PrintStringInfo('LDFLAGS += -lopencv_calib3d -lopencv_contrib -lopencv_features2d -lopencv_flann -lopencv_gpu',FileInfo.MakefileFilename,'file','y','y'); - PrintStringInfo('LDFLAGS += -lopencv_highgui -lopencv_imgproc -lopencv_legacy -lopencv_ml -lopencv_nonfree',FileInfo.MakefileFilename,'file','y','y'); - PrintStringInfo('LDFLAGS += -lopencv_objdetect -lopencv_ocl -lopencv_photo -lopencv_stitching -lopencv_superres',FileInfo.MakefileFilename,'file','y','y'); - PrintStringInfo('LDFLAGS += -lopencv_ts -lopencv_video -lopencv_videostab -lopencv_core -lrt -lpthread -lm -ldl', FileInfo.MakefileFilename,'file','y','y'); - PrintStringInfo('LDFLAGS += -lIlmImf -ljpeg -ljasper -ltiff -lpng -lzlib -lstdc++',FileInfo.MakefileFilename,'file','y','y'); - end else PrintStringInfo('CC = gcc',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('CXX = g++',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('CFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('CXXFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('LDFLAGS = -lblas -llapack -lm ',FileInfo.MakefileFilename,'file','y','y'); - if(SharedInfo.OpenCVUsed == %T) - //PrintStringInfo('LDFLAGS += `pkg-config --libs opencv`',FileInfo.MakefileFilename,'file','y','y'); - //PrintStringInfo('CFLAGS += `pkg-config --cflags opencv`',FileInfo.MakefileFilename,'file','y','y'); - //PrintStringInfo('CXXFLAGS += `pkg-config --cflags opencv`',FileInfo.MakefileFilename,'file','y','y'); + end + if(SharedInfo.OpenCVUsed == %T) PrintStringInfo('LDFLAGS += -lopencv_calib3d -lopencv_contrib -lopencv_features2d -lopencv_flann -lopencv_gpu',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('LDFLAGS += -lopencv_highgui -lopencv_imgproc -lopencv_legacy -lopencv_ml -lopencv_nonfree',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('LDFLAGS += -lopencv_objdetect -lopencv_ocl -lopencv_photo -lopencv_stitching -lopencv_superres',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('LDFLAGS += -lopencv_ts -lopencv_video -lopencv_videostab -lopencv_core -lrt -lpthread -lm -ldl', FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('LDFLAGS += -lIlmImf -ljpeg -ljasper -ltiff -lpng -lzlib -lstdc++',FileInfo.MakefileFilename,'file','y','y'); - end - end - + end end //If ode function is used, add libgsl. if(size(SharedInfo.Includelist) <> 0) @@ -110,28 +99,8 @@ PrintStringInfo('EXEFILE = $(SCI2CDIR)/$(EXEFILENAME)', FileInfo.MakefileFilenam // Sources //Check the output format selected and insert files according to it -target = SharedInfo.Target; PrintStringInfo('SRC = $(wildcard $(CSRCDIR)/*.c)', FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('SRCC = $(wildcard $(CSRCDIR)/*.cpp)', FileInfo.MakefileFilename,'file','y','y'); -// allSources = getAllSources(SharedInfo); -// nbSources = size(allSources); - -// for i = 1:(nbSources(1) - 1) -// [tmppath,tmpfile,tmpext] = fileparts(allSources(i)); - -// if(~isempty(strstr(allSources(i),'dode'))) -// if(size(SharedInfo.Includelist) <> 0) -// if((mtlb_strcmp(part(SharedInfo.Includelist(1),1:5),'odefn') == %T)) -// PrintStringInfo(' $(CSRCDIR)/'+tmpfile+tmpext+' \\', FileInfo.MakefileFilename,'file','y','y'); -// end -// end -// else -// PrintStringInfo(' $(CSRCDIR)/'+tmpfile+tmpext+' \\', FileInfo.MakefileFilename,'file','y','y'); -// end -// end - -// [tmppath,tmpfile,tmpext] = fileparts(allSources(nbSources(1))); -// PrintStringInfo(' $(CSRCDIR)/'+tmpfile+tmpext, FileInfo.MakefileFilename,'file','y','y'); // Objects PrintStringInfo('OBJ = $(SRC:.c=.o)', FileInfo.MakefileFilename,'file','y','y'); diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile_msvc.sci b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile_msvc.sci index b49a2c31..00ffb63c 100644 --- a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile_msvc.sci +++ b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile_msvc.sci @@ -24,6 +24,8 @@ MakefileFilename = FileInfo.MakefileFilename + '.mak'; PrintStepInfo('Generating Builder '+MakefileFilename,... FileInfo.GeneralReport,'both'); +target = SharedInfo.Target; + PrintStringInfo('# SCI2C Makefile (Visual Studio 2008)',MakefileFilename,'file','y','y'); PrintStringInfo('# hArtes EU Project.',MakefileFilename,'file','y','y'); PrintStringInfo('# Authors: PoliBa & Inria & DIGITEO',MakefileFilename,'file','y','y'); @@ -35,37 +37,54 @@ PrintStringInfo('# --- DIRECTORIES AND FILES ---',MakefileFilename,'file','y','y makecsrcdir = pathconvert('src/c', %f, %f, 'u'); makehsrcdir = pathconvert('includes', %f, %f, 'u'); makeisrcdir = pathconvert('interfaces', %f, %f, 'u'); +makelibdir = pathconvert('libraries', %f, %f, 'u'); makesci2cdir = FileInfo.CStyleOutCCCodeDir; + PrintStringInfo('CSRCDIR = '+makecsrcdir,MakefileFilename,'file','y','y'); PrintStringInfo('HSRCDIR = '+makehsrcdir,MakefileFilename,'file','y','y'); PrintStringInfo('ISRCDIR = '+makeisrcdir,MakefileFilename,'file','y','y'); PrintStringInfo('SCI2CDIR = .',MakefileFilename,'file','y','y'); PrintStringInfo('DIR_OBJ=Release',MakefileFilename,'file','y','y'); -PrintStringInfo('LAPACK_LIB =$(SCI2CDIR)/external-libs/lapack.lib',MakefileFilename,'file','y','y'); -PrintStringInfo('BLAS_LIB = $(SCI2CDIR)/external-libs/blasplus.lib',MakefileFilename,'file','y','y'); +//PrintStringInfo('LAPACK_LIB =$(SCI2CDIR)/libraries/lapack.lib',MakefileFilename,'file','y','y'); +//PrintStringInfo('BLAS_LIB = $(SCI2CDIR)/libraries/blasplus.lib',MakefileFilename,'file','y','y'); +PrintStringInfo('LIB_PATH = $(SCI2CDIR)/libraries',MakefileFilename,'file','y','y'); +PrintStringInfo('LIBS = lapack.lib blasplus.lib',MakefileFilename,'file','y','y'); +PrintStringInfo('LIBS = $(LIBS) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib',MakefileFilename,'file','y','y'); PrintStringInfo('CC = cl',MakefileFilename,'file','y','y'); PrintStringInfo('LINKER = link',MakefileFilename,'file','y','y'); PrintStringInfo('LINKER_OPTIMISATION_MODE=/RELEASE ',MakefileFilename,'file','y','y'); -PrintStringInfo('CC__OPTIMISATION_MODE=-Z7 -O2 -MD',MakefileFilename,'file','y','y'); +PrintStringInfo('CC__OPTIMISATION_MODE=-Z7 -O2 -MT',MakefileFilename,'file','y','y'); PrintStringInfo('CC_OPTIONS = $(CC_COMMON) -W3 -Gd $(CC__OPTIMISATION_MODE) /Fo""$(DIR_OBJ)/"" /Fd""$(DIR_OBJ)/"" ',MakefileFilename,'file','y','y'); PrintStringInfo('CFLAGS = $(CC_OPTIONS) -I""$(HSRCDIR)"" -I""$(ISRCDIR)"" /EHsc /TP ',MakefileFilename,'file','y','y'); -PrintStringInfo('EXEFILENAME = mytest',MakefileFilename,'file','y','y'); +PrintStringInfo('EXEFILENAME = '+SharedInfo.SCIMainFunName,MakefileFilename,'file','y','y'); PrintStringInfo('EXEFILE = $(SCI2CDIR)\\$(EXEFILENAME)',MakefileFilename,'file','y','y'); PrintStringInfo('MAIN_SRC = $(SCI2CDIR)/main.c',MakefileFilename,'file','y','y'); -// Sources -PrintStringInfo('SRC = \\', MakefileFilename,'file','y','y'); -allSources = getAllSources(); -nbSources = size(allSources); -for i = 1:(nbSources(1) - 1) - [tmppath,tmpfile,tmpext] = fileparts(allSources(i)); - PrintStringInfo(' $(CSRCDIR)/'+tmpfile+tmpext+' \\', MakefileFilename,'file','y','y'); +if(SharedInfo.OpenCVUsed == %T) + PrintStringInfo('LIBS = $(LIBS) opencv_calib3d2413.lib opencv_contrib2413.lib opencv_features2d2413.lib',MakefileFilename,'file','y','y'); + PrintStringInfo('LIBS = $(LIBS) opencv_flann2413.lib opencv_gpu2413.lib opencv_highgui2413.lib ',MakefileFilename,'file','y','y'); + PrintStringInfo('LIBS = $(LIBS) opencv_imgproc2413.lib opencv_legacy2413.lib opencv_ml2413.lib opencv_nonfree2413.lib',MakefileFilename,'file','y','y'); + PrintStringInfo('LIBS = $(LIBS) opencv_objdetect2413.lib opencv_ocl2413.lib opencv_photo2413.lib opencv_stitching2413.lib',MakefileFilename,'file','y','y'); + PrintStringInfo('LIBS = $(LIBS) opencv_superres2413.lib opencv_ts2413.lib opencv_video2413.lib opencv_videostab2413.lib opencv_core2413.lib',MakefileFilename,'file','y','y'); + PrintStringInfo('LIBS = $(LIBS) IlmImf.lib libjpeg.lib libjasper.lib libtiff.lib libpng.lib zlib.lib',MakefileFilename,'file','y','y'); end -[tmppath,tmpfile,tmpext] = fileparts(allSources(nbSources(1))); -PrintStringInfo(' $(CSRCDIR)/'+tmpfile+tmpext, MakefileFilename,'file','y','y'); +// Sources +PrintStringInfo('SRC = $(CSRCDIR)/*.c', MakefileFilename,'file','y','y'); +PrintStringInfo('SRCC = $(CSRCDIR)/*.cpp', MakefileFilename,'file','y','y'); + +//PrintStringInfo('SRC = \\', MakefileFilename,'file','y','y'); +//allSources = getAllSources(); +//nbSources = size(allSources); +//for i = 1:(nbSources(1) - 1) +// [tmppath,tmpfile,tmpext] = fileparts(allSources(i)); +// PrintStringInfo(' $(CSRCDIR)/'+tmpfile+tmpext+' \\', MakefileFilename,'file','y','y'); +//end +//[tmppath,tmpfile,tmpext] = fileparts(allSources(nbSources(1))); +//PrintStringInfo(' $(CSRCDIR)/'+tmpfile+tmpext, MakefileFilename,'file','y','y'); PrintStringInfo('OBJ = $(SRC:.c=.obj) $(MAIN_SRC:.c=.obj)',MakefileFilename,'file','y','y'); +PrintStringInfo('OBJC = $(SRCC:.cpp=.o)', MakefileFilename,'file','y','y'); PrintStringInfo('# ---------------',MakefileFilename,'file','y','y'); PrintStringInfo('# --- TARGETS ---',MakefileFilename,'file','y','y'); PrintStringInfo('# ---------------',MakefileFilename,'file','y','y'); @@ -75,12 +94,14 @@ PrintStringInfo('\t@echo ""============================""',MakefileFilename,'fil PrintStringInfo('\t@echo ""Generation of the executable""',MakefileFilename,'file','y','y'); PrintStringInfo('\t@echo ""============================""',MakefileFilename,'file','y','y'); PrintStringInfo('\t-IF NOT EXIST $(DIR_OBJ) mkdir $(DIR_OBJ)',MakefileFilename,'file','y','y'); -PrintStringInfo('\t$(CC) $(CFLAGS) $(SRC) $(MAIN_SRC) /link $(LAPACK_LIB) $(BLAS_LIB) /out:$(EXEFILE).exe',MakefileFilename,'file','y','y'); +PrintStringInfo('\t$(CC) $(CFLAGS) $(SRC) $(SRCC) $(MAIN_SRC) /link /LIBPATH:$(LIB_PATH) $(LIBS) /out:$(EXEFILE).exe',MakefileFilename,'file','y','y'); PrintStringInfo('\t@echo "" ""',MakefileFilename,'file','y','y'); -PrintStringInfo('\t@echo ""==============""',MakefileFilename,'file','y','y'); -PrintStringInfo('\t@echo ""Executing code""',MakefileFilename,'file','y','y'); -PrintStringInfo('\t@echo ""==============""',MakefileFilename,'file','y','y'); -PrintStringInfo('\t$(EXEFILE).exe',MakefileFilename,'file','y','y'); +if(target == "StandAlone") + PrintStringInfo('\t@echo ""==============""',MakefileFilename,'file','y','y'); + PrintStringInfo('\t@echo ""Executing code""',MakefileFilename,'file','y','y'); + PrintStringInfo('\t@echo ""==============""',MakefileFilename,'file','y','y'); + PrintStringInfo('\t$(EXEFILE).exe',MakefileFilename,'file','y','y'); +end PrintStringInfo('clean:',MakefileFilename,'file','y','y'); PrintStringInfo('\t@echo "" ""',MakefileFilename,'file','y','y'); PrintStringInfo('\t@echo ""=============================""',MakefileFilename,'file','y','y'); diff --git a/2.3-1/macros/CCodeGeneration/lib b/2.3-1/macros/CCodeGeneration/lib new file mode 100644 index 00000000..ef0ea492 Binary files /dev/null and b/2.3-1/macros/CCodeGeneration/lib differ diff --git a/2.3-1/macros/CCodeGeneration/names b/2.3-1/macros/CCodeGeneration/names new file mode 100644 index 00000000..efbb400a --- /dev/null +++ b/2.3-1/macros/CCodeGeneration/names @@ -0,0 +1,23 @@ +C_FinalizeCode +C_ForExpression +C_Funcall +C_GenDeclarations +C_GenerateFunName +C_GenerateLaunchScript +C_GenerateMakefile +C_GenerateMakefile_msvc +C_GenerateSCI2CHeader +C_IfElseBlocks +C_IfExpression +C_IndentBlanks +C_InitHeader +C_MemAllocOutTempVars +C_SCI2CHeader +C_Type +C_WhileExpression +GenCFunDatFiles +GetClsFileName +GetSymbolDimension +GetWhileCondVariable +JoinDeclarAndCcode +Sci2AnnotationFile diff --git a/2.3-1/macros/ErrorMessages/lib b/2.3-1/macros/ErrorMessages/lib new file mode 100644 index 00000000..5b1667c2 Binary files /dev/null and b/2.3-1/macros/ErrorMessages/lib differ diff --git a/2.3-1/macros/ErrorMessages/names b/2.3-1/macros/ErrorMessages/names new file mode 100644 index 00000000..f55e8f8b --- /dev/null +++ b/2.3-1/macros/ErrorMessages/names @@ -0,0 +1,3 @@ +EM_NanSize +EM_UnknownStep +EM_ZeroSize diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.sci index c5f39abd..4cd6467d 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.sci @@ -12,7 +12,7 @@ if (isnum(in1val)) then //disp(out); else - error(36, "Wrong input argument '+in1val+'."); + error(36, "Wrong input argument "+in1val+"."); end if (in2_num>10) then diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.sci index fc205254..75d0cb07 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.sci @@ -9,7 +9,7 @@ if (isnum(inval)) then //disp(out); else - error(36, "Wrong input argument '+inval+'."); + error(36, "Wrong input argument "+inval+"."); end diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.sci index 688e1da4..c1e07773 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.sci @@ -9,7 +9,7 @@ if (isnum(inval)) then //disp(out); else - error(36, "Wrong input argument '+inval+'."); + error(36, "Wrong input argument "+inval+"."); end diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.sci index 44544ccc..056d333d 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.sci @@ -9,7 +9,7 @@ if (isnum(inval)) then //disp(out); else - error(36, "Wrong input argument '+inval+'."); + error(36, "Wrong input argument "+inval+"."); end diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.sci index e44f036a..d816ff75 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.sci @@ -9,7 +9,7 @@ if (isnum(inval)) then //disp(out); else - error(36, "Wrong input argument '+inval+'."); + error(36, "Wrong input argument "+inval+"."); end diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci index bb02b985..5ff03a60 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci @@ -33,4 +33,4 @@ else end -endfunction: +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.sci index 69a816cc..86f2aa7d 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.sci @@ -30,4 +30,4 @@ SCI2CNInArgCheck(argn(1),1,1); in1num = string(eval(insize(1))); outsize = in1num; -endfunction: +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.sci index 7b945310..5a450686 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.sci @@ -9,7 +9,7 @@ if (isnum(inval)) then //disp(out); else - error(36, "Wrong input argument '+inval+'."); + error(36, "Wrong input argument "+inval+"."); end diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci index f99d156e..50b897e0 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci @@ -44,7 +44,7 @@ elseif(inval == '2') then outsize(1) = string(in1num_c); outsize(2) = string(in1num_c + in2num_c); else - error(36, "Wrong input argument '+inval+'. Use 1 or 2 as first argument in cat command."); + error(36, "Wrong input argument "+inval+". Use 1 or 2 as first argument in cat command."); end endfunction diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib new file mode 100644 index 00000000..d9cc4762 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/lib differ diff --git a/2.3-1/macros/FunctionAnnotation/names b/2.3-1/macros/FunctionAnnotation/names new file mode 100644 index 00000000..8962de09 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/names @@ -0,0 +1,74 @@ +FA_ADD +FA_DIV +FA_GetDefaultPrecision +FA_GetFunAnn +FA_GetOutArgInfo +FA_GetResizeApproach +FA_INT +FA_MAX +FA_MIN +FA_MUL +FA_REAL +FA_SCHUR_SZ +FA_SCHUR_TP +FA_SUB +FA_SZ_1 +FA_SZ_2 +FA_SZ_COLUMN_DIAG +FA_SZ_COL_DIAG_IN_EX +FA_SZ_DEC2BASE +FA_SZ_DEC2BIN +FA_SZ_DEC2HEX +FA_SZ_DEC2OCT +FA_SZ_DIFF +FA_SZ_FACTOR +FA_SZ_FROM_VAL +FA_SZ_LINSPACE_ROW +FA_SZ_LQE +FA_SZ_LQR +FA_SZ_OBSCNT +FA_SZ_OPAPEX +FA_SZ_OPBACKSLASH +FA_SZ_OPCC +FA_SZ_OPDOTAPEX +FA_SZ_OPDOTBACKSLASH +FA_SZ_OPDOTHAT +FA_SZ_OPDOTSLASH +FA_SZ_OPDOTSTAR +FA_SZ_OPHAT +FA_SZ_OPLOGAND +FA_SZ_OPLOGEQ +FA_SZ_OPLOGGE +FA_SZ_OPLOGGT +FA_SZ_OPLOGLE +FA_SZ_OPLOGLT +FA_SZ_OPLOGNE +FA_SZ_OPLOGNOT +FA_SZ_OPLOGOR +FA_SZ_OPMINUS +FA_SZ_OPPLUS +FA_SZ_OPPLUSA +FA_SZ_OPRC +FA_SZ_OPSLASH +FA_SZ_OPSTAR +FA_SZ_PRIMES +FA_SZ_ROW_COLUMN_CAT +FA_SZ_ROW_DIAG +FA_SZ_ROW_DIAG_INS_EXT +FA_SZ_SEL1 +FA_SZ_SEL2 +FA_TP_C +FA_TP_COMPLEX +FA_TP_CVIMAGE +FA_TP_D +FA_TP_I +FA_TP_INT16 +FA_TP_INT8 +FA_TP_MAX +FA_TP_MIN_REAL +FA_TP_REAL +FA_TP_S +FA_TP_UINT16 +FA_TP_UINT8 +FA_TP_USER +FA_TP_Z diff --git a/2.3-1/macros/FunctionList/lib b/2.3-1/macros/FunctionList/lib new file mode 100644 index 00000000..fc8038c9 Binary files /dev/null and b/2.3-1/macros/FunctionList/lib differ diff --git a/2.3-1/macros/FunctionList/names b/2.3-1/macros/FunctionList/names new file mode 100644 index 00000000..c40e30ca --- /dev/null +++ b/2.3-1/macros/FunctionList/names @@ -0,0 +1,6 @@ +FL_ExistCFunction +FL_ExtractFuncList +FL_GetFunctionClass +FL_InOutArgs2CFunNames +FL_UpdateConverted +FL_UpdateToBeConv diff --git a/2.3-1/macros/GeneralFunctions/lib b/2.3-1/macros/GeneralFunctions/lib new file mode 100644 index 00000000..1c78f72c Binary files /dev/null and b/2.3-1/macros/GeneralFunctions/lib differ diff --git a/2.3-1/macros/GeneralFunctions/names b/2.3-1/macros/GeneralFunctions/names new file mode 100644 index 00000000..eb8300a1 --- /dev/null +++ b/2.3-1/macros/GeneralFunctions/names @@ -0,0 +1,28 @@ +Array2String +ConvertPathMat2C +File2StringArray +FunName2SciFileName +IsNanSize +KeyStr2FileStrPos +PrintStepInfo +PrintStringInfo +ReadStringCard +SCI2CCreateDir +SCI2CFindFile +SCI2CNInArgCheck +SCI2COpenFileRead +SCI2COpenFileWrite +SCI2CTemplate +SCI2Ccopyfile +SCI2Cfileexist +SCI2Cflipud +SCI2Cmdelete +SCI2Cresize +SCI2Cstring +SCI2Cstrncmp +SCI2Cstrncmps1size +SizeInByte +dispina +filenamefprintf +float +squeezestrings diff --git a/2.3-1/macros/Hardware/AVR/lib b/2.3-1/macros/Hardware/AVR/lib new file mode 100644 index 00000000..16d9e3ea Binary files /dev/null and b/2.3-1/macros/Hardware/AVR/lib differ diff --git a/2.3-1/macros/Hardware/AVR/names b/2.3-1/macros/Hardware/AVR/names new file mode 100644 index 00000000..8fcfdb75 --- /dev/null +++ b/2.3-1/macros/Hardware/AVR/names @@ -0,0 +1,22 @@ +AVRADCSetup +AVRDigitalIn +AVRDigitalOut +AVRDigitalPortSetup +AVRDigitalSetup +AVRGetTimerValue +AVRPWM0SetDuty +AVRPWM0Setup +AVRPWM1SetDuty +AVRPWM1Setup +AVRPWM2SetDuty +AVRPWM2Setup +AVRReadADC +AVRSleep +AVRTimerSetup +AVRUARTReceive +AVRUARTSetup +AVRUARTTransmit +GetAVRSupportFunctions +GetPeripheral +InsertPeripheralInList +IsAVRSupportFunction diff --git a/2.3-1/macros/Hardware/RasberryPi/lib b/2.3-1/macros/Hardware/RasberryPi/lib new file mode 100644 index 00000000..b92a6ea7 Binary files /dev/null and b/2.3-1/macros/Hardware/RasberryPi/lib differ diff --git a/2.3-1/macros/Hardware/RasberryPi/names b/2.3-1/macros/Hardware/RasberryPi/names new file mode 100644 index 00000000..fa647761 --- /dev/null +++ b/2.3-1/macros/Hardware/RasberryPi/names @@ -0,0 +1,21 @@ +GetRPISupportFunctions +IsRPISupportFunction +RPI_DelayMicro +RPI_DelayMilli +RPI_DigitalIn +RPI_DigitalOut +RPI_DigitalSetup +RPI_GetMicros +RPI_GetMillis +RPI_HardPWMSetClock +RPI_HardPWMSetMode +RPI_HardPWMSetRange +RPI_HardPWMWrite +RPI_PinISR +RPI_SerialClose +RPI_SerialFlush +RPI_SerialGetChar +RPI_SerialSendChar +RPI_SerialSendData +RPI_SerialSetup +u16RPISerialDataAvail diff --git a/2.3-1/macros/ImageProcessing/core/lib b/2.3-1/macros/ImageProcessing/core/lib new file mode 100644 index 00000000..87c0f305 Binary files /dev/null and b/2.3-1/macros/ImageProcessing/core/lib differ diff --git a/2.3-1/macros/ImageProcessing/core/names b/2.3-1/macros/ImageProcessing/core/names new file mode 100644 index 00000000..f56c951c --- /dev/null +++ b/2.3-1/macros/ImageProcessing/core/names @@ -0,0 +1,2 @@ +CV_CreateImage +CV_GetImgSize diff --git a/2.3-1/macros/ImageProcessing/highgui/lib b/2.3-1/macros/ImageProcessing/highgui/lib new file mode 100644 index 00000000..8f5561e0 Binary files /dev/null and b/2.3-1/macros/ImageProcessing/highgui/lib differ diff --git a/2.3-1/macros/ImageProcessing/highgui/names b/2.3-1/macros/ImageProcessing/highgui/names new file mode 100644 index 00000000..a717164a --- /dev/null +++ b/2.3-1/macros/ImageProcessing/highgui/names @@ -0,0 +1,4 @@ +CV_LoadImage +CV_SaveImage +CV_ShowImage +CV_WaitKey diff --git a/2.3-1/macros/ImageProcessing/imgproc/lib b/2.3-1/macros/ImageProcessing/imgproc/lib new file mode 100644 index 00000000..c8b45d34 Binary files /dev/null and b/2.3-1/macros/ImageProcessing/imgproc/lib differ diff --git a/2.3-1/macros/ImageProcessing/imgproc/names b/2.3-1/macros/ImageProcessing/imgproc/names new file mode 100644 index 00000000..16240f53 --- /dev/null +++ b/2.3-1/macros/ImageProcessing/imgproc/names @@ -0,0 +1,11 @@ +CV_AdaptiveThreshold +CV_Blur +CV_Canny +CV_CornerHarris +CV_CvtColor +CV_Dilate +CV_DistanceTransform +CV_Erode +CV_GaussianBlur +CV_MedianBlur +CV_Threshold diff --git a/2.3-1/macros/Scilab-Arduino/lib b/2.3-1/macros/Scilab-Arduino/lib new file mode 100644 index 00000000..da395a36 Binary files /dev/null and b/2.3-1/macros/Scilab-Arduino/lib differ diff --git a/2.3-1/macros/Scilab-Arduino/names b/2.3-1/macros/Scilab-Arduino/names new file mode 100644 index 00000000..55eb6fef --- /dev/null +++ b/2.3-1/macros/Scilab-Arduino/names @@ -0,0 +1,6 @@ +GenerateSetupFunction +GetArduinoFunctions +GetArduinoSetupFunctions +InsertSetupInList +IsArduinoFunction +IsArduinoSetupFunction diff --git a/2.3-1/macros/SymbolTable/lib b/2.3-1/macros/SymbolTable/lib new file mode 100644 index 00000000..f10d8ee9 Binary files /dev/null and b/2.3-1/macros/SymbolTable/lib differ diff --git a/2.3-1/macros/SymbolTable/names b/2.3-1/macros/SymbolTable/names new file mode 100644 index 00000000..b5a7d65f --- /dev/null +++ b/2.3-1/macros/SymbolTable/names @@ -0,0 +1,12 @@ +ST_AnalyzeScope +ST_Del +ST_FindPos +ST_Get +ST_GetInArgInfo +ST_GetSymbolInfo +ST_InsForCntVars +ST_InsOutArg +ST_Load +ST_MatchSymbol +ST_Save +ST_Set diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci index 0bd402ac..8c5aee70 100644 --- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -6581,18 +6581,14 @@ ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 3',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(1)= FA_SZ_1(FA_SZ_OBSCNT(IN(1).VAL,IN(1).SZ(1), ... - IN(1).SZ(2),NOutArg))',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= FA_SZ_2(FA_SZ_OBSCNT(IN(1).VAL,IN(1).SZ(1), ... - IN(1).SZ(2),NOutArg))',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(1)= FA_SZ_1(FA_SZ_OBSCNT(IN(1).VAL,IN(1).SZ(1),IN(1).SZ(2),NOutArg))',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(2)= FA_SZ_2(FA_SZ_OBSCNT(IN(1).VAL,IN(1).SZ(1),IN(1).SZ(2),NOutArg))',ClassFileName,'file','y'); PrintStringInfo('NIN= 3',ClassFileName,'file','y'); PrintStringInfo('NOUT= 2',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(1)= FA_SZ_1(FA_SZ_OBSCNT(IN(1).VAL,IN(1).SZ(1), ... - IN(1).SZ(2),NOutArg))',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= FA_SZ_2(FA_SZ_OBSCNT(IN(1).VAL,IN(1).SZ(1), ... - IN(1).SZ(2),NOutArg))',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(1)= FA_SZ_1(FA_SZ_OBSCNT(IN(1).VAL,IN(1).SZ(1),IN(1).SZ(2),NOutArg))',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(2)= FA_SZ_2(FA_SZ_OBSCNT(IN(1).VAL,IN(1).SZ(1),IN(1).SZ(2),NOutArg))',ClassFileName,'file','y'); PrintStringInfo('OUT(2).TP= ''d''',ClassFileName,'file','y'); PrintStringInfo('OUT(2).SZ(1)= ''1''',ClassFileName,'file','y'); PrintStringInfo('OUT(2).SZ(2)= ''2''',ClassFileName,'file','y'); diff --git a/2.3-1/macros/ToolInitialization/lib b/2.3-1/macros/ToolInitialization/lib new file mode 100644 index 00000000..439f3abf Binary files /dev/null and b/2.3-1/macros/ToolInitialization/lib differ diff --git a/2.3-1/macros/ToolInitialization/names b/2.3-1/macros/ToolInitialization/names new file mode 100644 index 00000000..71a724d3 --- /dev/null +++ b/2.3-1/macros/ToolInitialization/names @@ -0,0 +1,14 @@ +INIT_CreateDirs +INIT_FillSCI2LibCDirs +INIT_GenAnnFLFunctions +INIT_GenFileInfo +INIT_GenLibraries +INIT_GenSharedInfo +INIT_LoadLibraries +INIT_RemoveDirs +INIT_SCI2C +INIT_SharedInfoEqual +ManageNextConversion +UpdateSCI2CInfo +doublecomplex +floatcomplex diff --git a/2.3-1/macros/findDeps/getAllLibraries.sci b/2.3-1/macros/findDeps/getAllLibraries.sci index 73923773..14fc020a 100644 --- a/2.3-1/macros/findDeps/getAllLibraries.sci +++ b/2.3-1/macros/findDeps/getAllLibraries.sci @@ -65,7 +65,7 @@ function allLibraries = getAllLibraries(SharedInfo) allLibraries = cat(1,allLibraries,RPi_cvlibs) end elseif Target == "StandAlone" - allLibraries =[]; + allLibraries =["thirdparty/lib/pc/windows/x64/Lapack"]; if (SharedInfo.OpenCVUsed == %T) os_arch = system_getproperty('os.arch'); if(getos() == 'Linux' & os_arch == 'amd64') diff --git a/2.3-1/macros/findDeps/lib b/2.3-1/macros/findDeps/lib new file mode 100644 index 00000000..25edeed7 Binary files /dev/null and b/2.3-1/macros/findDeps/lib differ diff --git a/2.3-1/macros/findDeps/names b/2.3-1/macros/findDeps/names new file mode 100644 index 00000000..2b8c551b --- /dev/null +++ b/2.3-1/macros/findDeps/names @@ -0,0 +1,7 @@ +Scilab2CDeps +findDeps +getAllHeaders +getAllInterfaces +getAllLibraries +getAllSources +getArduinoFiles diff --git a/2.3-1/macros/lib b/2.3-1/macros/lib new file mode 100644 index 00000000..fcbd1b8d Binary files /dev/null and b/2.3-1/macros/lib differ diff --git a/2.3-1/macros/names b/2.3-1/macros/names new file mode 100644 index 00000000..a126347e --- /dev/null +++ b/2.3-1/macros/names @@ -0,0 +1,6 @@ +cb_sci2c_gui +getScilab2cVersion +runsci2c +runscicode +sci2c_gui +scilab2c diff --git a/2.3-1/macros/runsci2c.sci b/2.3-1/macros/runsci2c.sci index b5baa15b..eb32a4b5 100644 --- a/2.3-1/macros/runsci2c.sci +++ b/2.3-1/macros/runsci2c.sci @@ -187,7 +187,7 @@ else copyBlasLapackLibs(FileInfo,SharedInfo); //Previously .dll files and blas,lapack library not creating for cygwin by additing this works fine end if BuildTool == "nmake" - copyBlasLapackLibs(FileInfo,SharedInfo); + //copyBlasLapackLibs(FileInfo,SharedInfo); C_GenerateMakefile_msvc(FileInfo,SharedInfo); end end diff --git a/2.3-1/src/c/CACSD/lqe/dlqea.c b/2.3-1/src/c/CACSD/lqe/dlqea.c index bc729fb9..63f8d62d 100644 --- a/2.3-1/src/c/CACSD/lqe/dlqea.c +++ b/2.3-1/src/c/CACSD/lqe/dlqea.c @@ -12,6 +12,7 @@ /*Function for calculating lqe gain. Refer 'lqe.sci' in scilab source.*/ +#include #include "lqr.h" #include "matrixTranspose.h" @@ -24,8 +25,8 @@ void dlqea(double* sys, int sys_rows, int sys_cols, double* X, double* K) int sys_lqr_cols = sys_rows + 2; int no_of_ip, no_of_st; - no_of_ip = sys[sys_rows*(sys_cols-1)+1]; - no_of_st = sys[sys_rows*(sys_cols-1)]; + no_of_ip = (int)sys[sys_rows*(sys_cols-1)+1]; + no_of_st = (int)sys[sys_rows*(sys_cols-1)]; /*Transpose given system and calculate LQR with new system. Transpose result got from LQR*/ diff --git a/2.3-1/src/c/CACSD/lqr/dlqra.c b/2.3-1/src/c/CACSD/lqr/dlqra.c index 26a5e6c4..02ac1504 100644 --- a/2.3-1/src/c/CACSD/lqr/dlqra.c +++ b/2.3-1/src/c/CACSD/lqr/dlqra.c @@ -26,8 +26,8 @@ void dlqra(double* sys, int sys_rows, int sys_cols, double* X, double* K) { int no_of_states, no_of_inputs, no_of_outputs, dom = 1; int row,col; - no_of_states = sys[sys_rows*(sys_cols-1)]; - no_of_inputs = sys[sys_rows*(sys_cols-1) + 1]; + no_of_states = (int)sys[sys_rows*(sys_cols-1)]; + no_of_inputs = (int)sys[sys_rows*(sys_cols-1) + 1]; no_of_outputs = sys_rows - no_of_states; double *A, *B, *C, *D; @@ -88,7 +88,7 @@ void dlqra(double* sys, int sys_rows, int sys_cols, double* X, double* K) } } - dom = sys[(sys_rows*(sys_cols-2)) + no_of_states]; + dom = (int)sys[(sys_rows*(sys_cols-2)) + no_of_states]; Q = (double*) malloc (no_of_states*no_of_states*sizeof(double)); R = (double*) malloc (no_of_inputs*no_of_inputs*sizeof(double)); @@ -186,7 +186,7 @@ void dlqra(double* sys, int sys_rows, int sys_cols, double* X, double* K) /*Find schur decomposition of LA*/ wsmall = (double*) malloc(4*no_of_states*no_of_states*sizeof(double)); - ks = dschura(LA,2*no_of_states,1,2,wsmall,NULL); + ks = (int)dschura(LA,2*no_of_states,1,2,wsmall,NULL); X12 = (double*) malloc(no_of_states*no_of_states*sizeof(double)); phi12 = (double*) malloc(no_of_states*no_of_states*sizeof(double)); @@ -285,7 +285,7 @@ void dlqra(double* sys, int sys_rows, int sys_cols, double* X, double* K) /*Find schur decomposition of LA*/ wsmall = (double*) malloc(4*no_of_states*no_of_states*sizeof(double)); - ks = dgschura(LA,2*no_of_states,LE,2,2,wsmall,NULL,NULL,NULL); + ks = (int)dgschura(LA,2*no_of_states,LE,2,2,wsmall,NULL,NULL,NULL); X12 = (double*) malloc(no_of_states*no_of_states*sizeof(double)); phi12 = (double*) malloc(no_of_states*no_of_states*sizeof(double)); diff --git a/2.3-1/src/c/CACSD/obscont/dobsconta.c b/2.3-1/src/c/CACSD/obscont/dobsconta.c index 7e297525..88837692 100644 --- a/2.3-1/src/c/CACSD/obscont/dobsconta.c +++ b/2.3-1/src/c/CACSD/obscont/dobsconta.c @@ -22,8 +22,8 @@ void dobsconta(double* sys, int sys_rows, int sys_cols, double* Kc, double* Kf, { int no_of_states, no_of_inputs, no_of_outputs, dom = 1; int row,col; - no_of_states = sys[sys_rows*(sys_cols-1)]; - no_of_inputs = sys[sys_rows*(sys_cols-1) + 1]; + no_of_states = (int)sys[sys_rows*(sys_cols-1)]; + no_of_inputs = (int)sys[sys_rows*(sys_cols-1) + 1]; no_of_outputs = sys_rows - no_of_states; int no_of_cols; @@ -85,7 +85,7 @@ void dobsconta(double* sys, int sys_rows, int sys_cols, double* Kc, double* Kf, } } - dom = sys[(sys_rows*(sys_cols-2)) + no_of_states]; + (int)dom = sys[(sys_rows*(sys_cols-2)) + no_of_states]; dmulma(B,no_of_states,no_of_inputs,Kc,no_of_inputs,no_of_states,BKc); dmulma(Kf,no_of_states,no_of_outputs,C,no_of_outputs,no_of_states,KfC); diff --git a/2.3-1/src/c/auxiliaryFunctions/isnan/cisnans.c b/2.3-1/src/c/auxiliaryFunctions/isnan/cisnans.c index 7fc0759f..623cea0b 100644 --- a/2.3-1/src/c/auxiliaryFunctions/isnan/cisnans.c +++ b/2.3-1/src/c/auxiliaryFunctions/isnan/cisnans.c @@ -10,14 +10,11 @@ * */ +#ifdef _WIN32 +#include +#endif - -#ifdef _MSC_VER -#include -#define isnan(x) _isnan((double)x) -#endif - -#include "isnan.h" +#include "isnan.h" float cisnans(floatComplex in) { diff --git a/2.3-1/src/c/auxiliaryFunctions/isnan/disnans.c b/2.3-1/src/c/auxiliaryFunctions/isnan/disnans.c index 0d0a5699..99b5b664 100644 --- a/2.3-1/src/c/auxiliaryFunctions/isnan/disnans.c +++ b/2.3-1/src/c/auxiliaryFunctions/isnan/disnans.c @@ -10,10 +10,10 @@ * */ -#ifdef _MSC_VER -#include -#define isnan(x) _isnan((double)x) -#endif + +#ifdef _WIN32 +#include +#endif #include "isnan.h" diff --git a/2.3-1/src/c/auxiliaryFunctions/isnan/sisnans.c b/2.3-1/src/c/auxiliaryFunctions/isnan/sisnans.c index 201fd31a..905890b8 100644 --- a/2.3-1/src/c/auxiliaryFunctions/isnan/sisnans.c +++ b/2.3-1/src/c/auxiliaryFunctions/isnan/sisnans.c @@ -10,10 +10,10 @@ * */ -#ifdef _MSC_VER -#include -#define isnan(x) _isnan((double)x) -#endif + +#ifdef _WIN32 +#include +#endif #include "isnan.h" diff --git a/2.3-1/src/c/auxiliaryFunctions/isnan/zisnans.c b/2.3-1/src/c/auxiliaryFunctions/isnan/zisnans.c index b7ebc1bb..95cfd972 100644 --- a/2.3-1/src/c/auxiliaryFunctions/isnan/zisnans.c +++ b/2.3-1/src/c/auxiliaryFunctions/isnan/zisnans.c @@ -10,10 +10,9 @@ * */ -#ifdef _MSC_VER -#include -#define isnan(x) _isnan((double)x) -#endif +#ifdef _WIN32 +#include +#endif #include "isnan.h" diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/cosd/dcosda.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/cosd/dcosda.c index b48876e3..65a6f4a2 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/cosd/dcosda.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/cosd/dcosda.c @@ -1,14 +1,24 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "cosd.h" #include void dcosda(double* in,int size,double* out) { - double val=0.0; - val =3.14159265/180.0; int i=0; for (i=0;i #include "cos.h" #include "cosd.h" diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/cosd/scosda.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/cosd/scosda.c index 5224899b..7e0714db 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/cosd/scosda.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/cosd/scosda.c @@ -1,7 +1,20 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "cos.h" #include "cosd.h" -void scosda(float* in, int size, float* out) { +void scosda(float* in, int size, float* out) +{ int i = 0; for (i = 0; i < size; ++i) { out[i] = scosds(in[i]); diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/cosd/scosds.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/cosd/scosds.c index e99a1952..45c788ff 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/cosd/scosds.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/cosd/scosds.c @@ -1,3 +1,19 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +#ifdef _WIN32 + #define _USE_MATH_DEFINES +#endif + #include #include "cosd.h" #include "cos.h" diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/cotd/dcotda.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/cotd/dcotda.c index 3cf032a1..3a4b23c1 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/cotd/dcotda.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/cotd/dcotda.c @@ -1,16 +1,23 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "cotd.h" -#include -#define PI 3.14159265 void dcotda(double* in,int size,double* out) { - double val; int i=0; - val = PI / 180.0; for(i=0;i #include "cotd.h" double dcotds(double in) { -if(in==0) -printf("Inf\n"); return (1/tan((M_PI/180.0)*in)); } diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/cotd/scotda.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/cotd/scotda.c index fd5a1e11..fbdf0f50 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/cotd/scotda.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/cotd/scotda.c @@ -1,9 +1,20 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ #include "cotd.h" void scotda(float* in, int size, float* out) { int i = 0; for (i = 0; i < size; ++i) { - out[i] = scosds(in[i]); + out[i] = scotds(in[i]); } } diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/cotd/scotds.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/cotd/scotds.c index d635dbcd..e7e02b9d 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/cotd/scotds.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/cotd/scotds.c @@ -1,3 +1,19 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +#ifdef _WIN32 + #define _USE_MATH_DEFINES +#endif + #include #include "cotd.h" diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/coth/ccotha.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/coth/ccotha.c index 4e794512..44a366e8 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/coth/ccotha.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/coth/ccotha.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "coth.h" #include @@ -8,5 +20,5 @@ void ccotha(floatComplex* in, int size,floatComplex* out) { out[i] = ccoths(in[i]); } - return out; + } diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/coth/ccoths.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/coth/ccoths.c index 564b8e69..b7f90263 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/coth/ccoths.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/coth/ccoths.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include #include "coth.h" #include diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/coth/dcotha.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/coth/dcotha.c index f6304f58..bb54b200 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/coth/dcotha.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/coth/dcotha.c @@ -1,14 +1,24 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "coth.h" #include void dcotha(double* in,int size,double* out) { - double val; int i=0; for(i=0;i #include "coth.h" #include "cosh.h" diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/coth/scotha.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/coth/scotha.c index 3fdf37f7..53351621 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/coth/scotha.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/coth/scotha.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "coth.h" #include @@ -8,7 +20,6 @@ void scotha(float* in,int size,float* out) for(i=0;i #include "coth.h" #include "cosh.h" diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/coth/zcotha.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/coth/zcotha.c index dcbb2844..206cc43f 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/coth/zcotha.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/coth/zcotha.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "coth.h" #include diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/coth/zcoths.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/coth/zcoths.c index 2eed86bb..8b3b19f5 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/coth/zcoths.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/coth/zcoths.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "coth.h" #include "tanh.h" #include "tan.h" diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/ccsca.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/ccsca.c index 5f5504a5..7ec9a6b8 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/ccsca.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/ccsca.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "csc.h" #include diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/ccscs.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/ccscs.c index af8b3eb2..f16aa1b9 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/ccscs.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/ccscs.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include #include "sin.h" #include "cos.h" diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/dcsca.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/dcsca.c index eeedea52..b1a3cf3b 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/dcsca.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/dcsca.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "csc.h" void dcsca(double* in,int size,double* out) diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/dcscs.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/dcscs.c index 31a6944e..f9e128c2 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/dcscs.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/dcscs.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "csc.h" #include diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/scsca.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/scsca.c index 3e6963ac..cea8338f 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/scsca.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/scsca.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "csc.h" void scsca(float* in,int size,float* out) diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/scscs.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/scscs.c index 6d1b1b7f..f0ad15e4 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/scscs.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/scscs.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "csc.h" #include diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/zcsca.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/zcsca.c index 4b8cdad6..59430925 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/zcsca.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/zcsca.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "csc.h" #include diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/zcscs.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/zcscs.c index bbb15266..64fce57a 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/zcscs.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/csc/zcscs.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include #include "sin.h" #include "cos.h" @@ -9,10 +21,7 @@ doubleComplex zcscs(doubleComplex z) { - doubleComplex out; - //out = zrdivs(DoubleComplex(1,0),zsins(z)); double real = zreals(z); double imag = zimags(z); return zrdivs(DoubleComplex(1,0),(DoubleComplex(dsins(real) * dcoshs(imag), dcoss(real) * dsinhs(imag)))); - //return out; } diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/cscd/ccscda.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/cscd/ccscda.c index d18d3c71..ed13f9e7 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/cscd/ccscda.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/cscd/ccscda.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "csc.h" #include "cscd.h" #include diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/cscd/ccscds.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/cscd/ccscds.c index 8f1f9f75..39b2576a 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/cscd/ccscds.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/cscd/ccscds.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include #include "sin.h" #include "cos.h" diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/cscd/dcscda.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/cscd/dcscda.c index 43e00430..8ca3df94 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/cscd/dcscda.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/cscd/dcscda.c @@ -1,15 +1,24 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "cscd.h" #include -#define PI 3.14159265 void dcscda(double* in,int size,double* out) { - double val; int i=0; - val = PI / 180.0; for(i=0;i diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/cscd/scscda.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/cscd/scscda.c index 761d9413..17936628 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/cscd/scscda.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/cscd/scscda.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "cscd.h" void scscda(float* in,int size,float* out) diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/cscd/scscds.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/cscd/scscds.c index d4348549..ebf36d2d 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/cscd/scscds.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/cscd/scscds.c @@ -1,3 +1,20 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +#ifdef _WIN32 + #define _USE_MATH_DEFINES +#endif + + #include "cscd.h" #include diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/cscd/zcscda.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/cscd/zcscda.c index 02f9e3b2..a8a617c2 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/cscd/zcscda.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/cscd/zcscda.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "csc.h" #include "cscd.h" #include diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/cscd/zcscds.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/cscd/zcscds.c index 351c8ff2..47d5dfc1 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/cscd/zcscds.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/cscd/zcscds.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include #include "sin.h" #include "cos.h" diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/ccscha.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/ccscha.c index 02a9ec1d..a95da200 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/ccscha.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/ccscha.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "csch.h" #include diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/ccschs.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/ccschs.c index 177a9fa4..ddcc733f 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/ccschs.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/ccschs.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "csch.h" #include "sinh.h" #include "sin.h" diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/dcscha.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/dcscha.c index ce87b6f8..32489051 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/dcscha.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/dcscha.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "csch.h" void dcscha(double* in, int size, double* out) { diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/dcschs.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/dcschs.c index 3b22544f..7b1f15ae 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/dcschs.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/dcschs.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "csch.h" #include diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/scscha.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/scscha.c index 880ffaae..18d5ea79 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/scscha.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/scscha.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "csch.h" void scscha(float* in, int size, float* out) { diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/scschs.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/scschs.c index 8cd4e628..ec550850 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/scschs.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/scschs.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "csch.h" #include diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/zcscha.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/zcscha.c index ae659dec..fab5cc43 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/zcscha.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/zcscha.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "csch.h" #include diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/zcschs.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/zcschs.c index f3a9b227..33a4fccd 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/zcschs.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/csch/zcschs.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "csch.h" #include "sinh.h" #include "sin.h" diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/cseca.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/cseca.c index 139360af..fcb9b81a 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/cseca.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/cseca.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "sec.h" #include diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/csecs.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/csecs.c index 51ea2242..c2d9b9ed 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/csecs.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/csecs.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "sec.h" #include "cos.h" #include diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/dseca.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/dseca.c index 986b52f3..c39f7c6e 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/dseca.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/dseca.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "sec.h" #include diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/dsecs.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/dsecs.c index 9135ad14..5278b371 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/dsecs.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/dsecs.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include #include "sec.h" diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/sseca.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/sseca.c index f5fd81bc..0ac7cc62 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/sseca.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/sseca.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "sec.h" void sseca(float* in, int size, float* out) { diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/ssecs.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/ssecs.c index 2c9e018f..ad480005 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/ssecs.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/ssecs.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include #include "sec.h" diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/zseca.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/zseca.c index 7a80291f..dec365d1 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/zseca.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/zseca.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "sec.h" #include diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/zsecs.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/zsecs.c index b5468db5..9629db71 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/zsecs.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/sec/zsecs.c @@ -1,57 +1,26 @@ -/*//#include "sec.h" -//#include "cos.h" -//#include -//#include "doubleComplex.h" -//#include "division.h" +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in */ -/*#include -#include "sin.h" + +#include "sec.h" #include "cos.h" -#include "sinh.h" -#include "cosh.h" -#include "csc.h" +#include +#include "doubleComplex.h" #include "division.h" -*/ -#include -#include -/*doubleComplex zsecs(doubleComplex z) +doubleComplex zsecs(doubleComplex z) { doubleComplex out; out = zrdivs(DoubleComplex(1,0),zcoss(z)); return out; -} -*/ -void zsecs(double complex z) -{ - - //double complex out; - /*out = zrdivs(DoubleComplex(1,0),zcoss(z)); - return out; -}*/ - - double complex out = 1.0/(ccos(z)); - if(cimag(out)==0.0) - { - printf("%.7lf\n",creal(out)); - //out=creal(out); - } - else if(creal(out)==0.0) - { - printf("%.7lfi\n",cimag(out)); - //out=cimag(out); - } - else if(creal(out)!=0.0 && cimag(out)<0.0) - { - printf("%.7lf %.7lfi\n",creal(out),cimag(out)); - //out=x; - } - else - { - printf("%.7lf + %.7lfi\n", creal(out), cimag(out)); - //out=x; - } - //return out; -} +} \ No newline at end of file diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/secd/dsecda.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/secd/dsecda.c index 028595cd..f9f70f0c 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/secd/dsecda.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/secd/dsecda.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "secd.h" #include diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/secd/dsecds.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/secd/dsecds.c index 7b08a467..aa95f29a 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/secd/dsecds.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/secd/dsecds.c @@ -1,3 +1,21 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + + +#ifdef _WIN32 + #define _USE_MATH_DEFINES +#endif + + #include #include "sec.h" #include "secd.h" diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/secd/ssecda.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/secd/ssecda.c index 6267f943..c1fc5e53 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/secd/ssecda.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/secd/ssecda.c @@ -1,3 +1,16 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + + #include "sec.h" #include "secd.h" diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/secd/ssecds.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/secd/ssecds.c index 3fabb225..eaf3a298 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/secd/ssecds.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/secd/ssecds.c @@ -1,3 +1,20 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + + +#ifdef _WIN32 + #define _USE_MATH_DEFINES +#endif + #include #include "secd.h" #include "sec.h" diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/csecha.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/csecha.c index dcd76d59..c8d52d82 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/csecha.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/csecha.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "sech.h" #include diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/csechs.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/csechs.c index 37ba6d95..e707e8b1 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/csechs.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/csechs.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "sech.h" #include "sec.h" #include diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/dsecha.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/dsecha.c index cfab81ff..4092c9e8 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/dsecha.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/dsecha.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "sech.h" #include void dsecha(double* in,int size,double* out) diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/dsechs.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/dsechs.c index 10ca392a..fdcfd69c 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/dsechs.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/dsechs.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include #include "sech.h" #include "cosh.h" diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/ssecha.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/ssecha.c index 1d265639..d7e71b33 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/ssecha.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/ssecha.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "sech.h" #include void ssecha(float* in,int size,float* out) diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/ssechs.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/ssechs.c index f582fd79..9fcd50b7 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/ssechs.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/ssechs.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include #include "sech.h" #include "cosh.h" diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/zsecha.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/zsecha.c index c48f8dab..a3c3189f 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/zsecha.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/zsecha.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "sech.h" #include diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/zsechs.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/zsechs.c index 93c95b3f..d23d2ef4 100644 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/zsechs.c +++ b/2.3-1/src/c/elementaryFunctions/Trigonometry/sech/zsechs.c @@ -1,3 +1,15 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Shamik Guha + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #include "sech.h" #include "sec.h" #include diff --git a/2.3-1/src/c/elementaryFunctions/acoth/dacoths.c b/2.3-1/src/c/elementaryFunctions/acoth/dacoths.c index a2dd8750..aa20a7bd 100644 --- a/2.3-1/src/c/elementaryFunctions/acoth/dacoths.c +++ b/2.3-1/src/c/elementaryFunctions/acoth/dacoths.c @@ -9,6 +9,7 @@ // Author: Ashish Kamble // Email: toolbox@scilab.in +#include #include "acoth.h" #include "log.h" diff --git a/2.3-1/src/c/elementaryFunctions/acoth/sacoths.c b/2.3-1/src/c/elementaryFunctions/acoth/sacoths.c index 12f5381d..9a2137a6 100644 --- a/2.3-1/src/c/elementaryFunctions/acoth/sacoths.c +++ b/2.3-1/src/c/elementaryFunctions/acoth/sacoths.c @@ -9,6 +9,7 @@ // Author: Ashish Kamble // Email: toolbox@scilab.in +#include #include "acoth.h" #include "log.h" diff --git a/2.3-1/src/c/elementaryFunctions/cos/i16coss.c b/2.3-1/src/c/elementaryFunctions/cos/i16coss.c index ce345d72..787f713b 100644 --- a/2.3-1/src/c/elementaryFunctions/cos/i16coss.c +++ b/2.3-1/src/c/elementaryFunctions/cos/i16coss.c @@ -14,5 +14,5 @@ #include "cos.h" float i16coss(int16 x) { - return (cos(x)); + return (cos((double)x)); } diff --git a/2.3-1/src/c/elementaryFunctions/cos/i8coss.c b/2.3-1/src/c/elementaryFunctions/cos/i8coss.c index 02d8216f..4b344e1d 100644 --- a/2.3-1/src/c/elementaryFunctions/cos/i8coss.c +++ b/2.3-1/src/c/elementaryFunctions/cos/i8coss.c @@ -14,5 +14,5 @@ #include "cos.h" float i8coss(int8 x) { - return (cos(x)); + return (cos((double)x)); } diff --git a/2.3-1/src/c/elementaryFunctions/cos/u16coss.c b/2.3-1/src/c/elementaryFunctions/cos/u16coss.c index c4c86165..fb25ac56 100644 --- a/2.3-1/src/c/elementaryFunctions/cos/u16coss.c +++ b/2.3-1/src/c/elementaryFunctions/cos/u16coss.c @@ -14,5 +14,5 @@ #include "cos.h" float u16coss(uint16 x) { - return (cos(x)); + return (cos((double)x)); } diff --git a/2.3-1/src/c/elementaryFunctions/cos/u8coss.c b/2.3-1/src/c/elementaryFunctions/cos/u8coss.c index 30400c12..26e2eba5 100644 --- a/2.3-1/src/c/elementaryFunctions/cos/u8coss.c +++ b/2.3-1/src/c/elementaryFunctions/cos/u8coss.c @@ -14,5 +14,5 @@ #include "cos.h" float u8coss(uint8 x) { - return (cos(x)); + return (cos((double)x)); } diff --git a/2.3-1/src/c/elementaryFunctions/discrete_mathematics/factor/dfactors.c b/2.3-1/src/c/elementaryFunctions/discrete_mathematics/factor/dfactors.c index 98019431..9ac76b5a 100644 --- a/2.3-1/src/c/elementaryFunctions/discrete_mathematics/factor/dfactors.c +++ b/2.3-1/src/c/elementaryFunctions/discrete_mathematics/factor/dfactors.c @@ -18,17 +18,15 @@ void dfactors(double in,double* out) int n=(int)in; while (n%2 == 0) { - //printf("%d ", 2); - out[k++]=2; + out[k++]=2; n = n/2; } - for (i = 3; i <= sqrt(n); i = i+2) + for (i = 3; i <= (int)sqrt((double)n); i = i+2) { while (n%i == 0) { - out[k++]=i; - //printf("%d ", i); + out[k++]=i; n = n/i; } } @@ -36,7 +34,6 @@ void dfactors(double in,double* out) if (n > 2) { out[k++]=n; - //printf ("%d ", n); } } diff --git a/2.3-1/src/c/elementaryFunctions/discrete_mathematics/factor/sfactors.c b/2.3-1/src/c/elementaryFunctions/discrete_mathematics/factor/sfactors.c index 2e5ba478..a2eed09f 100644 --- a/2.3-1/src/c/elementaryFunctions/discrete_mathematics/factor/sfactors.c +++ b/2.3-1/src/c/elementaryFunctions/discrete_mathematics/factor/sfactors.c @@ -18,25 +18,22 @@ void sfactors(float in,float* out) int n=(int)in; while (n%2 == 0) { - //printf("%d ", 2); - out[k++]=2; + out[k++]=2; n = n/2; } - for (i = 3; i <= sqrt(n); i = i+2) + for (i = 3; i <= (int)sqrt((double)n); i = i+2) { while (n%i == 0) { - out[k++]=i; - //printf("%d ", i); + out[k++]=i; n = n/i; } } - if (n > 2) + if (n > 2) { out[k++]=n; - //printf ("%d ", n); - } + } } diff --git a/2.3-1/src/c/elementaryFunctions/includes/bin2dec.h b/2.3-1/src/c/elementaryFunctions/includes/bin2dec.h index 792e3689..ea1585f5 100644 --- a/2.3-1/src/c/elementaryFunctions/includes/bin2dec.h +++ b/2.3-1/src/c/elementaryFunctions/includes/bin2dec.h @@ -19,13 +19,13 @@ extern "C" { long double dbin2decs(long double in); int8 i8bin2decs(int8 in); -//int16 i16bin2decs(int16 in); +int16 i16bin2decs(int16 in); uint8 u8bin2decs(uint8 in); uint16 u16bin2decs(uint16 in); void dbin2deca(double* in,int size,double* out); void i8bin2deca(int8* in,int size,int8* out); -//void i16bin2deca(int16* in,int size,int16* out); +void i16bin2deca(int16* in,int size,int16* out); void u8bin2deca(uint8* in,int size,uint8* out); void u16bin2deca(uint16* in,int size,uint16* out); diff --git a/2.3-1/src/c/elementaryFunctions/includes/get_float.h b/2.3-1/src/c/elementaryFunctions/includes/get_float.h index 1ada71c9..285cb9c9 100644 --- a/2.3-1/src/c/elementaryFunctions/includes/get_float.h +++ b/2.3-1/src/c/elementaryFunctions/includes/get_float.h @@ -31,6 +31,8 @@ EXTERN_ELEMFUNCT float dfloats(double in); EXTERN_ELEMFUNCT float i8floats(int8 in); +EXTERN_ELEMFUNCT float u8floats(uint8 in); + EXTERN_ELEMFUNCT float u16floats(uint16 in); EXTERN_ELEMFUNCT float i16floats(int16 in); diff --git a/2.3-1/src/c/elementaryFunctions/includes/sec.h b/2.3-1/src/c/elementaryFunctions/includes/sec.h index 08120ed5..96061583 100644 --- a/2.3-1/src/c/elementaryFunctions/includes/sec.h +++ b/2.3-1/src/c/elementaryFunctions/includes/sec.h @@ -13,7 +13,7 @@ #define __SEC_H__ #include "dynlib_elementaryfunctions.h" #include "floatComplex.h" -//#include "doubleComplex.h" +#include "doubleComplex.h" #include #include "types.h" @@ -26,7 +26,7 @@ double dsecs(double in); void sseca(float* in,int size,float* out); float ssecs(float in); -void zsecs(double complex z); +doubleComplex zsecs(doubleComplex z); //void zseca(doubleComplex* in, int size,doubleComplex* out); floatComplex csecs(floatComplex z); void cseca(floatComplex* in, int size,floatComplex* out); diff --git a/2.3-1/src/c/elementaryFunctions/linspace/dlinspacea.c b/2.3-1/src/c/elementaryFunctions/linspace/dlinspacea.c index cb60f9e7..e23db2f3 100644 --- a/2.3-1/src/c/elementaryFunctions/linspace/dlinspacea.c +++ b/2.3-1/src/c/elementaryFunctions/linspace/dlinspacea.c @@ -9,13 +9,15 @@ Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ - +#include #include "linspace.h" + void dlinspacea(double *low_limit,int _row,double *up_limit,double range_num,double *out) { int i,j,k; double temp; - float step_iterate[_row]; /* for each row the spacing between two values is different.*/ + double *step_iterate; /* for each row the spacing between two values is different.*/ + step_iterate = (double*) malloc((double)_row*sizeof(double)); for(i=0;i<_row;i++) { diff --git a/2.3-1/src/c/elementaryFunctions/logspace/dlogspacea.c b/2.3-1/src/c/elementaryFunctions/logspace/dlogspacea.c index 3a9caf15..62802f77 100644 --- a/2.3-1/src/c/elementaryFunctions/logspace/dlogspacea.c +++ b/2.3-1/src/c/elementaryFunctions/logspace/dlogspacea.c @@ -9,14 +9,16 @@ Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ - +#include +#include #include "logspace.h" -#include + void dlogspacea(double *low_limit,int _row,double *up_limit,double range_num,double *out) { int i,j,k; double temp; - double step_iterate[_row]; /* for each row the spacing between two values is different.*/ + double *step_iterate; /* for each row the spacing between two values is different.*/ + step_iterate = (double*) malloc((double)_row*sizeof(double)); for(i=0;i<_row;i++) { step_iterate[i] = pow(10,((up_limit[i]-low_limit[i])/(range_num-1))); diff --git a/2.3-1/src/c/elementaryFunctions/radix_conversions/base2dec/gbase2decs.c b/2.3-1/src/c/elementaryFunctions/radix_conversions/base2dec/gbase2decs.c index 43e3686a..811a4116 100644 --- a/2.3-1/src/c/elementaryFunctions/radix_conversions/base2dec/gbase2decs.c +++ b/2.3-1/src/c/elementaryFunctions/radix_conversions/base2dec/gbase2decs.c @@ -159,12 +159,7 @@ double gbase2decs(char* in,int size,int base) val = 35; break; } - o = o + (val * pow(base, size)); - //printf("%f\n",out[0]); - //o=(int)out[0]; - //o=o/16; - //printf("%d %d %d\n",o,val,(val * pow(16, size))); - //j++; + o = o + (val * (int)pow((double)base, size)); size--; } return o; diff --git a/2.3-1/src/c/elementaryFunctions/radix_conversions/hex2dec/ghex2decs.c b/2.3-1/src/c/elementaryFunctions/radix_conversions/hex2dec/ghex2decs.c index 8722df1e..eb42a7a7 100644 --- a/2.3-1/src/c/elementaryFunctions/radix_conversions/hex2dec/ghex2decs.c +++ b/2.3-1/src/c/elementaryFunctions/radix_conversions/hex2dec/ghex2decs.c @@ -80,12 +80,7 @@ double ghex2decs(char* in,int size) val = 15; break; } - o = o + (val * pow(16, size)); - //printf("%f\n",out[0]); - //o=(int)out[0]; - //o=o/16; - //printf("%d %d %d\n",o,val,(val * pow(16, size))); - //j++; + o = o + (val * (int)pow((double)16, size)); size--; } return o; diff --git a/2.3-1/src/c/elementaryFunctions/sin/i16sins.c b/2.3-1/src/c/elementaryFunctions/sin/i16sins.c index 3a8dc4da..6fcbd26f 100644 --- a/2.3-1/src/c/elementaryFunctions/sin/i16sins.c +++ b/2.3-1/src/c/elementaryFunctions/sin/i16sins.c @@ -14,5 +14,5 @@ #include "sin.h" float i16sins(int16 x) { - return (sin(x)); + return (sin((double)x)); } diff --git a/2.3-1/src/c/elementaryFunctions/sin/i8sins.c b/2.3-1/src/c/elementaryFunctions/sin/i8sins.c index 4e6deabd..23823566 100644 --- a/2.3-1/src/c/elementaryFunctions/sin/i8sins.c +++ b/2.3-1/src/c/elementaryFunctions/sin/i8sins.c @@ -14,5 +14,5 @@ #include "sin.h" float i8sins(int8 x) { - return (sin(x)); + return (sin((double)x)); } diff --git a/2.3-1/src/c/elementaryFunctions/sin/u16sins.c b/2.3-1/src/c/elementaryFunctions/sin/u16sins.c index 9610248d..651b8e1a 100644 --- a/2.3-1/src/c/elementaryFunctions/sin/u16sins.c +++ b/2.3-1/src/c/elementaryFunctions/sin/u16sins.c @@ -14,5 +14,5 @@ #include "sin.h" float u16sins(uint16 x) { - return (sin(x)); + return (sin((double)x)); } diff --git a/2.3-1/src/c/elementaryFunctions/sin/u8sins.c b/2.3-1/src/c/elementaryFunctions/sin/u8sins.c index 50e8bfe9..f7c982f2 100644 --- a/2.3-1/src/c/elementaryFunctions/sin/u8sins.c +++ b/2.3-1/src/c/elementaryFunctions/sin/u8sins.c @@ -14,5 +14,5 @@ #include "sin.h" float u8sins(uint8 x) { - return (sin(x)); + return (sin((double)x)); } diff --git a/2.3-1/src/c/elementaryFunctions/sinh/i16sinhs.c b/2.3-1/src/c/elementaryFunctions/sinh/i16sinhs.c index a13cf378..a7ab3d51 100644 --- a/2.3-1/src/c/elementaryFunctions/sinh/i16sinhs.c +++ b/2.3-1/src/c/elementaryFunctions/sinh/i16sinhs.c @@ -14,5 +14,5 @@ #include "sinh.h" float i16sinhs(int16 x) { - return (sinh(x)); + return (sinh((double)x)); } diff --git a/2.3-1/src/c/elementaryFunctions/sinh/i8sinhs.c b/2.3-1/src/c/elementaryFunctions/sinh/i8sinhs.c index 8c34bf40..ddc052aa 100644 --- a/2.3-1/src/c/elementaryFunctions/sinh/i8sinhs.c +++ b/2.3-1/src/c/elementaryFunctions/sinh/i8sinhs.c @@ -14,5 +14,5 @@ #include "sinh.h" float i8sinhs(int8 x) { - return (sinh(x)); + return (sinh((double)x)); } diff --git a/2.3-1/src/c/elementaryFunctions/sinh/u16sinhs.c b/2.3-1/src/c/elementaryFunctions/sinh/u16sinhs.c index ca28d463..5f828cd7 100644 --- a/2.3-1/src/c/elementaryFunctions/sinh/u16sinhs.c +++ b/2.3-1/src/c/elementaryFunctions/sinh/u16sinhs.c @@ -14,5 +14,5 @@ #include "sinh.h" float u16sinhs(uint16 x) { - return (sinh(x)); + return (sinh((double)x)); } diff --git a/2.3-1/src/c/elementaryFunctions/sinh/u8sinhs.c b/2.3-1/src/c/elementaryFunctions/sinh/u8sinhs.c index 3b2f8e6d..9f49d7b6 100644 --- a/2.3-1/src/c/elementaryFunctions/sinh/u8sinhs.c +++ b/2.3-1/src/c/elementaryFunctions/sinh/u8sinhs.c @@ -14,5 +14,5 @@ #include "sinh.h" float u8sinhs(uint8 x) { - return (sinh(x)); + return (sinh((double)x)); } diff --git a/2.3-1/src/c/linearAlgebra/balanc/dbalanca.c b/2.3-1/src/c/linearAlgebra/balanc/dbalanca.c index 558c6149..a86a1967 100644 --- a/2.3-1/src/c/linearAlgebra/balanc/dbalanca.c +++ b/2.3-1/src/c/linearAlgebra/balanc/dbalanca.c @@ -59,7 +59,7 @@ void dbalanca(double* in1, int rows, double* in2, double* out1, \ memcpy(buf2,in2,rows*rows*sizeof(double)); dggbal_(&JOB,&rows,buf1,&rows,buf2,&rows,&ILO,&IHI,LSCALE,RSCALE, \ - LWORK,INFO); + LWORK,&INFO); deyea(out3,rows,rows); deyea(out4,rows,rows); diff --git a/2.3-1/src/c/linearAlgebra/rcond/drconda.c b/2.3-1/src/c/linearAlgebra/rcond/drconda.c index 2082e9de..a203c1e3 100644 --- a/2.3-1/src/c/linearAlgebra/rcond/drconda.c +++ b/2.3-1/src/c/linearAlgebra/rcond/drconda.c @@ -18,15 +18,15 @@ double drconda(double* in1, int rows) { - double *buf, *IPIV, *LDWORK, *LIWORK; - int INFO; + double *buf, *LDWORK; + int INFO, *IPIV, *LIWORK; char one = '1'; double ANORM; double RCOND = 1; buf = (double*) malloc((double) rows*rows*sizeof(double)); - IPIV = (double*) malloc((double) rows*sizeof(double)); - LIWORK = (double*) malloc((double) rows*sizeof(double)); + IPIV = (int*) malloc((int) rows*sizeof(int)); + LIWORK = (int*) malloc((int) rows*sizeof(int)); LDWORK = (double*) malloc((double) 4*rows*sizeof(double)); /*Copy input in temp buf, as lapack modifies input*/ diff --git a/2.3-1/src/c/string/convstr/gconvstrs.c b/2.3-1/src/c/string/convstr/gconvstrs.c index d3374ff4..7c6e7f14 100644 --- a/2.3-1/src/c/string/convstr/gconvstrs.c +++ b/2.3-1/src/c/string/convstr/gconvstrs.c @@ -11,8 +11,10 @@ */ #include +#include #include "convstr.h" + void gconvstrs(char* in, int size,char* flag,int size2,char* out) { int i=0;//temp=0; diff --git a/2.3-1/thirdparty/lib/pc/windows/x64/Lapack/blasplus.lib b/2.3-1/thirdparty/lib/pc/windows/x64/Lapack/blasplus.lib new file mode 100644 index 00000000..df511369 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x64/Lapack/blasplus.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x64/Lapack/lapack.lib b/2.3-1/thirdparty/lib/pc/windows/x64/Lapack/lapack.lib new file mode 100644 index 00000000..305c5a8e Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x64/Lapack/lapack.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/IlmImf.lib b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/IlmImf.lib new file mode 100644 index 00000000..07425b49 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/IlmImf.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/IlmImfd.lib b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/IlmImfd.lib new file mode 100644 index 00000000..bc261571 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/IlmImfd.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/libjasper.lib b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/libjasper.lib new file mode 100644 index 00000000..4dd7bde5 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/libjasper.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/libjpeg.lib b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/libjpeg.lib new file mode 100644 index 00000000..4d04ee69 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/libjpeg.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/libpng.lib b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/libpng.lib new file mode 100644 index 00000000..a4dad985 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/libpng.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/libtiff.lib b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/libtiff.lib new file mode 100644 index 00000000..5aa67303 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/libtiff.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_calib3d2413.lib b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_calib3d2413.lib new file mode 100644 index 00000000..addf909d Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_calib3d2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_contrib2413.lib b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_contrib2413.lib new file mode 100644 index 00000000..aa5ff427 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_contrib2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_core2413.lib b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_core2413.lib new file mode 100644 index 00000000..5bf8abc0 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_core2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_features2d2413.lib b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_features2d2413.lib new file mode 100644 index 00000000..f52f8574 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_features2d2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_flann2413.lib b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_flann2413.lib new file mode 100644 index 00000000..e0c9dcdc Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_flann2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_gpu2413.lib b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_gpu2413.lib new file mode 100644 index 00000000..45932513 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_gpu2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_haartraining_engine.lib b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_haartraining_engine.lib new file mode 100644 index 00000000..aa5320cf Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_haartraining_engine.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_highgui2413.lib b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_highgui2413.lib new file mode 100644 index 00000000..7ad10302 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_highgui2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_imgproc2413.lib b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_imgproc2413.lib new file mode 100644 index 00000000..7c2cf7bd Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_imgproc2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_legacy2413.lib b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_legacy2413.lib new file mode 100644 index 00000000..c1ef356d Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_legacy2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_ml2413.lib b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_ml2413.lib new file mode 100644 index 00000000..e88073e2 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_ml2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_nonfree2413.lib b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_nonfree2413.lib new file mode 100644 index 00000000..877099b6 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_nonfree2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_objdetect2413.lib b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_objdetect2413.lib new file mode 100644 index 00000000..4213b7f1 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_objdetect2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_ocl2413.lib b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_ocl2413.lib new file mode 100644 index 00000000..c5d7463c Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_ocl2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_photo2413.lib b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_photo2413.lib new file mode 100644 index 00000000..e05aaba6 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_photo2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_stitching2413.lib b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_stitching2413.lib new file mode 100644 index 00000000..1b06799a Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_stitching2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_superres2413.lib b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_superres2413.lib new file mode 100644 index 00000000..5bb5ff5b Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_superres2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_ts2413.lib b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_ts2413.lib new file mode 100644 index 00000000..1d73d573 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_ts2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_video2413.lib b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_video2413.lib new file mode 100644 index 00000000..434315b3 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_video2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_videostab2413.lib b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_videostab2413.lib new file mode 100644 index 00000000..9dbacb7c Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/opencv_videostab2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/zlib.lib b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/zlib.lib new file mode 100644 index 00000000..3c005b52 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x64/OpenCV/zlib.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x86/Lapack/libblas.lib b/2.3-1/thirdparty/lib/pc/windows/x86/Lapack/libblas.lib new file mode 100644 index 00000000..b8ab82cd Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x86/Lapack/libblas.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x86/Lapack/liblapack.lib b/2.3-1/thirdparty/lib/pc/windows/x86/Lapack/liblapack.lib new file mode 100644 index 00000000..1ba73b25 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x86/Lapack/liblapack.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/IlmImf.lib b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/IlmImf.lib new file mode 100644 index 00000000..c5129163 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/IlmImf.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/libjasper.lib b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/libjasper.lib new file mode 100644 index 00000000..05181ee7 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/libjasper.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/libjpeg.lib b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/libjpeg.lib new file mode 100644 index 00000000..afb553ae Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/libjpeg.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/libpng.lib b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/libpng.lib new file mode 100644 index 00000000..d972c7b3 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/libpng.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/libtiff.lib b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/libtiff.lib new file mode 100644 index 00000000..b3fb0355 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/libtiff.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_calib3d2413.lib b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_calib3d2413.lib new file mode 100644 index 00000000..52dec5fc Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_calib3d2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_contrib2413.lib b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_contrib2413.lib new file mode 100644 index 00000000..f02515bc Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_contrib2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_core2413.lib b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_core2413.lib new file mode 100644 index 00000000..7afda305 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_core2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_features2d2413.lib b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_features2d2413.lib new file mode 100644 index 00000000..f3c1249b Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_features2d2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_flann2413.lib b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_flann2413.lib new file mode 100644 index 00000000..f89e5472 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_flann2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_gpu2413.lib b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_gpu2413.lib new file mode 100644 index 00000000..4e1d2904 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_gpu2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_highgui2413.lib b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_highgui2413.lib new file mode 100644 index 00000000..e7a9ee8d Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_highgui2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_imgproc2413.lib b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_imgproc2413.lib new file mode 100644 index 00000000..3cb0ba42 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_imgproc2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_legacy2413.lib b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_legacy2413.lib new file mode 100644 index 00000000..abf1b9ba Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_legacy2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_ml2413.lib b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_ml2413.lib new file mode 100644 index 00000000..eabe9360 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_ml2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_nonfree2413.lib b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_nonfree2413.lib new file mode 100644 index 00000000..5bda409b Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_nonfree2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_objdetect2413.lib b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_objdetect2413.lib new file mode 100644 index 00000000..9c98106f Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_objdetect2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_ocl2413.lib b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_ocl2413.lib new file mode 100644 index 00000000..f1550228 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_ocl2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_photo2413.lib b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_photo2413.lib new file mode 100644 index 00000000..6d379c36 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_photo2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_stitching2413.lib b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_stitching2413.lib new file mode 100644 index 00000000..fa59309b Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_stitching2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_superres2413.lib b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_superres2413.lib new file mode 100644 index 00000000..c63b5a17 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_superres2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_ts2413.lib b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_ts2413.lib new file mode 100644 index 00000000..4f7fc71e Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_ts2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_video2413.lib b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_video2413.lib new file mode 100644 index 00000000..d516a77a Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_video2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_videostab2413.lib b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_videostab2413.lib new file mode 100644 index 00000000..bcaf6b4e Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/opencv_videostab2413.lib differ diff --git a/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/zlib.lib b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/zlib.lib new file mode 100644 index 00000000..6754dd09 Binary files /dev/null and b/2.3-1/thirdparty/lib/pc/windows/x86/OpenCV/zlib.lib differ diff --git a/2.3-1/unloader.sce b/2.3-1/unloader.sce index a8bf1673..e0e3d5bc 100644 --- a/2.3-1/unloader.sce +++ b/2.3-1/unloader.sce @@ -7,7 +7,7 @@ catch error("Scilab 5.4 or more is required."); end; -fileQuit = get_absolute_file_path("unloader.sce") + "etc/" + "scilab2c.quit"; +fileQuit = get_absolute_file_path("unloader.sce") + "etc\" + "scilab2c.quit"; if isfile(fileQuit) then exec(fileQuit); end -- cgit