summaryrefslogtreecommitdiff
path: root/2.3-1/src/c/elementaryFunctions/includes
diff options
context:
space:
mode:
authorsiddhu89902017-04-24 14:08:37 +0530
committersiddhu89902017-04-24 14:08:37 +0530
commit472b2e7ebbd2d8b3ecd00b228128aa8a0bd3f920 (patch)
tree506e85e6c959148c052747d61ffd29d98fa058bf /2.3-1/src/c/elementaryFunctions/includes
parentb9cfdca438347fe4d28f7caff3cb7b382e455d3a (diff)
downloadScilab2C-472b2e7ebbd2d8b3ecd00b228128aa8a0bd3f920.tar.gz
Scilab2C-472b2e7ebbd2d8b3ecd00b228128aa8a0bd3f920.tar.bz2
Scilab2C-472b2e7ebbd2d8b3ecd00b228128aa8a0bd3f920.zip
Fixed float.h issue. OpenCV with built libraries working for linux x64
Diffstat (limited to '2.3-1/src/c/elementaryFunctions/includes')
-rw-r--r--2.3-1/src/c/elementaryFunctions/includes/get_float.h (renamed from 2.3-1/src/c/elementaryFunctions/includes/float.h)6
-rw-r--r--2.3-1/src/c/elementaryFunctions/includes/interp1.h38
2 files changed, 3 insertions, 41 deletions
diff --git a/2.3-1/src/c/elementaryFunctions/includes/float.h b/2.3-1/src/c/elementaryFunctions/includes/get_float.h
index 885564b2..1ada71c9 100644
--- a/2.3-1/src/c/elementaryFunctions/includes/float.h
+++ b/2.3-1/src/c/elementaryFunctions/includes/get_float.h
@@ -10,8 +10,8 @@
*
*/
-#ifndef __FLOAT_H__
-#define __FLOAT_H__
+#ifndef __GET_FLOAT_H__
+#define __GET_FLOAT_H__
#include "dynlib_elementaryfunctions.h"
#include "floatComplex.h"
@@ -50,5 +50,5 @@ EXTERN_ELEMFUNCT void i16floata(int16* in, int size, float* out);
#endif
-#endif /* !__FLOAT_H__ */
+#endif /* !__GET_FLOAT_H__ */
diff --git a/2.3-1/src/c/elementaryFunctions/includes/interp1.h b/2.3-1/src/c/elementaryFunctions/includes/interp1.h
deleted file mode 100644
index caf42439..00000000
--- a/2.3-1/src/c/elementaryFunctions/includes/interp1.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 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
- */
-#ifndef __INTERP1_H__
-#define __INTERP1_H__
-#include "types.h"
-
- #ifdef __cplusplus
- extern "C" {
- #endif
-
-double dinterp1s(double* x, int size, double* y,int size2, double xin, char* method,int size3);
-//void i8interp1s(int8 in,char* out);
-//void i16interp1s(int16 in,char* out);
-//void u8interp1s(uint8 in,char* out);
-//void u16interp1s(uint16 in,char* out);
-
-//void dinterp1a(double* in,int size,char* out);
-//void i8interp1a(int8* in,int size,char* out);
-//void i16interp1a(int16* in,int size,char* out);
-//void u8interp1a(uint8* in,int size,char* out);
-//void u16interp1a(uint16* in,int size,char* out);
-
-
-
- #ifdef __cplusplus
- } /* extern "C" */
- #endif
-
-#endif /*__INTERP1_H__*/