From c7e9597db39140c1d982f796a8e1f03bb54e7905 Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Mon, 24 Apr 2017 14:08:37 +0530 Subject: Fixed float.h issue. OpenCV with built libraries working for linux x64 --- src/c/elementaryFunctions/includes/float.h | 54 -------------------------- src/c/elementaryFunctions/includes/get_float.h | 54 ++++++++++++++++++++++++++ src/c/elementaryFunctions/includes/interp1.h | 38 ------------------ 3 files changed, 54 insertions(+), 92 deletions(-) delete mode 100644 src/c/elementaryFunctions/includes/float.h create mode 100644 src/c/elementaryFunctions/includes/get_float.h delete mode 100644 src/c/elementaryFunctions/includes/interp1.h (limited to 'src/c/elementaryFunctions/includes') diff --git a/src/c/elementaryFunctions/includes/float.h b/src/c/elementaryFunctions/includes/float.h deleted file mode 100644 index 885564b..0000000 --- a/src/c/elementaryFunctions/includes/float.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2006-2008 - INRIA - Arnaud Torset - * Author - Shamik Guha - * 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 - * - */ - -#ifndef __FLOAT_H__ -#define __FLOAT_H__ - -#include "dynlib_elementaryfunctions.h" -#include "floatComplex.h" -#include "doubleComplex.h" -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif -/* - float(X) returns the unsigned char part of the double value -*/ - -EXTERN_ELEMFUNCT float sfloats(float in); - -EXTERN_ELEMFUNCT float dfloats(double in); - -EXTERN_ELEMFUNCT float i8floats(int8 in); - -EXTERN_ELEMFUNCT float u16floats(uint16 in); - -EXTERN_ELEMFUNCT float i16floats(int16 in); - -EXTERN_ELEMFUNCT void sfloata(float* in, int size, float* out); - -EXTERN_ELEMFUNCT void dfloata(double* in, int size, float* out); - -EXTERN_ELEMFUNCT void i8floata(int8* in, int size, float* out); - -EXTERN_ELEMFUNCT void u16floata(uint16* in, int size, float* out); - -EXTERN_ELEMFUNCT void i16floata(int16* in, int size, float* out); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - - -#endif /* !__FLOAT_H__ */ - diff --git a/src/c/elementaryFunctions/includes/get_float.h b/src/c/elementaryFunctions/includes/get_float.h new file mode 100644 index 0000000..1ada71c --- /dev/null +++ b/src/c/elementaryFunctions/includes/get_float.h @@ -0,0 +1,54 @@ +/* + * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab + * Copyright (C) 2006-2008 - INRIA - Arnaud Torset + * Author - Shamik Guha + * 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 + * + */ + +#ifndef __GET_FLOAT_H__ +#define __GET_FLOAT_H__ + +#include "dynlib_elementaryfunctions.h" +#include "floatComplex.h" +#include "doubleComplex.h" +#include "types.h" + +#ifdef __cplusplus +extern "C" { +#endif +/* + float(X) returns the unsigned char part of the double value +*/ + +EXTERN_ELEMFUNCT float sfloats(float in); + +EXTERN_ELEMFUNCT float dfloats(double in); + +EXTERN_ELEMFUNCT float i8floats(int8 in); + +EXTERN_ELEMFUNCT float u16floats(uint16 in); + +EXTERN_ELEMFUNCT float i16floats(int16 in); + +EXTERN_ELEMFUNCT void sfloata(float* in, int size, float* out); + +EXTERN_ELEMFUNCT void dfloata(double* in, int size, float* out); + +EXTERN_ELEMFUNCT void i8floata(int8* in, int size, float* out); + +EXTERN_ELEMFUNCT void u16floata(uint16* in, int size, float* out); + +EXTERN_ELEMFUNCT void i16floata(int16* in, int size, float* out); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + + +#endif /* !__GET_FLOAT_H__ */ + diff --git a/src/c/elementaryFunctions/includes/interp1.h b/src/c/elementaryFunctions/includes/interp1.h deleted file mode 100644 index caf4243..0000000 --- a/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__*/ -- cgit