Merged 'master' with Mushir's work'

8 files changed, 0 insertions, 220 deletions

diff --git a/src/c/matrixOperations/trace/i16tracea.c~ b/src/c/matrixOperations/trace/i16tracea.c~
deleted file mode 100644
index 6a3d6a8b..00000000
--- a/src/c/matrixOperations/trace/i16tracea.c~
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2008-2008 - INRIA - Allan SIMON
- *
- *  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 "matrixTrace.h"
-
-int16 i16tracea ( int16* in ,int lines){
-    
-    
-    int i = 0 ;
-    //double out  = 0 ;
-    int16 out = 0;
-    
-    for (  i = 0 ; i < lines ; ++i)
-        out += (int16)in[i*lines + i] ;
-    
-    return out;
-}
-
-
diff --git a/src/c/matrixOperations/trace/i8tracea.c~ b/src/c/matrixOperations/trace/i8tracea.c~
deleted file mode 100644
index 88a1c46e..00000000
--- a/src/c/matrixOperations/trace/i8tracea.c~
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2008-2008 - INRIA - Allan SIMON
- *
- *  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 "matrixTrace.h"
-
-int8 i8tracea ( int8* in ,int lines){
-    
-    
-    int i = 0 ;
-    //double out  = 0 ;
-    int8 out = 0;
-    
-    for (  i = 0 ; i < lines ; ++i)
-        out += (int8)in[i*lines + i] ;
-    
-    return out;
-}
-
-
diff --git a/src/c/matrixOperations/trace/u16tracea.c~ b/src/c/matrixOperations/trace/u16tracea.c~
deleted file mode 100644
index 3cf9943c..00000000
--- a/src/c/matrixOperations/trace/u16tracea.c~
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2008-2008 - INRIA - Allan SIMON
- *
- *  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 "matrixTrace.h"
-
-uint16 u16tracea ( uint16* in ,int lines){
-    
-    
-    int i = 0 ;
-    //double out  = 0 ;
-    uint16 out = 0;
-    
-    for (  i = 0 ; i < lines ; ++i)
-        out += (uint16)in[i*lines + i] ;
-    
-    return out;
-}
-
-
diff --git a/src/c/matrixOperations/trace/u8tracea.c~ b/src/c/matrixOperations/trace/u8tracea.c~
deleted file mode 100644
index 97e73e21..00000000
--- a/src/c/matrixOperations/trace/u8tracea.c~
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2008-2008 - INRIA - Allan SIMON
- *
- *  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 "matrixTrace.h"
-
-uint8 u8tracea ( uint8* in ,int lines){
-    
-    
-    int i = 0 ;
-    //double out  = 0 ;
-    uint8 out = 0;
-    
-    for (  i = 0 ; i < lines ; ++i)
-        out += (uint8)in[i*lines + i] ;
-    
-    return out;
-}
-
-
diff --git a/src/c/matrixOperations/transpose/i16transposea.c~ b/src/c/matrixOperations/transpose/i16transposea.c~
deleted file mode 100644
index 366de067..00000000
--- a/src/c/matrixOperations/transpose/i16transposea.c~
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2008-2008 - INRIA - Allan SIMON
- *
- *  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 "matrixTranspose.h"
-
-void i16transposea ( int16* in , int lines , int columns, int16* out ){
-	
-	int i    = 0 ;
-	int j    = 0 ;
-	
-	for(i = 0 ; i <  lines ; i++)
-	{
-		for(j = 0 ; j <  columns ; j++)
-
-		out[j+i*columns] = (int16)in[i+j*lines];
-	}
-	
-}
diff --git a/src/c/matrixOperations/transpose/i8transposea.c~ b/src/c/matrixOperations/transpose/i8transposea.c~
deleted file mode 100644
index 20d451a0..00000000
--- a/src/c/matrixOperations/transpose/i8transposea.c~
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2008-2008 - INRIA - Allan SIMON
- *
- *  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 "matrixTranspose.h"
-
-void i8transposea ( int8* in , int lines , int columns, int8* out ){
-	
-	int i    = 0 ;
-	int j    = 0 ;
-	
-	for(i = 0 ; i <  lines ; i++)
-	{
-		for(j = 0 ; j <  columns ; j++)
-
-		out[j+i*columns] = (int8)in[i+j*lines];
-	}
-	
-}
diff --git a/src/c/matrixOperations/transpose/u16transposea.c~ b/src/c/matrixOperations/transpose/u16transposea.c~
deleted file mode 100644
index 33b35ecb..00000000
--- a/src/c/matrixOperations/transpose/u16transposea.c~
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2008-2008 - INRIA - Allan SIMON
- *
- *  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 "matrixTranspose.h"
-
-void u16transposea ( uint16* in , int lines , int columns, uint16* out ){
-	
-	int i    = 0 ;
-	int j    = 0 ;
-	
-	for(i = 0 ; i <  lines ; i++)
-	{
-		for(j = 0 ; j <  columns ; j++)
-
-		out[j+i*columns] = (uint16)in[i+j*lines];
-	}
-	
-}
diff --git a/src/c/matrixOperations/transpose/u8transposea.c~ b/src/c/matrixOperations/transpose/u8transposea.c~
deleted file mode 100644
index 2d0dd743..00000000
--- a/src/c/matrixOperations/transpose/u8transposea.c~
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2008-2008 - INRIA - Allan SIMON
- *
- *  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 "matrixTranspose.h"
-
-void u8transposea ( uint8* in , int lines , int columns, uint8* out ){
-	
-	int i    = 0 ;
-	int j    = 0 ;
-	
-	for(i = 0 ; i <  lines ; i++)
-	{
-		for(j = 0 ; j <  columns ; j++)
-
-		out[j+i*columns] = (uint8)in[i+j*lines];
-	}
-	
-}