-Update

4 files changed, 36 insertions, 39 deletions

diff --git a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
index d1212dac..b562894f 100644
--- a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
+++ b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
@@ -3,30 +3,28 @@
 function mainfunction()

 
 
-// test OpEqual
-disp(1<>1)
-disp(1<>2)
-disp(1<>2+%i)
-disp(1+%i<>2)
-disp(1+%i<>2+%i)
-
-a=[1 2 ; 3 4]
-b=[5 2 ; 6+%i 1-%i]
-
-disp(a<>a)
-disp(a<>b)
-disp(b<>a)
-disp(b<>b)
-
-
-disp(3<>a)
-disp(5<>b)
-disp(a<>4)
-disp(b<>2)
-
-disp(1+%i<>a)
-disp(1-%i<>b)
-disp(a<>6+%i)
-disp(b<>6+%i)
+// test fftshift
+
+disp(fftshift(4))
+disp(fftshift(5,1))
+disp(fftshift(6,2))
+
+disp(fftshift(4-%i))
+disp(fftshift(4-%i*2,1))
+disp(fftshift(4-%i*3,2))
+
+a=[2 3 4 8; 8 4 5 6;1 2 3 4; 14 5 8 7; 1 2 6 7]
+b=[2 3 4 8;1 2 6+3*%i 7]
+
+
+disp(fftshift(a))
+disp(fftshift(a,1))
+disp(fftshift(a,2))
+
+
+disp(fftshift(b))
+disp(fftshift(b,1))
+disp(fftshift(b,2))
+
 
 endfunction
diff --git a/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc b/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc
index 6aa99244..c368f61a 100644
--- a/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc
+++ b/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc
@@ -31,7 +31,6 @@ SWSRCS	=	\
 	$(CSRCDIR)/OpLogGt.c \
 	$(CSRCDIR)/OpLogGe.c \
 	$(CSRCDIR)/OpLogLe.c \
-	$(CSRCDIR)/OpLogEq.c \
 	$(CSRCDIR)/OpLogOr.c \
 	$(CSRCDIR)/OpLogAnd.c \
 	$(CSRCDIR)/ConvertPrecision.c \
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpLogLe.h b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpLogLe.h
index 5c5fdcd5..7bc0c3af 100644
--- a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpLogLe.h
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpLogLe.h
@@ -13,7 +13,7 @@
 /*
    Update 23/02/09 by Arnaud Torset : Add matrix comparaison, remove include(floatComplex and doubleComplex)
 */
-#ifndef __OPLOGGE_H__
+
 #ifndef __OPLOGLE_H__
 #define __OPLOGLE_H__
 
diff --git a/src/signalProcessing/interfaces/int_fftshift.h b/src/signalProcessing/interfaces/int_fftshift.h
index a2ddb185..d490657e 100644
--- a/src/signalProcessing/interfaces/int_fftshift.h
+++ b/src/signalProcessing/interfaces/int_fftshift.h
@@ -23,29 +23,29 @@
 
 #define z0fftshiftz0(in)			zfftshifts(in)
 
-#define s2fftshifts2(in,size,out)		sfftshifta(in, size[0]*size[1], out)
+#define s2fftshifts2(in,size,out)		sfftshifta(in, size[0], size[1], out)
 
-#define d2fftshiftd2(in,size,out)		dfftshifta(in, size[0]*size[1], out)
+#define d2fftshiftd2(in,size,out)		dfftshifta(in, size[0], size[1], out)
 
-#define c2fftshiftc2(in,size,out)		cfftshifta(in, size[0]*size[1], out)
+#define c2fftshiftc2(in,size,out)		cfftshifta(in, size[0], size[1], out)
 
-#define z2fftshiftz2(in,size,out)		zfftshifta(in, size[0]*size[1], out)
+#define z2fftshiftz2(in,size,out)		zfftshifta(in, size[0], size[1], out)
 
 
-#define s0s0fftshifts0(in1,in2)			sfftshifts(in)
+#define s0s0fftshifts0(in1,in2)			sfftshifts(in1)
 
-#define d0d0fftshiftd0(in,in2)			dfftshifts(in)
+#define d0d0fftshiftd0(in1,in2)			dfftshifts(in1)
 
-#define c0s0fftshiftc0(in,in2)			cfftshifts(in)
+#define c0s0fftshiftc0(in1,in2)			cfftshifts(in1)
 
-#define z0d0fftshiftz0(in,in2)			zfftshifts(in)
+#define z0d0fftshiftz0(in1,in2)			zfftshifts(in1)
 
-#define s2s0fftshifts2(in,size,in2,out)		(in2==1) ? srowfftshifta(in, size[0]*size[1], out) : scolumnfftshifta(in, size[0]*size[1], out)
+#define s2s0fftshifts2(in,size,in2,out)		(in2==1) ? srowfftshifta(in, size[0], size[1], out) : scolumnfftshifta(in, size[0], size[1], out)
 
-#define d2d0fftshiftd2(in,size,in2,out)		(in2==1) ? drowfftshifta(in, size[0]*size[1], out) : dcolumnfftshifta(in, size[0]*size[1], out)
+#define d2d0fftshiftd2(in,size,in2,out)		(in2==1) ? drowfftshifta(in, size[0], size[1], out) : dcolumnfftshifta(in, size[0], size[1], out)
 
-#define c2s0fftshiftc2(in,size,in2,out)		(in2==1) ? crowfftshifta(in, size[0]*size[1], out) : ccolumnfftshifta(in, size[0]*size[1], out)
+#define c2s0fftshiftc2(in,size,in2,out)		(in2==1) ? crowfftshifta(in, size[0], size[1], out) : ccolumnfftshifta(in, size[0], size[1], out)
 
-#define z2d0fftshiftz2(in,size,in2,out)		(in2==1) ? zrowfftshifta(in, size[0]*size[1], out) : zcolumnfftshifta(in, size[0]*size[1], out)
+#define z2d0fftshiftz2(in,size,in2,out)		(in2==1) ? zrowfftshifta(in, size[0], size[1], out) : zcolumnfftshifta(in, size[0], size[1], out)
 
 #endif /* !__INT_FFTSHIFT_H__ */