24 files changed, 154 insertions, 112 deletions
diff --git a/macros/CCodeGeneration/C_GenerateMakefile.bin b/macros/CCodeGeneration/C_GenerateMakefile.bin
index ada2bb2..216107b 100644
--- a/macros/CCodeGeneration/C_GenerateMakefile.bin
+++ b/macros/CCodeGeneration/C_GenerateMakefile.bin
diff --git a/macros/CCodeGeneration/C_GenerateMakefile.sci b/macros/CCodeGeneration/C_GenerateMakefile.sci
index f184c39..7ea2443 100644
--- a/macros/CCodeGeneration/C_GenerateMakefile.sci
+++ b/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/macros/CCodeGeneration/C_Type.bin b/macros/CCodeGeneration/C_Type.bin
index 78311b6..fd02434 100644
--- a/macros/CCodeGeneration/C_Type.bin
+++ b/macros/CCodeGeneration/C_Type.bin
diff --git a/macros/CCodeGeneration/C_Type.sci b/macros/CCodeGeneration/C_Type.sci
index 60a3f8b..13cf6de 100644
--- a/macros/CCodeGeneration/C_Type.sci
+++ b/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/macros/ImageProcessing/CV_CreateImage.bin b/macros/ImageProcessing/CV_CreateImage.bin
deleted file mode 100644
index 4c638cc..0000000
--- a/macros/ImageProcessing/CV_CreateImage.bin
+++ /dev/null
diff --git a/macros/ImageProcessing/CV_CreateImage.sci b/macros/ImageProcessing/CV_CreateImage.sci
deleted file mode 100644
index 85c01a4..0000000
--- a/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/macros/ImageProcessing/imgproc/CV_CvtColor.bin b/macros/ImageProcessing/imgproc/CV_CvtColor.bin
index 6ca6ea4..eee1018 100644
--- a/macros/ImageProcessing/imgproc/CV_CvtColor.bin
+++ b/macros/ImageProcessing/imgproc/CV_CvtColor.bin
diff --git a/macros/ImageProcessing/imgproc/CV_CvtColor.sci b/macros/ImageProcessing/imgproc/CV_CvtColor.sci
index 8baa386..220ad5f 100644
--- a/macros/ImageProcessing/imgproc/CV_CvtColor.sci
+++ b/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/macros/ImageProcessing/imgproc/CV_Threshold.bin b/macros/ImageProcessing/imgproc/CV_Threshold.bin
new file mode 100644
index 0000000..c2ce1c6
--- /dev/null
+++ b/macros/ImageProcessing/imgproc/CV_Threshold.bin
diff --git a/macros/ImageProcessing/imgproc/CV_Threshold.sci b/macros/ImageProcessing/imgproc/CV_Threshold.sci
new file mode 100644
index 0000000..343fde5
--- /dev/null
+++ b/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/macros/ImageProcessing/imgproc/lib b/macros/ImageProcessing/imgproc/lib
index 601946e..173bc66 100644
--- a/macros/ImageProcessing/imgproc/lib
+++ b/macros/ImageProcessing/imgproc/lib
diff --git a/macros/ImageProcessing/imgproc/names b/macros/ImageProcessing/imgproc/names
index 537af89..31074fe 100644
--- a/macros/ImageProcessing/imgproc/names
+++ b/macros/ImageProcessing/imgproc/names
@@ -1 +1,2 @@
 CV_CvtColor
+CV_Threshold
diff --git a/macros/ImageProcessing/lib b/macros/ImageProcessing/lib
deleted file mode 100644
index d374b90..0000000
--- a/macros/ImageProcessing/lib
+++ /dev/null
diff --git a/macros/ImageProcessing/names b/macros/ImageProcessing/names
deleted file mode 100644
index a681f79..0000000
--- a/macros/ImageProcessing/names
+++ /dev/null
@@ -1 +0,0 @@
-CV_CreateImage
diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin
index 8e23886..8ac49ac 100644
--- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin
+++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin
diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index ac8d823..164a7c7 100644
--- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/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/macros/findDeps/getAllHeaders.bin b/macros/findDeps/getAllHeaders.bin
index e934bc3..05e6c7e 100644
--- a/macros/findDeps/getAllHeaders.bin
+++ b/macros/findDeps/getAllHeaders.bin
diff --git a/macros/findDeps/getAllHeaders.sci b/macros/findDeps/getAllHeaders.sci
index 06963ca..bbc0890 100644
--- a/macros/findDeps/getAllHeaders.sci
+++ b/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/macros/findDeps/getAllInterfaces.bin b/macros/findDeps/getAllInterfaces.bin
index c46573a..c22a1b6 100644
--- a/macros/findDeps/getAllInterfaces.bin
+++ b/macros/findDeps/getAllInterfaces.bin
diff --git a/macros/findDeps/getAllInterfaces.sci b/macros/findDeps/getAllInterfaces.sci
index 0f90d5c..2bdc8b7 100644
--- a/macros/findDeps/getAllInterfaces.sci
+++ b/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/macros/findDeps/getAllLibraries.bin b/macros/findDeps/getAllLibraries.bin
index f016eba..718e2b1 100644
--- a/macros/findDeps/getAllLibraries.bin
+++ b/macros/findDeps/getAllLibraries.bin
diff --git a/macros/findDeps/getAllLibraries.sci b/macros/findDeps/getAllLibraries.sci
index 2850aba..7ac9e5b 100644
--- a/macros/findDeps/getAllLibraries.sci
+++ b/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/macros/findDeps/getAllSources.bin b/macros/findDeps/getAllSources.bin
index a6612ba..9d7f5ba 100644
--- a/macros/findDeps/getAllSources.bin
+++ b/macros/findDeps/getAllSources.bin
diff --git a/macros/findDeps/getAllSources.sci b/macros/findDeps/getAllSources.sci
index 14326b6..aaaf4be 100644
--- a/macros/findDeps/getAllSources.sci
+++ b/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;