From 2d1620f79eebcf1469a4ed62cacd1f66695dedb1 Mon Sep 17 00:00:00 2001
From: torset
Date: Wed, 18 Feb 2009 13:30:04 +0000
Subject: Update

---
 src/auxiliaryFunctions/interfaces/int_max.h | 33 ++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

(limited to 'src/auxiliaryFunctions/interfaces/int_max.h')

diff --git a/src/auxiliaryFunctions/interfaces/int_max.h b/src/auxiliaryFunctions/interfaces/int_max.h
index a3f0562d..efef39d3 100644
--- a/src/auxiliaryFunctions/interfaces/int_max.h
+++ b/src/auxiliaryFunctions/interfaces/int_max.h
@@ -1,6 +1,6 @@
 /*
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008-2008 - INRIA - Bruno JOFRET
+ * 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
@@ -15,12 +15,39 @@
 #ifndef __INT_MAX_H__
 #define __INT_MAX_H__
 
+#define s0maxs0(in)	in
+
+#define d0maxd0(in)	in
+
+#define s2maxs0(in,size)	smaxa(in,size[0]*size[1]);
+
+#define d2maxd0(in,size)	dmaxa(in,size[0]*size[1]);
+
+
+
 #define s0s0maxs0(in1,in2)			max(in1,in2)
 
 #define d0d0maxd0(in1,in2)			max(in1,in2)
 
-#define s2s2maxs2(in,size,out)		maxa(in1, size[0]*size[1], in2, size[0]*size[1], out)
+#define s2s2maxs2(in1,size1,in2,size2,out)			maxa(in1, size1[0]*size1[1], in2, size2[0]*size2[1], out)
+
+#define d2d2maxd2(in1,size1,in2,size2,out)		maxa(in1, size1[0]*size1[1], in2, size2[0]*size2[1], out)
+
 
-#define d2d2maxd2(in,size,out)		maxa(in1, size[0]*size[1], in2, size[0]*size[1], out)
+#define s2s0maxs2(in1,size,in2,out)		{int i;\
+							for (i=0;i<size[0]*size[1];i++) out[i]=max(in1[i],in2);\
+							}							
 
+#define d2d0maxd2(in1,size,in2,out)		{int i;\
+							for (i=0;i<size[0]*size[1];i++) out[i]=max(in1[i],in2);\
+							}
+							
+#define s0s2maxs2(in1,in2,size,out)		{int i;\
+							for (i=0;i<size[0]*size[1];i++) out[i]=max(in1,in2[i]);\
+							}
+												
+#define d0d2maxd2(in1,in2,size,out)		{int i;\
+							for (i=0;i<size[0]*size[1];i++) out[i]=max(in1,in2[i]);\
+							}
+		
 #endif /* !__INT_MAX_H__ */
-- 
cgit