From 169db0082ebd07baea82d00213db6ffd4dee7cf6 Mon Sep 17 00:00:00 2001
From: siddhu8990
Date: Mon, 27 Jun 2016 19:16:41 +0530
Subject: test commit

---
 src/c/string/interfaces/int_convstr.h | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 src/c/string/interfaces/int_convstr.h

(limited to 'src/c/string/interfaces/int_convstr.h')

diff --git a/src/c/string/interfaces/int_convstr.h b/src/c/string/interfaces/int_convstr.h
new file mode 100644
index 00000000..f565b858
--- /dev/null
+++ b/src/c/string/interfaces/int_convstr.h
@@ -0,0 +1,25 @@
+ /* 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: Siddhesh Wani
+ Organization: FOSSEE, IIT Bombay
+ Email: toolbox@scilab.in
+ */
+#ifndef __INT_CONVSTR_H__
+#define __INT_CONVSTR_H__
+
+ #ifdef  __cplusplus
+ extern "C" {
+ #endif
+
+#define g0constrg0(in, size)	gconstrs(in)
+
+ #ifdef  __cplusplus
+ } /* extern "C" */
+ #endif
+
+#endif /*__INT_CONVSTR_H__*/
-- 
cgit 


From 1fd0dce8d72c4d5869ce5ff4025ac09af603bc0f Mon Sep 17 00:00:00 2001
From: siddhu8990
Date: Wed, 19 Apr 2017 14:57:49 +0530
Subject: Merged Shamik's work

---
 src/c/string/interfaces/int_convstr.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/c/string/interfaces/int_convstr.h')

diff --git a/src/c/string/interfaces/int_convstr.h b/src/c/string/interfaces/int_convstr.h
index f565b858..fee3d373 100644
--- a/src/c/string/interfaces/int_convstr.h
+++ b/src/c/string/interfaces/int_convstr.h
@@ -5,7 +5,7 @@
  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: Siddhesh Wani
+ Author: Shamik Guha
  Organization: FOSSEE, IIT Bombay
  Email: toolbox@scilab.in
  */
@@ -16,7 +16,9 @@
  extern "C" {
  #endif
 
-#define g0constrg0(in, size)	gconstrs(in)
+#define g2g2convstrg2(in,size,flag,size2,out)	gconvstrs(in,size[0]*size[1],flag,size2[1],out)
+//#define g2g2convstrg0(in,size,type,typesize,out)	(type=='u': \
+			gconvstrs(in,size[0]*size[1],0,out)?gconvstrs(in,size[0]*size[1],1,out))
 
  #ifdef  __cplusplus
  } /* extern "C" */
-- 
cgit 


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/string/interfaces/int_convstr.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/c/string/interfaces/int_convstr.h')

diff --git a/src/c/string/interfaces/int_convstr.h b/src/c/string/interfaces/int_convstr.h
index fee3d373..2eade501 100644
--- a/src/c/string/interfaces/int_convstr.h
+++ b/src/c/string/interfaces/int_convstr.h
@@ -17,9 +17,9 @@
  #endif
 
 #define g2g2convstrg2(in,size,flag,size2,out)	gconvstrs(in,size[0]*size[1],flag,size2[1],out)
-//#define g2g2convstrg0(in,size,type,typesize,out)	(type=='u': \
+/*#define g2g2convstrg0(in,size,type,typesize,out)	(type=='u': \
 			gconvstrs(in,size[0]*size[1],0,out)?gconvstrs(in,size[0]*size[1],1,out))
-
+*/
  #ifdef  __cplusplus
  } /* extern "C" */
  #endif
-- 
cgit