From 28917732a0c500c5db111ed49dbd7755758f5f72 Mon Sep 17 00:00:00 2001
From: siddhu8990
Date: Sat, 28 Nov 2015 11:55:38 +0530
Subject: Merged 'master' with Mushir's work'

---
 src/c/operations/division/cldiva.c~        | 22 ----------------------
 src/c/operations/division/crdiva.c~        | 22 ----------------------
 src/c/operations/division/i16ldiva.c~      | 21 ---------------------
 src/c/operations/division/i16rdiva.c~      | 21 ---------------------
 src/c/operations/division/i8ldiva.c~       | 21 ---------------------
 src/c/operations/division/i8rdiva.c~       | 21 ---------------------
 src/c/operations/division/u16ldiva.c~      | 21 ---------------------
 src/c/operations/division/u16rdiva.c~      | 21 ---------------------
 src/c/operations/division/u8ldiva.c~       | 21 ---------------------
 src/c/operations/division/u8rdiva .c~      | 21 ---------------------
 src/c/operations/division/u8rdiva.c~       | 21 ---------------------
 src/c/operations/multiplication/dmula.c~   | 22 ----------------------
 src/c/operations/multiplication/dmuls.c~   | 19 -------------------
 src/c/operations/multiplication/i16mula.c~ | 21 ---------------------
 src/c/operations/multiplication/i8mula.c~  | 21 ---------------------
 src/c/operations/multiplication/u16mula.c~ | 21 ---------------------
 src/c/operations/multiplication/u8mula.c~  | 21 ---------------------
 17 files changed, 358 deletions(-)
 delete mode 100644 src/c/operations/division/cldiva.c~
 delete mode 100644 src/c/operations/division/crdiva.c~
 delete mode 100644 src/c/operations/division/i16ldiva.c~
 delete mode 100644 src/c/operations/division/i16rdiva.c~
 delete mode 100644 src/c/operations/division/i8ldiva.c~
 delete mode 100644 src/c/operations/division/i8rdiva.c~
 delete mode 100644 src/c/operations/division/u16ldiva.c~
 delete mode 100644 src/c/operations/division/u16rdiva.c~
 delete mode 100644 src/c/operations/division/u8ldiva.c~
 delete mode 100644 src/c/operations/division/u8rdiva .c~
 delete mode 100644 src/c/operations/division/u8rdiva.c~
 delete mode 100644 src/c/operations/multiplication/dmula.c~
 delete mode 100644 src/c/operations/multiplication/dmuls.c~
 delete mode 100644 src/c/operations/multiplication/i16mula.c~
 delete mode 100644 src/c/operations/multiplication/i8mula.c~
 delete mode 100644 src/c/operations/multiplication/u16mula.c~
 delete mode 100644 src/c/operations/multiplication/u8mula.c~

(limited to 'src/c/operations')

diff --git a/src/c/operations/division/cldiva.c~ b/src/c/operations/division/cldiva.c~
deleted file mode 100644
index 73b94f28..00000000
--- a/src/c/operations/division/cldiva.c~
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2008-2008 - INRIA - Arnaud TORSET
- *
- *  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
- *
- */
-
-
-#include "division.h"  
-
-void cldiva (floatComplex* in1, floatComplex* in2, int size, floatComplex* out ){
-	int i=0;
-	for (i=0;i<size;i++)
-        {
-		out[i]=cldivs(in1[i],in2[i]);
-	}
-}
diff --git a/src/c/operations/division/crdiva.c~ b/src/c/operations/division/crdiva.c~
deleted file mode 100644
index ea9781e8..00000000
--- a/src/c/operations/division/crdiva.c~
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2008-2008 - INRIA - Arnaud TORSET
- *
- *  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
- *
- */
-
-
-#include "division.h"  
-
-void crdiva (floatComplex* in1, floatComplex* in2, int size, floatComplex* out ){
-	int i=0;
-	for (i=0;i<size;i++)
-        {
-		out[i]=crdivs(in1[i],in2[i]);
-	}
-}
diff --git a/src/c/operations/division/i16ldiva.c~ b/src/c/operations/division/i16ldiva.c~
deleted file mode 100644
index a89aa69d..00000000
--- a/src/c/operations/division/i16ldiva.c~
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2008-2008 - INRIA - Arnaud TORSET
- *
- *  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
- *
- */
-
-
-#include "division.h"  
-
-void i16ldiva (int16* in1, int16* in2, int size, int16* out ){
-	int i=0;
-	for (i=0;i<size;i++){
-		out[i]=i16ldivs(in1[i],in2[i]);
-	}
-}
diff --git a/src/c/operations/division/i16rdiva.c~ b/src/c/operations/division/i16rdiva.c~
deleted file mode 100644
index ad7672c2..00000000
--- a/src/c/operations/division/i16rdiva.c~
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2008-2008 - INRIA - Arnaud TORSET
- *
- *  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
- *
- */
-
-
-#include "division.h"  
-
-void i16rdiva (int16* in1, int16* in2, int size, int16* out ){
-	int i=0;
-	for (i=0;i<size;i++){
-		out[i]=i16rdivs(in1[i],in2[i]);
-	}
-}
diff --git a/src/c/operations/division/i8ldiva.c~ b/src/c/operations/division/i8ldiva.c~
deleted file mode 100644
index 0f471171..00000000
--- a/src/c/operations/division/i8ldiva.c~
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2008-2008 - INRIA - Arnaud TORSET
- *
- *  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
- *
- */
-
-
-#include "division.h"  
-
-void i8ldiva (int8* in1, int8* in2, int size, int8* out ){
-	int i=0;
-	for (i=0;i<size;i++){
-		out[i]=i8ldivs(in1[i],in2[i]);
-	}
-}
diff --git a/src/c/operations/division/i8rdiva.c~ b/src/c/operations/division/i8rdiva.c~
deleted file mode 100644
index 0e6b217a..00000000
--- a/src/c/operations/division/i8rdiva.c~
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2008-2008 - INRIA - Arnaud TORSET
- *
- *  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
- *
- */
-
-
-#include "division.h"  
-
-void i8rdiva (int8* in1, int8* in2, int size, int8* out ){
-	int i=0;
-	for (i=0;i<size;i++){
-		out[i]=i8rdivs(in1[i],in2[i]);
-	}
-}
diff --git a/src/c/operations/division/u16ldiva.c~ b/src/c/operations/division/u16ldiva.c~
deleted file mode 100644
index 55d3222e..00000000
--- a/src/c/operations/division/u16ldiva.c~
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2008-2008 - INRIA - Arnaud TORSET
- *
- *  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
- *
- */
-
-
-#include "division.h"  
-
-void u16ldiva (uint16* in1, uint16* in2, int size, uint16* out ){
-	int i=0;
-	for (i=0;i<size;i++){
-		out[i]=u16ldivs(in1[i],in2[i]);
-	}
-}
diff --git a/src/c/operations/division/u16rdiva.c~ b/src/c/operations/division/u16rdiva.c~
deleted file mode 100644
index eb21be16..00000000
--- a/src/c/operations/division/u16rdiva.c~
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2008-2008 - INRIA - Arnaud TORSET
- *
- *  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
- *
- */
-
-
-#include "division.h"  
-
-void u16rdiva (uint16* in1, uint16* in2, int size, uint16* out ){
-	int i=0;
-	for (i=0;i<size;i++){
-		out[i]=u16rdivs(in1[i],in2[i]);
-	}
-}
diff --git a/src/c/operations/division/u8ldiva.c~ b/src/c/operations/division/u8ldiva.c~
deleted file mode 100644
index 76e59ad2..00000000
--- a/src/c/operations/division/u8ldiva.c~
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2008-2008 - INRIA - Arnaud TORSET
- *
- *  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
- *
- */
-
-
-#include "division.h"  
-
-void u8ldiva (uint8* in1, uint8* in2, int size, uint8* out ){
-	int i=0;
-	for (i=0;i<size;i++){
-		out[i]=u8ldivs(in1[i],in2[i]);
-	}
-}
diff --git a/src/c/operations/division/u8rdiva .c~ b/src/c/operations/division/u8rdiva .c~
deleted file mode 100644
index d1eb5c4b..00000000
--- a/src/c/operations/division/u8rdiva .c~	
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2008-2008 - INRIA - Arnaud TORSET
- *
- *  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
- *
- */
-
-
-#include "division.h"  
-
-void u8rdiva (uint8* in1, uint8* in2, int size, uint8* out ){
-	int i=0;
-	for (i=0;i<size;i++){
-		out[i]=u8rdivs(in1[i],in2[i]);
-	}
-}
diff --git a/src/c/operations/division/u8rdiva.c~ b/src/c/operations/division/u8rdiva.c~
deleted file mode 100644
index d1eb5c4b..00000000
--- a/src/c/operations/division/u8rdiva.c~
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2008-2008 - INRIA - Arnaud TORSET
- *
- *  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
- *
- */
-
-
-#include "division.h"  
-
-void u8rdiva (uint8* in1, uint8* in2, int size, uint8* out ){
-	int i=0;
-	for (i=0;i<size;i++){
-		out[i]=u8rdivs(in1[i],in2[i]);
-	}
-}
diff --git a/src/c/operations/multiplication/dmula.c~ b/src/c/operations/multiplication/dmula.c~
deleted file mode 100644
index 77c204a7..00000000
--- a/src/c/operations/multiplication/dmula.c~
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2008-2008 - INRIA - Arnaud TORSET
- *
- *  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
- *
- */
-
-
-#include "multiplication.h"
-
-void dmula(double* in1, double* in2, int size, double* out){
-	int i=0;
-	for (i=0;i<size;i++)
-        {
-		out[i]=dmuls(in1[i],in2[i]);
-	}
-}
diff --git a/src/c/operations/multiplication/dmuls.c~ b/src/c/operations/multiplication/dmuls.c~
deleted file mode 100644
index ac21ace0..00000000
--- a/src/c/operations/multiplication/dmuls.c~
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2008-2008 - INRIA - Arnaud TORSET
- *
- *  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
- *
- */
-
-
-#include "multiplication.h"
-
-double dmuls(double in1, double in2)
-{
-	return in1*in2;
-}
diff --git a/src/c/operations/multiplication/i16mula.c~ b/src/c/operations/multiplication/i16mula.c~
deleted file mode 100644
index b16378dd..00000000
--- a/src/c/operations/multiplication/i16mula.c~
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2008-2008 - INRIA - Arnaud TORSET
- *
- *  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
- *
- */
-
-
-#include "multiplication.h"
-
-void i16mula(int16* in1, int16* in2, int size, int16* out){
-	int i=0;
-	for (i=0;i<size;i++){
-		out[i]=i16muls(in1[i],in2[i]);
-	}
-}
diff --git a/src/c/operations/multiplication/i8mula.c~ b/src/c/operations/multiplication/i8mula.c~
deleted file mode 100644
index 4d27d628..00000000
--- a/src/c/operations/multiplication/i8mula.c~
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2008-2008 - INRIA - Arnaud TORSET
- *
- *  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
- *
- */
-
-
-#include "multiplication.h"
-
-void i8mula(int8* in1, int8* in2, int size, int8* out){
-	int i=0;
-	for (i=0;i<size;i++){
-		out[i]=i8muls(in1[i],in2[i]);
-	}
-}
diff --git a/src/c/operations/multiplication/u16mula.c~ b/src/c/operations/multiplication/u16mula.c~
deleted file mode 100644
index b6563d22..00000000
--- a/src/c/operations/multiplication/u16mula.c~
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2008-2008 - INRIA - Arnaud TORSET
- *
- *  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
- *
- */
-
-
-#include "multiplication.h"
-
-void u16mula(uint16* in1, uint16* in2, int size, uint16* out){
-	int i=0;
-	for (i=0;i<size;i++){
-		out[i]=u16muls(in1[i],in2[i]);
-	}
-}
diff --git a/src/c/operations/multiplication/u8mula.c~ b/src/c/operations/multiplication/u8mula.c~
deleted file mode 100644
index ff76fa75..00000000
--- a/src/c/operations/multiplication/u8mula.c~
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2008-2008 - INRIA - Arnaud TORSET
- *
- *  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
- *
- */
-
-
-#include "multiplication.h"
-
-void u8mula(uint8* in1, uint8* in2, int size, uint8* out){
-	int i=0;
-	for (i=0;i<size;i++){
-		out[i]=u8muls(in1[i],in2[i]);
-	}
-}
-- 
cgit