87 files changed, 299 insertions, 326 deletions
diff --git a/2.3-1/includes/blas.h b/2.3-1/includes/blas.h
index 86ab62f6..f4b0bdad 100644
--- a/2.3-1/includes/blas.h
+++ b/2.3-1/includes/blas.h
@@ -150,7 +150,7 @@ void	dgemm_(char *TRANSA, char* TRANSB, int *M, int *N, int *K,
 	       double *B, int *LDB, double *BETA,
 	       double *C, int *LDC);*/
 
-extern  int     C2F(dgemm)();
+extern  int     C2F(dgemm)(char *,char*,int*,int*,int*,double*,double*,int*,double*,int*,double*,double*,int*);
 extern  int     C2F(idamax)() ;/* could be transcribe easaly in c */
 extern  int     C2F(daxpy) () ;/* could be transcribe easaly in c */
 extern  int     C2F(dscal) () ;/* could be transcribe easaly in c */
diff --git a/2.3-1/includes/sci2clib.h b/2.3-1/includes/sci2clib.h
index 3567ca78..0e8446ef 100644
--- a/2.3-1/includes/sci2clib.h
+++ b/2.3-1/includes/sci2clib.h
@@ -1,55 +1,22 @@
 #ifndef __SCI2CLIB_H__
 #define __SCI2CLIB_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-/* #include "SCI2CMacroInterface.h"
- */
-/* #include "notFound.h"
- */
-/* #include "doubleComplex.h"
- */
-/* #include "floatComplex.h"
- */
-/* #include "RealToComplex.h"
- */
-/* #include "OpEqual.h"
- */
-/* #include "OpIns.h"
- */
-/* #include "OpExt.h"
- */
-/* #include "FileManagement.h"
- */
-/* #include "OpLogNe.h"
- */
-/* #include "OpLogGt.h"
- */
-/* #include "OpLogLt.h"
- */
-/* #include "OpLogGe.h"
- */
-/* #include "OpLogLe.h"
- */
-/* #include "OpLogEq.h"
- */
-/* #include "OpLogOr.h"
- */
-/* #include "OpLogAnd.h"
- */
-/* #include "OpLogNot.h"
- */
-/* #include "ConvertPrecision.h" */
-
+	
 /* CONSTANT */
 #include "constant.h"
 
 /* LIB */
-/* interfacing lapack */
-#include "lapack.h"
 /* interfacing blas */
 #include "blas.h"
+/* interfacing lapack */
+#include "lapack.h"
 
 /* AUXILIARY FUNCTIONS */
 
@@ -407,13 +374,13 @@
 #include "int_convstr.h"
 
 /*Functions related to opencv*/
-#include "cvcore.h"
-#include "int_cvcore.h"
-#include "cvhighgui.h"
-#include "int_cvhighgui.h"
-#include "cvimgproc.h"
-#include "int_cvimgproc.h"
-
+/*#include "cvcore.hpp"
+#include "int_cvcore.hpp"
+#include "cvhighgui.hpp"
+#include "int_cvhighgui.hpp"
+#include "cvimgproc.hpp"
+#include "int_cvimgproc.hpp"
+*/
 /*Scilab-arduino toolbox*/
 #ifdef Arduino1
 #include "int_cmd_digital_out.h"
@@ -464,4 +431,18 @@
 #include "int_RPIPeripheralPWM.h"
 #include "RPIPeripheralPWM.h"
 #endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#include "cvcore.hpp"
+#include "int_cvcore.hpp"
+#include "cvhighgui.hpp"
+#include "int_cvhighgui.hpp"
+#include "cvimgproc.hpp"
+#include "int_cvimgproc.hpp"
+
 #endif /* !__SCI2CLIB_H__ */
+
+
diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin
index ada2bb27..216107bf 100644
--- a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin
+++ b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin
diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci
index f184c39c..7ea24437 100644
--- a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci
+++ b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci
@@ -59,27 +59,35 @@ if getos() == 'Windows' then
   
      // Compiler definition
      PrintStringInfo('CC     = gcc',FileInfo.MakefileFilename,'file','y','y');
+     PrintStringInfo('CXX     = g++',FileInfo.MakefileFilename,'file','y','y');
      PrintStringInfo('CFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR)',FileInfo.MakefileFilename,'file','y','y');
+     PrintStringInfo('CXXFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR)',FileInfo.MakefileFilename,'file','y','y');
      PrintStringInfo('LDFLAGS = -L./ -lblasplus -llapack -lm',FileInfo.MakefileFilename,'file','y','y');   //Added -L./ and -lblasplus(previously it was -lblas)
      
 else 
 	if (target == 'RPi')
 		PrintStringInfo('CC     = arm-linux-gnueabihf-gcc ',FileInfo.MakefileFilename,'file','y','y');
+    PrintStringInfo('CXX     = arm-linux-gnueabihf-g++ ',FileInfo.MakefileFilename,'file','y','y');
 	  PrintStringInfo('CFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y');
+    PrintStringInfo('CXXFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y');
     PrintStringInfo('LDFLAGS = -llapack -lrefblas -lgfortran -lwiringPi',FileInfo.MakefileFilename,'file','y','y');
     if(SharedInfo.OpenCVUsed == %T)
-      PrintStringInfo('LDFLAGS += -lopencv_calib3d -lopencv_contrib -lopencv_core -lopencv_features2d -lopencv_flann',FileInfo.MakefileFilename,'file','y','y');
-      PrintStringInfo('LDFLAGS += -lopencv_gpu -lopencv_highgui -lopencv_imgproc -lopencv_legacy -lopencv_ml',FileInfo.MakefileFilename,'file','y','y');
-      PrintStringInfo('LDFLAGS += -lopencv_nonfree -lopencv_objdetect -lopencv_ocl -lopencv_photo -lopencv_stitching',FileInfo.MakefileFilename,'file','y','y');
-      PrintStringInfo('LDFLAGS += -lopencv_superres -lopencv_ts -lopencv_video -lopencv_videostab -lrt -lpthread -lm -ldl', FileInfo.MakefileFilename,'file','y','y');
+      PrintStringInfo('LDFLAGS += -lopencv_calib3d -lopencv_contrib -lopencv_features2d -lopencv_flann -lopencv_gpu',FileInfo.MakefileFilename,'file','y','y');
+      PrintStringInfo('LDFLAGS += -lopencv_highgui -lopencv_imgproc -lopencv_legacy -lopencv_ml -lopencv_nonfree',FileInfo.MakefileFilename,'file','y','y');
+      PrintStringInfo('LDFLAGS += -lopencv_objdetect -lopencv_ocl -lopencv_photo -lopencv_stitching -lopencv_superres',FileInfo.MakefileFilename,'file','y','y');
+      PrintStringInfo('LDFLAGS += -lopencv_ts -lopencv_video -lopencv_videostab -lopencv_core -lrt -lpthread -lm -ldl', FileInfo.MakefileFilename,'file','y','y');
+      PrintStringInfo('LDFLAGS += -lIlmImf -ljpeg -ljasper -ltiff -lpng -lzlib -lstdc++',FileInfo.MakefileFilename,'file','y','y');
     end
   else
 		PrintStringInfo('CC     = gcc',FileInfo.MakefileFilename,'file','y','y');
+    PrintStringInfo('CXX     = g++',FileInfo.MakefileFilename,'file','y','y');
     PrintStringInfo('CFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y');
+    PrintStringInfo('CXXFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y');
 	  PrintStringInfo('LDFLAGS = -lblas -llapack -lm ',FileInfo.MakefileFilename,'file','y','y');
     if(SharedInfo.OpenCVUsed == %T)
       PrintStringInfo('LDFLAGS += `pkg-config --libs opencv`',FileInfo.MakefileFilename,'file','y','y');
       PrintStringInfo('CFLAGS += `pkg-config --cflags opencv`',FileInfo.MakefileFilename,'file','y','y');
+      PrintStringInfo('CXXFLAGS += `pkg-config --cflags opencv`',FileInfo.MakefileFilename,'file','y','y');
     end
   end 
 	
@@ -98,40 +106,42 @@ PrintStringInfo('EXEFILE = $(SCI2CDIR)/$(EXEFILENAME)', FileInfo.MakefileFilenam
 // Sources
 //Check the output format selected and insert files according to it
 target = SharedInfo.Target;
-PrintStringInfo('SRC = \\', FileInfo.MakefileFilename,'file','y','y');
-allSources = getAllSources(SharedInfo);
-nbSources = size(allSources);
+PrintStringInfo('SRC = $(wildcard $(CSRCDIR)/*.c)', FileInfo.MakefileFilename,'file','y','y');
+PrintStringInfo('SRCC = $(wildcard $(CSRCDIR)/*.cpp)', FileInfo.MakefileFilename,'file','y','y');
+// allSources = getAllSources(SharedInfo);
+// nbSources = size(allSources);
 
-for i = 1:(nbSources(1) - 1)
-  [tmppath,tmpfile,tmpext] = fileparts(allSources(i));
+// for i = 1:(nbSources(1) - 1)
+//   [tmppath,tmpfile,tmpext] = fileparts(allSources(i));
   
-  if(~isempty(strstr(allSources(i),'dode')))
-    if(size(SharedInfo.Includelist) <> 0)
-        if((mtlb_strcmp(part(SharedInfo.Includelist(1),1:5),'odefn') == %T))
-          PrintStringInfo('    $(CSRCDIR)/'+tmpfile+tmpext+' \\', FileInfo.MakefileFilename,'file','y','y');
-        end
-    end
-  else
-    PrintStringInfo('    $(CSRCDIR)/'+tmpfile+tmpext+' \\', FileInfo.MakefileFilename,'file','y','y');
-  end
-end
-
-[tmppath,tmpfile,tmpext] = fileparts(allSources(nbSources(1)));
-PrintStringInfo('    $(CSRCDIR)/'+tmpfile+tmpext, FileInfo.MakefileFilename,'file','y','y');
+//   if(~isempty(strstr(allSources(i),'dode')))
+//     if(size(SharedInfo.Includelist) <> 0)
+//         if((mtlb_strcmp(part(SharedInfo.Includelist(1),1:5),'odefn') == %T))
+//           PrintStringInfo('    $(CSRCDIR)/'+tmpfile+tmpext+' \\', FileInfo.MakefileFilename,'file','y','y');
+//         end
+//     end
+//   else
+//     PrintStringInfo('    $(CSRCDIR)/'+tmpfile+tmpext+' \\', FileInfo.MakefileFilename,'file','y','y');
+//   end
+// end
+
+// [tmppath,tmpfile,tmpext] = fileparts(allSources(nbSources(1)));
+// PrintStringInfo('    $(CSRCDIR)/'+tmpfile+tmpext, FileInfo.MakefileFilename,'file','y','y');
 
 // Objects
 PrintStringInfo('OBJ = $(SRC:.c=.o)', FileInfo.MakefileFilename,'file','y','y');
+PrintStringInfo('OBJC = $(SRCC:.cpp=.o)', FileInfo.MakefileFilename,'file','y','y');
 
 // Rules
 PrintStringInfo('# ---------------',FileInfo.MakefileFilename,'file','y','y');
 PrintStringInfo('# --- TARGETS ---',FileInfo.MakefileFilename,'file','y','y');
 PrintStringInfo('# ---------------',FileInfo.MakefileFilename,'file','y','y');
-PrintStringInfo('compileexecute: $(OBJ)',FileInfo.MakefileFilename,'file','y','y');
+PrintStringInfo('compileexecute: $(OBJ) $(OBJC)',FileInfo.MakefileFilename,'file','y','y');
 PrintStringInfo('\t@echo "" ""',FileInfo.MakefileFilename,'file','y','y');
 PrintStringInfo('\t@echo ""============================""',FileInfo.MakefileFilename,'file','y','y');
 PrintStringInfo('\t@echo ""Generation of the executable""',FileInfo.MakefileFilename,'file','y','y');
 PrintStringInfo('\t@echo ""============================""',FileInfo.MakefileFilename,'file','y','y');
-PrintStringInfo('\t$(CC) $(CFLAGS) $(OBJ) *.c $(LDFLAGS) -o $(EXEFILE)',FileInfo.MakefileFilename,'file','y','y');
+PrintStringInfo('\t$(CXX) $(CFLAGS) $(OBJ) $(OBJC) *.c $(LDFLAGS) -o $(EXEFILE)',FileInfo.MakefileFilename,'file','y','y');
 PrintStringInfo('\t@echo "" ""',FileInfo.MakefileFilename,'file','y','y');
 if(target == "StandAlone")
   PrintStringInfo('\t@echo ""==============""',FileInfo.MakefileFilename,'file','y','y');
@@ -146,6 +156,7 @@ PrintStringInfo('\t@echo ""Removing only exe + obj files""',FileInfo.MakefileFil
 PrintStringInfo('\t@echo ""=============================""',FileInfo.MakefileFilename,'file','y','y');
 PrintStringInfo('\trm -rf $(EXEFILE)',FileInfo.MakefileFilename,'file','y','y');
 PrintStringInfo('\trm -rf $(OBJ)',FileInfo.MakefileFilename,'file','y','y');
+PrintStringInfo('\trm -rf $(OBJC)',FileInfo.MakefileFilename,'file','y','y');
 PrintStringInfo('\t@echo "" ""',FileInfo.MakefileFilename,'file','y','y');
 
 PrintStringInfo('distclean: clean',FileInfo.MakefileFilename,'file','y','y');
diff --git a/2.3-1/macros/CCodeGeneration/C_Type.bin b/2.3-1/macros/CCodeGeneration/C_Type.bin
index 78311b6c..fd024346 100644
--- a/2.3-1/macros/CCodeGeneration/C_Type.bin
+++ b/2.3-1/macros/CCodeGeneration/C_Type.bin
diff --git a/2.3-1/macros/CCodeGeneration/C_Type.sci b/2.3-1/macros/CCodeGeneration/C_Type.sci
index 60a3f8b2..13cf6de5 100644
--- a/2.3-1/macros/CCodeGeneration/C_Type.sci
+++ b/2.3-1/macros/CCodeGeneration/C_Type.sci
@@ -50,8 +50,8 @@ elseif (ArgType == 'i32')
 elseif (ArgType == 'fn') //This type introduced for ODE function,
    // as it's one of the inout argument is  name of the other function 
    OutC_Type = '';
-elseif (ArgType ==  'im')
-   OutC_Type = 'IplImage*'
+elseif (ArgType ==  'mt')
+   OutC_Type = 'Mat'
 else
    error(9999, 'Unknown Argument Type: ""'+ArgType+'"".');
 end
diff --git a/2.3-1/macros/ImageProcessing/CV_CreateImage.bin b/2.3-1/macros/ImageProcessing/CV_CreateImage.bin
deleted file mode 100644
index 4c638cc2..00000000
--- a/2.3-1/macros/ImageProcessing/CV_CreateImage.bin
+++ /dev/null
diff --git a/2.3-1/macros/ImageProcessing/CV_CreateImage.sci b/2.3-1/macros/ImageProcessing/CV_CreateImage.sci
deleted file mode 100644
index 85c01a46..00000000
--- a/2.3-1/macros/ImageProcessing/CV_CreateImage.sci
+++ /dev/null
@@ -1,41 +0,0 @@
-// 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
-
-function img = CV_CreateImage(width,height,bit_depth,no_of_channels)
-// function to create an image object of given size and type
-//
-// Calling Sequence
-//     CV_CreateImage(image_size,bit_depth,no_of_channels)
-//
-// Parameters
-//     image_size: width and height of image
-//	   bit_depth: Bit depth of image elements
-//	   no_of_channels: no of channels per pixels
-//
-// Description
-//		This function can be used to create opencv image object. For more info
-//	    about bit depth and channels,please refer to OpenCV documentation 
-// Examples
-//		CV_CreateImage([320 240], "8U", 1)	//to create image of the size 320*240
-//		pixels with 8 bit unsigned each pixels and gray scale image  
-//
-// See also
-//     CV_LoadImage
-//
-//
-// Authors
-//     Siddhesh Wani
-//
-img = 0;
-// This is curretly dummy function. It provides no functionality but is required 
-// for providing support for generating C code for OpenCV
-
-endfunction
diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_CvtColor.bin b/2.3-1/macros/ImageProcessing/imgproc/CV_CvtColor.bin
index 6ca6ea46..eee1018f 100644
--- a/2.3-1/macros/ImageProcessing/imgproc/CV_CvtColor.bin
+++ b/2.3-1/macros/ImageProcessing/imgproc/CV_CvtColor.bin
diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_CvtColor.sci b/2.3-1/macros/ImageProcessing/imgproc/CV_CvtColor.sci
index 8baa3865..220ad5f6 100644
--- a/2.3-1/macros/ImageProcessing/imgproc/CV_CvtColor.sci
+++ b/2.3-1/macros/ImageProcessing/imgproc/CV_CvtColor.sci
@@ -9,11 +9,11 @@
 // Organization: FOSSEE, IIT Bombay
 // Email: toolbox@scilab.in
 
-function status = CV_CvtColor(srcimg,dstimg,code)
+function cvtimg = CV_CvtColor(srcimg,code)
 // function to convert image from one colorspace to other colorspace
 //
 // Calling Sequence
-//     CV_CvtColor(srcimg,dstimg,code,dstCn)
+//     CV_CvtColor(srcimg,code)
 //
 // Parameters
 //     srcimg: source image to be converted
@@ -27,8 +27,7 @@ function status = CV_CvtColor(srcimg,dstimg,code)
 //		Refer OpenCV documentation for list of available conversions
 // Examples
 //		img = CV_LoadImage('~/test.jpg',0)
-//		dst = CV_CreateImage(320,240,"IPL_DEPTH_8U",1)
-//		CV_CvtColor(img,dst,'CV_RGB2GRAY')
+//		dst = CV_CvtColor(img,'CV_RGB2GRAY')
 //
 // See also
 //     CV_LoadImage CV_CreateImage
@@ -36,7 +35,7 @@ function status = CV_CvtColor(srcimg,dstimg,code)
 // Authors
 //     Siddhesh Wani
 //
-status = 0;
+cvtimg = 0
 // This is curretly dummy function. It provides no functionality but is required 
 // for providing support for generating C code for OpenCV
 
diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_Threshold.bin b/2.3-1/macros/ImageProcessing/imgproc/CV_Threshold.bin
new file mode 100644
index 00000000..c2ce1c60
--- /dev/null
+++ b/2.3-1/macros/ImageProcessing/imgproc/CV_Threshold.bin
diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_Threshold.sci b/2.3-1/macros/ImageProcessing/imgproc/CV_Threshold.sci
new file mode 100644
index 00000000..343fde53
--- /dev/null
+++ b/2.3-1/macros/ImageProcessing/imgproc/CV_Threshold.sci
@@ -0,0 +1,42 @@
+// 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
+
+function cvtimg = CV_Threshold(srcimg,threshold,max_value,thresh_type)
+// function to threshold input image
+//
+// Calling Sequence
+//     dst = CV_Threshold(srcimg,code,threshold,max_value,thresh_type)
+//
+// Parameters
+//     	srcimg: source image to be converted
+//	   	threshold: threshold value
+//		max_value: maximum value to be used with THRESH_BINARY and THRESH_BINARY_INV
+//		thresh_type: Type for threshold. It can one of the following:
+//					THRESH_BINARY, THRESH_BINARY_INV, THRESH_TRUNC,
+//					THRESH_TOZERO, THRESH_TOZERO_INV
+// Description
+//		This function can be used for converting an image to other colorspace.
+//		Refer OpenCV documentation for list of available conversions
+// Examples
+//		img = CV_LoadImage('~/test.jpg',0)
+//		dst = CV_Threshold(img,100,255,'THRESH_BINARY')
+//
+// See also
+//     CV_LoadImage CV_CreateImage
+//
+// Authors
+//     Siddhesh Wani
+//
+cvtimg = 0
+// This is curretly dummy function. It provides no functionality but is required 
+// for providing support for generating C code for OpenCV
+
+endfunction
diff --git a/2.3-1/macros/ImageProcessing/imgproc/lib b/2.3-1/macros/ImageProcessing/imgproc/lib
index 601946ed..173bc668 100644
--- a/2.3-1/macros/ImageProcessing/imgproc/lib
+++ b/2.3-1/macros/ImageProcessing/imgproc/lib
diff --git a/2.3-1/macros/ImageProcessing/imgproc/names b/2.3-1/macros/ImageProcessing/imgproc/names
index 537af898..31074fe5 100644
--- a/2.3-1/macros/ImageProcessing/imgproc/names
+++ b/2.3-1/macros/ImageProcessing/imgproc/names
@@ -1 +1,2 @@
 CV_CvtColor
+CV_Threshold
diff --git a/2.3-1/macros/ImageProcessing/lib b/2.3-1/macros/ImageProcessing/lib
deleted file mode 100644
index d374b907..00000000
--- a/2.3-1/macros/ImageProcessing/lib
+++ /dev/null
diff --git a/2.3-1/macros/ImageProcessing/names b/2.3-1/macros/ImageProcessing/names
deleted file mode 100644
index a681f790..00000000
--- a/2.3-1/macros/ImageProcessing/names
+++ /dev/null
@@ -1 +0,0 @@
-CV_CreateImage
diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin
index 8e238866..8ac49ac9 100644
--- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin
+++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin
diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index ac8d823c..164a7c73 100644
--- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -5543,12 +5543,12 @@ ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
 
 PrintStringInfo('NIN=         4',ClassFileName,'file','y');
 PrintStringInfo('NOUT=         1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP=    ''im''',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP=    ''mt''',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d0d0g2d0'+ArgSeparator+'im0',ClassFileName,'file','y');
+PrintStringInfo('d0d0g2d0'+ArgSeparator+'mt0',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'CV_CreateImage'; 
@@ -5567,12 +5567,12 @@ ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
 
 PrintStringInfo('NIN=         2',ClassFileName,'file','y');
 PrintStringInfo('NOUT=         1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP=    ''im''',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP=    ''mt''',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('g2d0'+ArgSeparator+'im0',ClassFileName,'file','y');
+PrintStringInfo('g2d0'+ArgSeparator+'mt0',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'CV_LoadImage'; 
@@ -5602,8 +5602,8 @@ PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('g2im0'+ArgSeparator+'u80',ClassFileName,'file','y');
-PrintStringInfo('im0'+ArgSeparator+'u80',ClassFileName,'file','y');
+PrintStringInfo('g2mt0'+ArgSeparator+'u80',ClassFileName,'file','y');
+PrintStringInfo('mt0'+ArgSeparator+'u80',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'CV_ShowImage'; 
@@ -5649,14 +5649,14 @@ ClassName = 'CV_CvtColor';
 PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');
 ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
 
-PrintStringInfo('NIN=         3',ClassFileName,'file','y');
+PrintStringInfo('NIN=         2',ClassFileName,'file','y');
 PrintStringInfo('NOUT=         1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP=    ''u8''',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP=    ''mt''',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('im0im0g2'+ArgSeparator+'u80',ClassFileName,'file','y');
+PrintStringInfo('mt0g2'+ArgSeparator+'mt0',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'CV_CvtColor'; 
@@ -5680,7 +5680,7 @@ PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).SZ(2)= ''2''',ClassFileName,'file','y');
 
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('im0'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('mt0'+ArgSeparator+'d2',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'CV_GetImgSize'; 
@@ -5688,6 +5688,30 @@ PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file',
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
 
+//------------------------------------
+//---- Class CV_Threshold -----------
+//------------------------------------
+ClassName = 'CV_Threshold';
+
+// --- Class Annotation. ---
+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+
+PrintStringInfo('NIN=         4',ClassFileName,'file','y');
+PrintStringInfo('NOUT=         1',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP=    ''mt''',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
+
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('mt0d0d0g2'+ArgSeparator+'mt0',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'CV_Threshold'; 
+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
 // ////////////////////////////////////////////
 // /////PARTE INTRODOTTA DA ALBERTO MOREA
 // /////////////////////////////////////////////
diff --git a/2.3-1/macros/findDeps/getAllHeaders.bin b/2.3-1/macros/findDeps/getAllHeaders.bin
index e934bc35..05e6c7e1 100644
--- a/2.3-1/macros/findDeps/getAllHeaders.bin
+++ b/2.3-1/macros/findDeps/getAllHeaders.bin
diff --git a/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci
index 06963ca6..bbc08906 100644
--- a/2.3-1/macros/findDeps/getAllHeaders.sci
+++ b/2.3-1/macros/findDeps/getAllHeaders.sci
@@ -181,9 +181,9 @@ function allHeaders = getAllHeaders(SharedInfo)
 		];
 
   OpenCV_headers = [
-      "src/c/imageProcessing/includes/cvcore.h"
-      "src/c/imageProcessing/includes/cvhighgui.h"
-      "src/c/imageProcessing/includes/cvimgproc.h"];
+      "src/c/imageProcessing/includes/cvcore.hpp"
+      "src/c/imageProcessing/includes/cvhighgui.hpp"
+      "src/c/imageProcessing/includes/cvimgproc.hpp"];
 
   if Target == "StandAlone"
   allHeaders = Standalone_headers;
diff --git a/2.3-1/macros/findDeps/getAllInterfaces.bin b/2.3-1/macros/findDeps/getAllInterfaces.bin
index c46573a8..c22a1b68 100644
--- a/2.3-1/macros/findDeps/getAllInterfaces.bin
+++ b/2.3-1/macros/findDeps/getAllInterfaces.bin
diff --git a/2.3-1/macros/findDeps/getAllInterfaces.sci b/2.3-1/macros/findDeps/getAllInterfaces.sci
index 0f90d5cc..2bdc8b75 100644
--- a/2.3-1/macros/findDeps/getAllInterfaces.sci
+++ b/2.3-1/macros/findDeps/getAllInterfaces.sci
@@ -172,9 +172,9 @@ function allInterfaces = getAllInterfaces(SharedInfo)
       ]; 
 
   OpenCV_interfaces = [
-      "src/c/imageProcessing/interfaces/int_cvcore.h"
-      "src/c/imageProcessing/interfaces/int_cvhighgui.h"
-      "src/c/imageProcessing/interfaces/int_cvimgproc.h"];
+      "src/c/imageProcessing/interfaces/int_cvcore.hpp"
+      "src/c/imageProcessing/interfaces/int_cvhighgui.hpp"
+      "src/c/imageProcessing/interfaces/int_cvimgproc.hpp"];
 
   if Target == "StandAlone"
   allInterfaces = Standalone_interfaces;
diff --git a/2.3-1/macros/findDeps/getAllLibraries.bin b/2.3-1/macros/findDeps/getAllLibraries.bin
index f016eba2..718e2b1f 100644
--- a/2.3-1/macros/findDeps/getAllLibraries.bin
+++ b/2.3-1/macros/findDeps/getAllLibraries.bin
diff --git a/2.3-1/macros/findDeps/getAllLibraries.sci b/2.3-1/macros/findDeps/getAllLibraries.sci
index 2850abad..7ac9e5be 100644
--- a/2.3-1/macros/findDeps/getAllLibraries.sci
+++ b/2.3-1/macros/findDeps/getAllLibraries.sci
@@ -11,25 +11,31 @@ function allLibraries = getAllLibraries(SharedInfo)
 		];
 
   RPi_cvlibs = [
-      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_calib3d.so"
-      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_contrib.so"
-      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_core.so"
-      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_features2d.so"
-      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_flann.so"
-      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_gpu.so"
-      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_highgui.so"
-      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_imgproc.so"
-      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_legacy.so"
-      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_ml.so"
-      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_nonfree.so"
-      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_objdetect.so"
-      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_ocl.so"
-      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_photo.so"
-      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_stitching.so"
-      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_superres.so"
-      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_video.so"
-      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_videostab.so"
+      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_calib3d.a"
+      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_contrib.a"
+      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_core.a"
+      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_features2d.a"
+      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_flann.a"
+      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_gpu.a"
+      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_highgui.a"
+      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_imgproc.a"
+      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_legacy.a"
+      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_ml.a"
+      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_nonfree.a"
+      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_objdetect.a"
+      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_ocl.a"
+      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_photo.a"
+      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_stitching.a"
+      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_superres.a"
+      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_video.a"
+      "src/c/hardware/rasberrypi/libraries/opencv/libopencv_videostab.a"
       "src/c/hardware/rasberrypi/libraries/opencv/libopencv_ts.a"
+      "src/c/hardware/rasberrypi/libraries/libjpeg.a"
+      "src/c/hardware/rasberrypi/libraries/libjasper.a"
+      "src/c/hardware/rasberrypi/libraries/libpng.a"
+      "src/c/hardware/rasberrypi/libraries/libIlmImf.a"
+      "src/c/hardware/rasberrypi/libraries/libzlib.a"
+      "src/c/hardware/rasberrypi/libraries/libtiff.a"
 ];  
 
   if Target == "RPi"
diff --git a/2.3-1/macros/findDeps/getAllSources.bin b/2.3-1/macros/findDeps/getAllSources.bin
index a6612baf..9d7f5ba6 100644
--- a/2.3-1/macros/findDeps/getAllSources.bin
+++ b/2.3-1/macros/findDeps/getAllSources.bin
diff --git a/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci
index 14326b6b..aaaf4bee 100644
--- a/2.3-1/macros/findDeps/getAllSources.sci
+++ b/2.3-1/macros/findDeps/getAllSources.sci
@@ -1039,11 +1039,12 @@ function allSources = getAllSources(SharedInfo)
       ];
 
   OpenCV_files = [
-      "src/c/imageProcessing/cvcore/imcvCreateImages.c"
-      "src/c/imageProcessing/cvcore/imcvGetImgSizes.c"
-      "src/c/imageProcessing/cvhighgui/imcvLoadImages.c"
-      "src/c/imageProcessing/cvhighgui/imcvShowImages.c"
-      "src/c/imageProcessing/cvimgproc/imcvCvtColors.c"];    
+      "src/c/imageProcessing/cvcore/imcvCreateImages.cpp"
+      "src/c/imageProcessing/cvcore/imcvGetImgSizes.cpp"
+      "src/c/imageProcessing/cvhighgui/imcvLoadImages.cpp"
+      "src/c/imageProcessing/cvhighgui/imcvShowImages.cpp"
+      "src/c/imageProcessing/cvimgproc/imcvCvtColors.cpp"
+      "src/c/imageProcessing/cvimgproc/imcvThresholds.cpp"];    
 
   if Target == "StandAlone"
   allSources = Standalone_files;
diff --git a/2.3-1/src/c/auxiliaryFunctions/interfaces/int_conj.h b/2.3-1/src/c/auxiliaryFunctions/interfaces/int_conj.h
index fec555b2..7884c99f 100644
--- a/2.3-1/src/c/auxiliaryFunctions/interfaces/int_conj.h
+++ b/2.3-1/src/c/auxiliaryFunctions/interfaces/int_conj.h
@@ -15,7 +15,7 @@
 #ifndef __INT_CONJ_H__
 #define __INT_CONJ_H__
 
-#define copy(in,size,out)		{int i;for (i=0; i<size[0]*size[1];i++) out[i]=in[i];}
+#define copy_c(in,size,out)		{int i;for (i=0; i<size[0]*size[1];i++) out[i]=in[i];}
 
 #define s0conjs0(in)			in
 
@@ -33,20 +33,20 @@
 
 #define i160conji160(in)		in
 
-#define s2conjs2(in,size,out)		copy(in,size,out)
+#define s2conjs2(in,size,out)		copy_c(in,size,out)
 
-#define d2conjd2(in,size,out)		copy(in,size,out)
+#define d2conjd2(in,size,out)		copy_c(in,size,out)
 
 #define c2conjc2(in,size,out)		cconja(in, size[0]*size[1], out)
 
 #define z2conjz2(in,size,out)		zconja(in, size[0]*size[1], out)
 
-#define u82conju82(in,size,out)		copy(in,size,out)
+#define u82conju82(in,size,out)		copy_c(in,size,out)
 
-#define i82conji82(in,size,out)		copy(in,size,out)
+#define i82conji82(in,size,out)		copy_c(in,size,out)
 
-#define u162conju162(in,size,out)	copy(in,size,out)
+#define u162conju162(in,size,out)	copy_c(in,size,out)
 
-#define i162conji162(in,size,out)	copy(in,size,out)
+#define i162conji162(in,size,out)	copy_c(in,size,out)
 
 #endif /* !__INT_CONJ_H__ */
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/libIlmImf.a b/2.3-1/src/c/hardware/rasberrypi/libraries/libIlmImf.a
new file mode 100644
index 00000000..0d9631d2
--- /dev/null
+++ b/2.3-1/src/c/hardware/rasberrypi/libraries/libIlmImf.a
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/libjasper.a b/2.3-1/src/c/hardware/rasberrypi/libraries/libjasper.a
index 6867f832..662e414c 100644
--- a/2.3-1/src/c/hardware/rasberrypi/libraries/libjasper.a
+++ b/2.3-1/src/c/hardware/rasberrypi/libraries/libjasper.a
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/libjpeg.a b/2.3-1/src/c/hardware/rasberrypi/libraries/libjpeg.a
index 4716fd80..e30c70c4 100644
--- a/2.3-1/src/c/hardware/rasberrypi/libraries/libjpeg.a
+++ b/2.3-1/src/c/hardware/rasberrypi/libraries/libjpeg.a
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/libpng.a b/2.3-1/src/c/hardware/rasberrypi/libraries/libpng.a
new file mode 100644
index 00000000..937cc22c
--- /dev/null
+++ b/2.3-1/src/c/hardware/rasberrypi/libraries/libpng.a
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/libpng.a.bkup b/2.3-1/src/c/hardware/rasberrypi/libraries/libpng.a.bkup
new file mode 100644
index 00000000..ae370765
--- /dev/null
+++ b/2.3-1/src/c/hardware/rasberrypi/libraries/libpng.a.bkup
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/libtiff.a b/2.3-1/src/c/hardware/rasberrypi/libraries/libtiff.a
index 743428e6..917d747d 100644
--- a/2.3-1/src/c/hardware/rasberrypi/libraries/libtiff.a
+++ b/2.3-1/src/c/hardware/rasberrypi/libraries/libtiff.a
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/libzlib.a b/2.3-1/src/c/hardware/rasberrypi/libraries/libzlib.a
new file mode 100644
index 00000000..5a64389d
--- /dev/null
+++ b/2.3-1/src/c/hardware/rasberrypi/libraries/libzlib.a
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_calib3d.a b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_calib3d.a
new file mode 100644
index 00000000..5d69787c
--- /dev/null
+++ b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_calib3d.a
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_calib3d.so b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_calib3d.so
deleted file mode 100644
index 357be83f..00000000
--- a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_calib3d.so
+++ /dev/null
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_contrib.a b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_contrib.a
new file mode 100644
index 00000000..c2b4527e
--- /dev/null
+++ b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_contrib.a
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_contrib.so b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_contrib.so
deleted file mode 100644
index 642ed003..00000000
--- a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_contrib.so
+++ /dev/null
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_core.a b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_core.a
new file mode 100644
index 00000000..1a7056fc
--- /dev/null
+++ b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_core.a
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_core.so b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_core.so
deleted file mode 100644
index 900f46da..00000000
--- a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_core.so
+++ /dev/null
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_features2d.a b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_features2d.a
new file mode 100644
index 00000000..3bd21f25
--- /dev/null
+++ b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_features2d.a
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_features2d.so b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_features2d.so
deleted file mode 100644
index b4d42966..00000000
--- a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_features2d.so
+++ /dev/null
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_flann.a b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_flann.a
new file mode 100644
index 00000000..b5648fc6
--- /dev/null
+++ b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_flann.a
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_flann.so b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_flann.so
deleted file mode 100644
index b4af830a..00000000
--- a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_flann.so
+++ /dev/null
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_gpu.a b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_gpu.a
new file mode 100644
index 00000000..a3b093ac
--- /dev/null
+++ b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_gpu.a
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_gpu.so b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_gpu.so
deleted file mode 100644
index c30af67d..00000000
--- a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_gpu.so
+++ /dev/null
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_haartraining_engine.a b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_haartraining_engine.a
new file mode 100644
index 00000000..3a20f71a
--- /dev/null
+++ b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_haartraining_engine.a
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_highgui.a b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_highgui.a
new file mode 100644
index 00000000..9b22dabe
--- /dev/null
+++ b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_highgui.a
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_highgui.so b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_highgui.so
deleted file mode 100644
index 9a502296..00000000
--- a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_highgui.so
+++ /dev/null
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_imgproc.a b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_imgproc.a
new file mode 100644
index 00000000..3ae1ca04
--- /dev/null
+++ b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_imgproc.a
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_imgproc.so b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_imgproc.so
deleted file mode 100644
index 28bd1611..00000000
--- a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_imgproc.so
+++ /dev/null
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_legacy.a b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_legacy.a
new file mode 100644
index 00000000..2d906d1c
--- /dev/null
+++ b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_legacy.a
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_legacy.so b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_legacy.so
deleted file mode 100644
index 37d231f7..00000000
--- a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_legacy.so
+++ /dev/null
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ml.a b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ml.a
new file mode 100644
index 00000000..5f6c164a
--- /dev/null
+++ b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ml.a
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ml.so b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ml.so
deleted file mode 100644
index b31bf423..00000000
--- a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ml.so
+++ /dev/null
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_nonfree.a b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_nonfree.a
new file mode 100644
index 00000000..4f49c8d1
--- /dev/null
+++ b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_nonfree.a
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_nonfree.so b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_nonfree.so
deleted file mode 100644
index 53fdba22..00000000
--- a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_nonfree.so
+++ /dev/null
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_objdetect.a b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_objdetect.a
new file mode 100644
index 00000000..6b3ddad3
--- /dev/null
+++ b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_objdetect.a
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_objdetect.so b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_objdetect.so
deleted file mode 100644
index 2fd44680..00000000
--- a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_objdetect.so
+++ /dev/null
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ocl.a b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ocl.a
new file mode 100644
index 00000000..f5a4b42b
--- /dev/null
+++ b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ocl.a
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ocl.so b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ocl.so
deleted file mode 100644
index 6543e943..00000000
--- a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ocl.so
+++ /dev/null
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_photo.a b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_photo.a
new file mode 100644
index 00000000..998a80a7
--- /dev/null
+++ b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_photo.a
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_photo.so b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_photo.so
deleted file mode 100644
index 4ef7a4e3..00000000
--- a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_photo.so
+++ /dev/null
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_stitching.a b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_stitching.a
new file mode 100644
index 00000000..aa0b1d39
--- /dev/null
+++ b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_stitching.a
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_stitching.so b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_stitching.so
deleted file mode 100644
index 8e4ed8e9..00000000
--- a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_stitching.so
+++ /dev/null
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_superres.a b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_superres.a
new file mode 100644
index 00000000..d33df018
--- /dev/null
+++ b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_superres.a
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_superres.so b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_superres.so
deleted file mode 100644
index 02335315..00000000
--- a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_superres.so
+++ /dev/null
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ts.a b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ts.a
index aea7e97d..f7016020 100644
--- a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ts.a
+++ b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ts.a
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_video.a b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_video.a
new file mode 100644
index 00000000..c4a07bf0
--- /dev/null
+++ b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_video.a
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_video.so b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_video.so
deleted file mode 100644
index 9c05c5d2..00000000
--- a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_video.so
+++ /dev/null
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_videostab.a b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_videostab.a
new file mode 100644
index 00000000..e2c302d5
--- /dev/null
+++ b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_videostab.a
diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_videostab.so b/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_videostab.so
deleted file mode 100644
index a44efbc6..00000000
--- a/2.3-1/src/c/hardware/rasberrypi/libraries/opencv/libopencv_videostab.so
+++ /dev/null
diff --git a/2.3-1/src/c/imageProcessing/cvcore/imcvCreateImages.c b/2.3-1/src/c/imageProcessing/cvcore/imcvCreateImages.c
deleted file mode 100644
index 4543b724..00000000
--- a/2.3-1/src/c/imageProcessing/cvcore/imcvCreateImages.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* 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
-*/
-
-/* Function to create openCV image object from given specifications*/
-
-#include "types.h"
-#include "cvcore.h"
-#include <stdio.h>
-
-IplImage* imcvCreateImages(int width, int height, char *bit_depth, uint8 no_of_ch)
-{
-	CvSize imageSize = cvSize (width,height);
-	IplImage* img = NULL;
-	if (strcmp(bit_depth,"IPL_DEPTH_1U") == 0)
-		img = cvCreateImage(imageSize,IPL_DEPTH_1U,no_of_ch);
-	else if (strcmp(bit_depth,"IPL_DEPTH_8U") == 0)
-		img = cvCreateImage(imageSize,IPL_DEPTH_8U,no_of_ch);
-	else if (strcmp(bit_depth,"IPL_DEPTH_8S") == 0)
-		img = cvCreateImage(imageSize,IPL_DEPTH_8S,no_of_ch);
-	else if (strcmp(bit_depth,"IPL_DEPTH_16U") == 0)
-		img = cvCreateImage(imageSize,IPL_DEPTH_8U,no_of_ch);
-	else if (strcmp(bit_depth,"IPL_DEPTH_16S") == 0)
-		img = cvCreateImage(imageSize,IPL_DEPTH_8S,no_of_ch);
-	else if (strcmp(bit_depth,"IPL_DEPTH_32U") == 0)
-		img = cvCreateImage(imageSize,IPL_DEPTH_8U,no_of_ch);
-	else if (strcmp(bit_depth,"IPL_DEPTH_32S") == 0)
-		img = cvCreateImage(imageSize,IPL_DEPTH_8S,no_of_ch);
-
-	return img;
-} 
-\ No newline at end of file
diff --git a/2.3-1/src/c/imageProcessing/cvcore/imcvCreateImages.cpp b/2.3-1/src/c/imageProcessing/cvcore/imcvCreateImages.cpp
new file mode 100644
index 00000000..a04e836a
--- /dev/null
+++ b/2.3-1/src/c/imageProcessing/cvcore/imcvCreateImages.cpp
@@ -0,0 +1,46 @@
+/* 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
+*/
+
+/* Function to create openCV image object from given specifications*/
+
+#include "types.h"
+#include "cvcore.hpp"
+#include <stdio.h>
+
+using namespace cv;
+using namespace std;
+
+Mat imcvCreateImages(int width, int height, char *bit_depth, uint8 no_of_ch)
+{
+	Mat img;
+	/*Create opencv matrix with given type*/
+	if (strcmp(bit_depth,"CV_8U") == 0)
+		img = Mat(height,width,CV_8U);
+	else if (strcmp(bit_depth,"CV_8S") == 0)
+		img = Mat(height,width,CV_8S);
+	else if (strcmp(bit_depth,"CV_16U") == 0)
+		img = Mat(height,width,CV_16U);
+	else if (strcmp(bit_depth,"CV_16S") == 0)
+		img = Mat(height,width,CV_16S);
+	else if (strcmp(bit_depth,"CV_32F") == 0)
+		img = Mat(height,width,CV_32F);
+	else if (strcmp(bit_depth,"CV_32S") == 0)
+		img = Mat(height,width,CV_32S);
+	else if (strcmp(bit_depth,"CV_64F") == 0)
+		img = Mat(height,width,CV_64F);
+	
+
+	/*Change no of channels to specified input*/
+	img.reshape(no_of_ch);
+	
+	return img;
+} 
+\ No newline at end of file
diff --git a/2.3-1/src/c/imageProcessing/cvimgproc/imcvCvtColors.c b/2.3-1/src/c/imageProcessing/cvcore/imcvGetImgSizes.cpp
index bc2a70ec..0c4e848f 100644
--- a/2.3-1/src/c/imageProcessing/cvimgproc/imcvCvtColors.c
+++ b/2.3-1/src/c/imageProcessing/cvcore/imcvGetImgSizes.cpp
@@ -13,15 +13,15 @@
 /* Function to convert image object to other color space*/
 
 #include "types.h"
-#include "cvcore.h"
-#include "cvimgproc.h"
+#include "cvcore.hpp"
+#include "cvimgproc.hpp"
 #include <stdio.h>
 
-uint8 imcvCvtColors(IplImage* src, IplImage* dst, char* code)
-{
-
-	if(strcmp(code,"CV_BGR2GRAY") == 0)
-		cvCvtColor(src,dst,CV_RGB2GRAY);
+using namespace cv;
+using namespace std;
 
-	return 0;
+void imcvGetImgSizes(Mat src, double* imgsize)
+{
+		imgsize[0] = src.rows;
+		imgsize[1] = src.cols;	
 }
 \ No newline at end of file
diff --git a/2.3-1/src/c/imageProcessing/cvhighgui/imcvLoadImages.c b/2.3-1/src/c/imageProcessing/cvhighgui/imcvLoadImages.cpp
index 7c843f94..bf7ff07e 100644
--- a/2.3-1/src/c/imageProcessing/cvhighgui/imcvLoadImages.c
+++ b/2.3-1/src/c/imageProcessing/cvhighgui/imcvLoadImages.cpp
@@ -13,11 +13,11 @@
 /* Function to load image object from given filename*/
 
 #include "types.h"
-#include "cvcore.h"
-#include "cvhighgui.h"
+#include "cvcore.hpp"
+#include "cvhighgui.hpp"
 #include <stdio.h>
 
-IplImage* imcvLoadImages(char *filename, uint8 opentype)
+Mat imcvLoadImages(char *filename, uint8 opentype)
 {
-	return (cvLoadImage(filename,opentype));
+	return (imread(filename,opentype));
 } 
 \ No newline at end of file
diff --git a/2.3-1/src/c/imageProcessing/cvhighgui/imcvShowImages.c b/2.3-1/src/c/imageProcessing/cvhighgui/imcvShowImages.cpp
index 82ae3ee3..6179c3dc 100644
--- a/2.3-1/src/c/imageProcessing/cvhighgui/imcvShowImages.c
+++ b/2.3-1/src/c/imageProcessing/cvhighgui/imcvShowImages.cpp
@@ -13,13 +13,15 @@
 /* Function to create show an image */
 
 #include "types.h"
-#include "cvcore.h"
-#include "cvhighgui.h"
+#include "cvcore.hpp"
+#include "cvhighgui.hpp"
 #include <stdio.h>
 
-uint8 imcvShowImages(char *winname, IplImage* img)
+using namespace cv;
+
+uint8 imcvShowImages(char *winname, Mat img)
 {
-	cvShowImage(winname,img);
+	imshow(winname,img);
 
 	return (0);
 } 
 \ No newline at end of file
diff --git a/2.3-1/src/c/imageProcessing/cvcore/imcvGetImgSizes.c b/2.3-1/src/c/imageProcessing/cvimgproc/imcvCvtColors.cpp
index 2faa6271..1523afea 100644
--- a/2.3-1/src/c/imageProcessing/cvcore/imcvGetImgSizes.c
+++ b/2.3-1/src/c/imageProcessing/cvimgproc/imcvCvtColors.cpp
@@ -13,20 +13,17 @@
 /* Function to convert image object to other color space*/
 
 #include "types.h"
-#include "cvcore.h"
-#include "cvimgproc.h"
+#include "cvcore.hpp"
+#include "cvimgproc.hpp"
 #include <stdio.h>
 
-void imcvGetImgSizes(IplImage* src, double* imgsize)
+using namespace cv;
+
+Mat imcvCvtColors(Mat src, char* code)
 {
-	if(src != NULL)
-	{
-		imgsize[0] = src->width;
-		imgsize[1] = src->height;
-	}
-	else
-	{
-		printf("Error with input image");
-	}
-	
+	Mat dst(src.rows, src.cols, src.type());
+	if(strcmp(code,"CV_RGB2GRAY") == 0)
+		cvtColor(src,dst,CV_RGB2GRAY);
+
+	return dst;
 }
 \ No newline at end of file
diff --git a/2.3-1/src/c/imageProcessing/cvimgproc/imcvThresholds.c b/2.3-1/src/c/imageProcessing/cvimgproc/imcvThresholds.cpp
index cd66c52e..2e40de91 100644
--- a/2.3-1/src/c/imageProcessing/cvimgproc/imcvThresholds.c
+++ b/2.3-1/src/c/imageProcessing/cvimgproc/imcvThresholds.cpp
@@ -13,15 +13,17 @@
 /* Function to threshold a gray scale image*/
 
 #include "types.h"
-#include "cvcore.h"
-#include "cvimgproc.h"
+#include "cvcore.hpp"
+#include "cvimgproc.hpp"
 #include <stdio.h>
 
-IplImage* imcvThresholds(IplImage* src, double threshold, double maxvalue, char* type)
+using namespace cv;
+
+Mat imcvThresholds(Mat src, double t_value, double maxvalue, char* type)
 {
-	dst = imcvCreates(src->width, src->height, src->,1);
-	if(strcmp(code,"CV_BGR2GRAY") == 0)
-		cvCvtColor(src,dst,CV_RGB2GRAY);
+	Mat dst(src.rows, src.cols, src.type());
+	if(strcmp(type,"THRESH_BINARY") == 0)
+		threshold(src,dst,t_value,maxvalue,THRESH_BINARY);
 
-	return 0;
+	return dst;
 }
 \ No newline at end of file
diff --git a/2.3-1/src/c/imageProcessing/includes/core.h b/2.3-1/src/c/imageProcessing/includes/core.h
deleted file mode 100644
index 1e4c83cb..00000000
--- a/2.3-1/src/c/imageProcessing/includes/core.h
+++ /dev/null
@@ -1,11 +0,0 @@
- /* 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
- */
diff --git a/2.3-1/src/c/imageProcessing/includes/cvcore.h b/2.3-1/src/c/imageProcessing/includes/cvcore.hpp
index 4f04e581..78876f7a 100644
--- a/2.3-1/src/c/imageProcessing/includes/cvcore.h
+++ b/2.3-1/src/c/imageProcessing/includes/cvcore.hpp
@@ -13,18 +13,14 @@
 #ifndef __CVCORE_H__
 #define __CVCORE_H__
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
 
 #include "types.h"
 #include "opencv2/core/core.hpp"
 
-IplImage* imcvCreateImages(int width, int height, char *bit_depth, uint8 no_of_ch);
-void imcvGetImgSizes(IplImage* src, double* imgsize);
-#ifdef  __cplusplus
-} /* extern "C" */
-#endif
+using namespace cv;
+
+Mat imcvCreateImages(int width, int height, char *bit_depth, uint8 no_of_ch);
+void imcvGetImgSizes(Mat src, double* imgsize);
+
 
 #endif  /*__CVCORE_H__*/
diff --git a/2.3-1/src/c/imageProcessing/includes/cvhighgui.h b/2.3-1/src/c/imageProcessing/includes/cvhighgui.hpp
index 2e959a5d..167cb63a 100644
--- a/2.3-1/src/c/imageProcessing/includes/cvhighgui.h
+++ b/2.3-1/src/c/imageProcessing/includes/cvhighgui.hpp
@@ -13,20 +13,14 @@
 #ifndef __CVHIGHGUI_H__
 #define __CVHIGHGUI_H__
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-
 #include "types.h"
 #include "opencv2/core/core.hpp"
 #include "opencv2/highgui/highgui.hpp"
 
-IplImage* imcvLoadImages(char *filename, uint8 opentype);
-uint8 imcvShowImages(char *winname, IplImage* img);
+using namespace cv;
+
+Mat imcvLoadImages(char *filename, uint8 opentype);
+uint8 imcvShowImages(char *winname, Mat img);
 
-#ifdef  __cplusplus
-} /* extern "C" */
-#endif
 
 #endif  /*__CVCORE_H__*/
diff --git a/2.3-1/src/c/imageProcessing/includes/cvimgproc.h b/2.3-1/src/c/imageProcessing/includes/cvimgproc.hpp
index 5d982e49..b7d2faa2 100644
--- a/2.3-1/src/c/imageProcessing/includes/cvimgproc.h
+++ b/2.3-1/src/c/imageProcessing/includes/cvimgproc.hpp
@@ -13,19 +13,13 @@
 #ifndef __CVIMGPROC_H__
 #define __CVIMGPROC_H__
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-
 #include "types.h"
 #include "opencv2/core/core.hpp"	
 #include "opencv2/imgproc/imgproc.hpp"
 
-uint8 imcvCvtColor(IplImage* src, IplImage* dst, char* code);
+using namespace cv;
 
-#ifdef  __cplusplus
-} /* extern "C" */
-#endif
+Mat imcvCvtColors(Mat src, char* code);
+Mat imcvThresholds(Mat src, double threshold, double maxvalue, char* type);
 
 #endif  /*__CVIMGPROC_H__*/
diff --git a/2.3-1/src/c/imageProcessing/includes/temp.h b/2.3-1/src/c/imageProcessing/includes/temp.h
deleted file mode 100644
index 1e4c83cb..00000000
--- a/2.3-1/src/c/imageProcessing/includes/temp.h
+++ /dev/null
@@ -1,11 +0,0 @@
- /* 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
- */
diff --git a/2.3-1/src/c/imageProcessing/interfaces/int_cvcore.h b/2.3-1/src/c/imageProcessing/interfaces/int_cvcore.hpp
index 5ae0055f..82c1313e 100644
--- a/2.3-1/src/c/imageProcessing/interfaces/int_cvcore.h
+++ b/2.3-1/src/c/imageProcessing/interfaces/int_cvcore.hpp
@@ -13,20 +13,14 @@
 #ifndef __INT_CVCORE_H__
 #define __INT_CVCORE_H__
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
 
 #include "types.h"
-#include "cvcore.h"
+#include "cvcore.hpp"
 
-#define d0d0g2d0CV_CreateImageim0(width,height,depth,depth_size,no_of_ch) \
+#define d0d0g2d0CV_CreateImagemt0(width,height,depth,depth_size,no_of_ch) \
 				imcvCreateImages(width,height,depth,no_of_ch)
 
-#define im0CV_GetImgSized2(img,imgsize) imcvGetImgSizes(img,imgsize)
-#ifdef  __cplusplus
-} /* extern "C" */
-#endif
+#define mt0CV_GetImgSized2(img,imgsize) imcvGetImgSizes(img,imgsize)
+
 
 #endif  /*__INT_CVCORE_H__*/
diff --git a/2.3-1/src/c/imageProcessing/interfaces/int_cvhighgui.h b/2.3-1/src/c/imageProcessing/interfaces/int_cvhighgui.hpp
index d8ecf1c6..05f260f6 100644
--- a/2.3-1/src/c/imageProcessing/interfaces/int_cvhighgui.h
+++ b/2.3-1/src/c/imageProcessing/interfaces/int_cvhighgui.hpp
@@ -13,22 +13,16 @@
 #ifndef __INT_CVHIGHGUI_H__
 #define __INT_CVHIGHGUI_H__
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
 
 #include "types.h"
+#include "opencv2/core/core.hpp"
 #include "opencv2/highgui/highgui.hpp"
 
-#define g2d0CV_LoadImageim0(filename,name_size,loadtype) imcvLoadImages(filename,loadtype)
-#define g2im0CV_ShowImageu80(winname,win_size,img) imcvShowImages(winname,img)
-#define im0CV_ShowImageu80(img) imcvShowImages("",img) 
+//#define g2d0CV_LoadImageim0(filename,name_size,loadtype) imcvLoadImages(filename,loadtype)
+#define g2d0CV_LoadImagemt0(filename,name_size,loadtype) imread(filename,loadtype)
+#define g2mt0CV_ShowImageu80(winname,win_size,img) imshow(winname,img)
+#define mt0CV_ShowImageu80(img) imshow("",img) 
 #define d0CV_WaitKeyu80(delay) cvWaitKey(delay)
-#define g2im0CV_SaveImageu80(filename,name_size,img) cvSaveImage(filename,img,NULL)	
-
-#ifdef  __cplusplus
-} /* extern "C" */
-#endif
+#define g2mt0CV_SaveImageu80(filename,name_size,img) imwrite(filename,img)	
 
 #endif  /*__INT_CVHIGHGUI_H__*/
diff --git a/2.3-1/src/c/imageProcessing/interfaces/int_cvimgproc.h b/2.3-1/src/c/imageProcessing/interfaces/int_cvimgproc.hpp
index 47192e10..65fa77e4 100644
--- a/2.3-1/src/c/imageProcessing/interfaces/int_cvimgproc.h
+++ b/2.3-1/src/c/imageProcessing/interfaces/int_cvimgproc.hpp
@@ -13,20 +13,12 @@
 #ifndef __INT_CVIMGPROC_H__
 #define __INT_CVIMGPROC_H__
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-
 #include "types.h"
+#include "opencv2/core/core.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 
-#define im0im0g2CV_CvtColoru80(src,dst,code,code_size) imcvCvtColors(src,dst,code)
-#define im0d0d0g2CV_Thresholdim0(src,threshold,maxvalue,thresh_type,type_size) 
-				imcvThrehold(src,threshold,maxvalue,thresh_type)
-
-#ifdef  __cplusplus
-} /* extern "C" */
-#endif
+#define mt0g2CV_CvtColormt0(src,code,code_size) imcvCvtColors(src,code)
+#define mt0d0d0g2CV_Thresholdmt0(src,threshold,maxvalue,thresh_type,type_size) \
+				imcvThresholds(src,threshold,maxvalue,thresh_type)
 
 #endif  /*__INT_CVIMGPROC_H__*/