diff options
Diffstat (limited to '2.3-1/macros/ImageProcessing')
20 files changed, 475 insertions, 0 deletions
diff --git a/2.3-1/macros/ImageProcessing/core/CV_CreateImage.sci b/2.3-1/macros/ImageProcessing/core/CV_CreateImage.sci index 02758154..62410c81 100644 --- a/2.3-1/macros/ImageProcessing/core/CV_CreateImage.sci +++ b/2.3-1/macros/ImageProcessing/core/CV_CreateImage.sci @@ -17,6 +17,26 @@ function img = CV_CreateImage(width,height,bit_depth,no_of_channels) // // Parameters // image_size: width and height of image +<<<<<<< HEAD +// 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 +// +// This is curretly dummy function. It provides no functionality but is required for providing support for generating C code for OpenCV +// +// Examples +// CV_CreateImage([320 240], "IPL_DEPTH_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; +======= // bit_depth: Bit depth of image elements // no_of_channels: no of channels per pixels // @@ -37,5 +57,6 @@ function img = CV_CreateImage(width,height,bit_depth,no_of_channels) img = 0; // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for OpenCV +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/core/CV_GetImgSize.sci b/2.3-1/macros/ImageProcessing/core/CV_GetImgSize.sci index 02e018a7..5ebbd7dd 100644 --- a/2.3-1/macros/ImageProcessing/core/CV_GetImgSize.sci +++ b/2.3-1/macros/ImageProcessing/core/CV_GetImgSize.sci @@ -15,23 +15,42 @@ function imgsize = CV_GetImgSize(img) // CV_GetImgSize(img) // // Parameters +<<<<<<< HEAD +// img: image whose size is to be returned +======= // img: image whose size is to be returned +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // // Description // This function can be used for retriving size information of the image. // It returs an array with first image element as width and second as height +<<<<<<< HEAD +// +// This is curretly dummy function. It provides no functionality but is required +// for providing support for generating C code for OpenCV +// +// Examples +// img = CV_LoadImage('~/test.jpg',0) +// size = CV_GetImgSize(img) +======= // Examples // img = CV_LoadImage('~/test.jpg',0) // size = CV_GetImgSize(img) // +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // See also // CV_LoadImage CV_CreateImage // // Authors // Siddhesh Wani // +<<<<<<< HEAD + +imgsize = [0 0]; +======= imgsize = [0 0]; // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for OpenCV +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/core/lib b/2.3-1/macros/ImageProcessing/core/lib Binary files differindex fedf05e1..efaf5182 100644 --- a/2.3-1/macros/ImageProcessing/core/lib +++ b/2.3-1/macros/ImageProcessing/core/lib diff --git a/2.3-1/macros/ImageProcessing/highgui/CV_LoadImage.sci b/2.3-1/macros/ImageProcessing/highgui/CV_LoadImage.sci index 01dda125..48a77fa6 100644 --- a/2.3-1/macros/ImageProcessing/highgui/CV_LoadImage.sci +++ b/2.3-1/macros/ImageProcessing/highgui/CV_LoadImage.sci @@ -16,6 +16,33 @@ function img = CV_LoadImage(filename,loadtype) // // Parameters // filename: name of file to be opened +<<<<<<< HEAD +// loadtype: desired load method +// +// Description +// This function can be used for loading a previously stored image +// +// loadtype can take the following values: +// <itemizedlist> +// <listitem><para> less than 0 -> image is loaded as is (with alpha channel)</para></listitem> +// <listitem><para> 0 -> image is loaded as greyscale</para></listitem> +// <listitem><para> greater than 0 -> 3 channel color image is loaded</para></listitem> +// </itemizedlist> +// +// This is curretly dummy function. It provides no functionality but is required +// for providing support for generating C code for OpenCV +// +// Examples +// CV_LoadImage('~/test.jpg',0) +// See also +// CV_CreateImage +// +// Authors +// Siddhesh Wani +// + +img = 0; +======= // loadtype: desired load method // <0 --> image is loaded as is (with alpha channel) // =0 --> image is loaded as greyscale @@ -36,5 +63,6 @@ function img = CV_LoadImage(filename,loadtype) img = 0; // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for OpenCV +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/highgui/CV_SaveImage.sci b/2.3-1/macros/ImageProcessing/highgui/CV_SaveImage.sci index 708edff0..999c634c 100644 --- a/2.3-1/macros/ImageProcessing/highgui/CV_SaveImage.sci +++ b/2.3-1/macros/ImageProcessing/highgui/CV_SaveImage.sci @@ -15,6 +15,21 @@ function status = CV_SaveImage(filename,img) // CV_SaveImage(filename,img) // // Parameters +<<<<<<< HEAD +// filename: name of file image to be saved as +// img: image to be saved +// +// Description +// This function can be used for saving image. File format is detected +// from file extension +// +// This is curretly dummy function. It provides no functionality but is required +// for providing support for generating C code for OpenCV +// +// Examples +// img = CV_LoadImage('~/test.jpg',0) +// CV_SaveImage('test1.png',img) +======= // filename: name of file image to be saved as // img: image to be saved // @@ -25,14 +40,20 @@ function status = CV_SaveImage(filename,img) // img = CV_LoadImage('~/test.jpg',0) // CV_SaveImage('test1.png',img) // +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // See also // CV_LoadImage CV_CreateImage // // Authors // Siddhesh Wani // +<<<<<<< HEAD + +status = 0; +======= status = 0; // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for OpenCV +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/highgui/CV_ShowImage.sci b/2.3-1/macros/ImageProcessing/highgui/CV_ShowImage.sci index 4bfe5913..24621f39 100644 --- a/2.3-1/macros/ImageProcessing/highgui/CV_ShowImage.sci +++ b/2.3-1/macros/ImageProcessing/highgui/CV_ShowImage.sci @@ -12,6 +12,27 @@ function CV_ShowImage(winname,img) // function to show an image // // Calling Sequence +<<<<<<< HEAD +// CV_ShowImage(img) +// CV_ShowImage(winname,img) +// +// Parameters +// winname: name of window in which img is to be shown +// img: image to be shown already acquired (from file/camera) +// +// Description +// This function can be used for showing images +// +// This is curretly dummy function. It provides no functionality but is required +// for providing support for generating C code for OpenCV +// +// Examples +// img = CV_LoadImage('~/test.jpg',0) +// CV_ShowImage(img) +// See also +// CV_CreateImage CV_LoadImage +// +======= // CV_ShowImage(img) // CV_ShowImage(winname,img) // @@ -29,11 +50,15 @@ function CV_ShowImage(winname,img) // CV_CreateImage CV_LoadImage // // +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // Authors // Siddhesh Wani // +<<<<<<< HEAD +======= // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for OpenCV +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/highgui/CV_WaitKey.sci b/2.3-1/macros/ImageProcessing/highgui/CV_WaitKey.sci index 0facaafe..858ca7a3 100644 --- a/2.3-1/macros/ImageProcessing/highgui/CV_WaitKey.sci +++ b/2.3-1/macros/ImageProcessing/highgui/CV_WaitKey.sci @@ -15,6 +15,24 @@ function CV_WaitKey(delay) // CV_WaitKey(delay) // // Parameters +<<<<<<< HEAD +// delay: waiting delay, if 0 then wait till keypress +// +// Description +// This function can be used for inseting some delay. This function must +// follow CV_ShowImage to display image. +// +// This is curretly dummy function. It provides no functionality but is required +// for providing support for generating C code for OpenCV +// +// Examples +// img = CV_LoadImage('~/test.jpg',0) +// CV_ShowImage('',img) +// CV_WaitKey(0); +// See also +// CV_LoadImage CV_ShowImage +// +======= // delay: waiting delay, if 0 then wait till keypress // // Description @@ -29,11 +47,15 @@ function CV_WaitKey(delay) // CV_LoadImage CV_ShowImage // // +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // Authors // Siddhesh Wani // +<<<<<<< HEAD +======= // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for OpenCV +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/highgui/lib b/2.3-1/macros/ImageProcessing/highgui/lib Binary files differindex 30217607..722a1503 100644 --- a/2.3-1/macros/ImageProcessing/highgui/lib +++ b/2.3-1/macros/ImageProcessing/highgui/lib diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_AdaptiveThreshold.sci b/2.3-1/macros/ImageProcessing/imgproc/CV_AdaptiveThreshold.sci index a922d798..ff6731a4 100644 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_AdaptiveThreshold.sci +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_AdaptiveThreshold.sci @@ -8,6 +8,28 @@ // Organization: FOSSEE, IIT Bombay // Email: toolbox@scilab.in +<<<<<<< HEAD +function cvtimg = CV_AdaptiveThreshold(srcimg,max_value,adaptive_method,thresh_type, block_size, C) +// function to adaptively threshold input image +// +// Calling Sequence +// dst = CV_AdaptiveThreshold(srcimg,max_value,adaptive_method,thresh_type,blk_size,c) +// +// Parameters +// src : Source 8-bit single-channel image. +// max_value : Non-zero value assigned to the pixels for which the condition is satisfied. See the details below. +// adaptive_method : Adaptive thresholding algorithm to use, ADAPTIVE_THRESH_MEAN_C or ADAPTIVE_THRESH_GAUSSIAN_C . +// thresh_type : Thresholding type that must be either THRESH_BINARY or THRESH_BINARY_INV . +// blockSize : Size of a pixel neighborhood that is used to calculate a threshold value for the pixel: 3, 5, 7, and so on. +// C : Constant subtracted from the mean or weighted mean.Normally, it is positive but may be zero or negative as well. +// +// Description +// This function can be used for adaptively threshold given image +// +// This is curretly dummy function. It provides no functionality but is required +// for providing support for generating C code for OpenCV +// +======= function cvtimg = CV_AdaptiveThreshold(srcimg,max_value,adaptive_method, ... thresh_type, block_size, C) // function to adaptively threshold input image @@ -30,6 +52,7 @@ function cvtimg = CV_AdaptiveThreshold(srcimg,max_value,adaptive_method, ... // it is positive but may be zero or negative as well. // Description // This function can be used for adaptively threshold given image +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // Examples // img = CV_LoadImage('~/test.jpg',0) // dst = CV_AdaptiveThreshold(img,255,"ADAPTIVE_THRESH_MEAN_C", ... @@ -41,8 +64,13 @@ function cvtimg = CV_AdaptiveThreshold(srcimg,max_value,adaptive_method, ... // Authors // Siddhesh Wani // +<<<<<<< HEAD + +cvtimg = 0 +======= cvtimg = 0 // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for OpenCV +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_Blur.sci b/2.3-1/macros/ImageProcessing/imgproc/CV_Blur.sci index b81df491..9a163963 100644 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_Blur.sci +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_Blur.sci @@ -8,6 +8,36 @@ // Organization: FOSSEE, IIT Bombay // Email: toolbox@scilab.in +<<<<<<< HEAD +function cvtimg = CV_Blur(srcimg,ksize_width,ksize_height,anchor_x,anchor_y,border_type) +// function to blur image using normalised box filter +// +// Calling Sequence +// dst = CV_Blur(srcimg,ksize_width,ksize_height,anchor_x,anchor_y,border_type) +// +// Parameters +// srcimg : Source image. +// ksize_width, ksize_height : blurring kernel size. +// anchor_x, anchor_y : x,y coordinates of anchor point +// border_type : border mode used to extrapolate pixels outside of the image. +// +// Description +// This function can be used for blurring image using normalised box +// filter. Image can be of any depth and have any no of channels. +// +// border_type can be : +// <itemizedlist> +// <listitem>BORDER_REPLICATE: aaaaaa|abcdefgh|hhhhhhh</listitem> +// <listitem>BORDER_REFLECT: fedcba|abcdefgh|hgfedcb</listitem> +// <listitem>BORDER_REFLECT_101: gfedcb|abcdefgh|gfedcba</listitem> +// <listitem>BORDER_WRAP: cdefgh|abcdefgh|abcdefg</listitem> +// <listitem>BORDER_CONSTANT: iiiiii|abcdefgh|iiiiiii</listitem> +// </itemizedlist> +// +// This is curretly dummy function. It provides no functionality but is required +// for providing support for generating C code for OpenCV +// +======= function cvtimg = CV_Blur(srcimg,ksize_width,ksize_height,anchor_x,anchor_y, ... border_type) // function to blur image using normalised box filter @@ -30,6 +60,7 @@ function cvtimg = CV_Blur(srcimg,ksize_width,ksize_height,anchor_x,anchor_y, ... // Description // This function can be used for blurring image using normalised box // filter. Image can be of any depth and have any no of channels. +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // Examples // img = CV_LoadImage('~/test.jpg',0) // dst = CV_Blur(img,3,3,-1,-1,"BORDER_CONSTANT") @@ -40,8 +71,13 @@ function cvtimg = CV_Blur(srcimg,ksize_width,ksize_height,anchor_x,anchor_y, ... // Authors // Siddhesh Wani // +<<<<<<< HEAD + +cvtimg = 0 +======= cvtimg = 0 // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for OpenCV +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_Canny.sci b/2.3-1/macros/ImageProcessing/imgproc/CV_Canny.sci index b21028a0..1adb11ec 100644 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_Canny.sci +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_Canny.sci @@ -15,6 +15,28 @@ function edges = CV_Canny(srcimg,threhold1,threshold2,aperture_size,L2gradient) // edges = CV_Canny(srcimg,threhold1,threshold2,aperture_size,L2gradient) // // Parameters +<<<<<<< HEAD +// srcimg : single-channel 8-bit input image. +// threshold1 : first threshold for the hysteresis procedure. +// threshold2 : second threshold for the hysteresis procedure. +// aperture_size : aperture size for the Sobel() operator. +// L2gradient : a flag, indicating whether a more accurate +// +// Description +// This function can be used for finding edes in single channel 8 bit +// image. 'aperture_size' and 'L2gradient' are optionals. By default, +// aperture_size is 3 and L2gradient is false. +// +// For L2gradient: L_2 norm =sqrt{(dI/dx)^2 + (dI/dy)^2} should be used to calculate the image gradient magnitude (L2gradient=1 ), or whether the default L_1 norm =|dI/dx|+|dI/dy| is enough (L2gradient=0). +// +// This is curretly dummy function. It provides no functionality but is required +// for providing support for generating C code for OpenCV +// +// Examples +// img = CV_LoadImage('~/test.jpg',0) +// dst = CV_CvtColor(img,"CV_RGB2GRAY"); +// edge = CV_Canny(dst,50,100,3,0); +======= // srcimg -> single-channel 8-bit input image. // threshold1 -> first threshold for the hysteresis procedure. // threshold2 -> second threshold for the hysteresis procedure. @@ -34,14 +56,20 @@ function edges = CV_Canny(srcimg,threhold1,threshold2,aperture_size,L2gradient) // dst = CV_CvtColor(img,"CV_RGB2GRAY"); // edge = CV_Canny(dst,50,100,3,0); // +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // See also // CV_LoadImage CV_CvtColor // // Authors // Siddhesh Wani // +<<<<<<< HEAD + +edges = 0 +======= edges = 0 // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for OpenCV +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_CornerHarris.sci b/2.3-1/macros/ImageProcessing/imgproc/CV_CornerHarris.sci index fb25612b..741dc2ba 100644 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_CornerHarris.sci +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_CornerHarris.sci @@ -12,6 +12,36 @@ function edges = CV_CornerHarris(srcimg,blocksize,ksize,k,border_type) //Finds edges in image using Harris algorithm // // Calling Sequence +<<<<<<< HEAD +// edges = CV_CornerHarris(srcimg,blocksize,ksize,k,border_type) +// +// Parameters +// srcimg: Input single-channel 8-bit or floating-point image. +// blockSize: Neighborhood size +// ksize: Aperture parameter for the Sobel() operator. +// k: Harris detector free parameter. +// border_type: border mode used to extrapolate pixels outside of the image. +// +// Description +// The function runs the Harris edge detector on the image. For each pixel (x, y) it calculates a 2 * 2 gradient covariance matrix M(x,y) over a blockSize * blockSize neighborhood. Then, it computes the following characteristic: dst(x,y) = det(M(x,y)) - k .tr(M(x,y))^2. Corners in the image can be found as the local maxima of this response map. +// +// border_type can be : +// <itemizedlist> +// <listitem>BORDER_REPLICATE: aaaaaa|abcdefgh|hhhhhhh</listitem> +// <listitem>BORDER_REFLECT: fedcba|abcdefgh|hgfedcb</listitem> +// <listitem>BORDER_REFLECT_101: gfedcb|abcdefgh|gfedcba</listitem> +// <listitem>BORDER_WRAP: cdefgh|abcdefgh|abcdefg</listitem> +// <listitem>BORDER_CONSTANT: iiiiii|abcdefgh|iiiiiii</listitem> +// </itemizedlist> +// +// This is curretly dummy function. It provides no functionality but is required +// for providing support for generating C code for OpenCV +// +// Examples +// img = CV_LoadImage('~/test.jpg',0) +// dst = CV_CvtColor(img,"CV_RGB2GRAY"); +// edge = CV_CornerHarris(dst,5,3,1,"BORDER_REPLICATE"); +======= // edges = CV_CornerHarris(srcimg,blocksize,ksize,k,border_type) // // Parameters @@ -40,14 +70,20 @@ function edges = CV_CornerHarris(srcimg,blocksize,ksize,k,border_type) // dst = CV_CvtColor(img,"CV_RGB2GRAY"); // edge = CV_CornerHarris(dst,5,3,1,"BORDER_REPLICATE"); // +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // See also // CV_LoadImage CV_CvtColor // // Authors // Siddhesh Wani // +<<<<<<< HEAD + +edges = 0 +======= edges = 0 // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for OpenCV +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_CvtColor.sci b/2.3-1/macros/ImageProcessing/imgproc/CV_CvtColor.sci index 766844bf..3252c122 100644 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_CvtColor.sci +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_CvtColor.sci @@ -15,6 +15,23 @@ function cvtimg = CV_CvtColor(srcimg,code) // CV_CvtColor(srcimg,code) // // Parameters +<<<<<<< HEAD +// srcimg: source image to be converted +// dstimg: destination image in which to store converted image +// code: String specifying conversion type. Same as defined in OpenCV. for eg. 'CV_RGB2GRAY' for conversion from RGB image to grayscale image +// dstCn: no of channels in destination image (0 by default) +// +// Description +// This function can be used for converting an image to other colorspace. +// Refer OpenCV documentation for list of available conversions +// +// This is curretly dummy function. It provides no functionality but is required +// for providing support for generating C code for OpenCV +// +// Examples +// img = CV_LoadImage('~/test.jpg',0) +// dst = CV_CvtColor(img,'CV_RGB2GRAY') +======= // srcimg: source image to be converted // dstimg: destination image in which to store converted image // code: String specifying conversion type. Same as defined in OpenCV @@ -28,14 +45,20 @@ function cvtimg = CV_CvtColor(srcimg,code) // img = CV_LoadImage('~/test.jpg',0) // dst = CV_CvtColor(img,'CV_RGB2GRAY') // +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // See also // CV_LoadImage CV_CreateImage // // Authors // Siddhesh Wani // +<<<<<<< HEAD + +cvtimg = 0 +======= cvtimg = 0 // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for OpenCV +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_Dilate.sci b/2.3-1/macros/ImageProcessing/imgproc/CV_Dilate.sci index 196cab85..124ec897 100644 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_Dilate.sci +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_Dilate.sci @@ -8,6 +8,39 @@ // Organization: FOSSEE, IIT Bombay // Email: toolbox@scilab.in +<<<<<<< HEAD +function cvtimg = CV_Dilate(srcimg,dilation_type,dilation_size,iterations,border_type,border_value) +// dilates an image by using a specific structuring element. +// +// Calling Sequence +// cvtimg = CV_Dilate(srcimg,dilation_type,dilation_size,[iterations,border_type,border_value]) +// Parameters +// src : input image; the number of channels can be arbitrary, but the depth should be one of CV_8U, CV_16U, CV_16S, CV_32F or CV_64F. +// dilation_type : can be one of MORPH_RECT, MORPH_CROSS,MORPH_ELLIPSE +// dilation_size : size of kernel to be used for erosion. Must be odd +// iterations : number of times erosion is applied. +// border_type : pixel extrapolation method. +// border_value : border value in case of a constant border +// +// Description +// This function can be used for eroding an image. Kernel used for erosion is decided by type and size. Size must always be odd. Anchor pint of kernel is always center of kernel. Input arguements 'iterations(1), border_type(BORDER_CONSTANT) and border_value' are optionals. Whwn not specified, default values as as mentioned in brackets. +// +// border_type can be : +// <itemizedlist> +// <listitem><para> BORDER_REPLICATE: aaaaaa|abcdefgh|hhhhhhh </para></listitem> +// <listitem><para> BORDER_REFLECT: fedcba|abcdefgh|hgfedcb </para></listitem> +// <listitem><para> BORDER_REFLECT_101: gfedcb|abcdefgh|gfedcba </para></listitem> +// <listitem><para> BORDER_WRAP: cdefgh|abcdefgh|abcdefg </para></listitem> +// <listitem><para> BORDER_CONSTANT: iiiiii|abcdefgh|iiiiiii </para></listitem> +// </itemizedlist> +// +// This is curretly dummy function. It provides no functionality but is required +// for providing support for generating C code for OpenCV +// +// Examples +// img = CV_LoadImage('~/test.jpg',0) +// dst = CV_Erode(img,"MORPH_RECT",3,1,"BORDER_CONSTANT",0); +======= function cvtimg = CV_Dilate(srcimg,dilation_type,dilation_size,iterations, ... border_type,border_value) // dilates an image by using a specific structuring element. @@ -39,14 +72,20 @@ function cvtimg = CV_Dilate(srcimg,dilation_type,dilation_size,iterations, ... // img = CV_LoadImage('~/test.jpg',0) // dst = CV_Erode(img,"MORPH_RECT",3,1,"BORDER_CONSTANT",0); // +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // See also // CV_LoadImage CV_Erode // // Authors // Siddhesh Wani // +<<<<<<< HEAD + +cvtimg = 0 +======= cvtimg = 0 // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for OpenCV +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_DistanceTransform.sci b/2.3-1/macros/ImageProcessing/imgproc/CV_DistanceTransform.sci index e8772958..811d8f42 100644 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_DistanceTransform.sci +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_DistanceTransform.sci @@ -15,6 +15,21 @@ function dstimg = CV_DistanceTransform(srcimg,distance_type,mask_size) // dst = CV_DistanceTransform(srcimg,distance_type,mask_size) // // Parameters +<<<<<<< HEAD +// srcimg : Source 8-bit single-channel image. +// distance_type : Type of distance. It can be CV_DIST_L1, CV_DIST_L2 , or CV_DIST_C +// mask_size : Size of the distance transform mask +// +// Description +// This function can be used to calculate distance to closest zero pixel for each pixel of the source image. Output is 32 bit floatingpoint, single channel image of the same size as that of source image. +// +// This is curretly dummy function. It provides no functionality but is required +// for providing support for generating C code for OpenCV +// +// Examples +// img = CV_LoadImage('~/test.jpg',0) +// dst = CV_DistanceTransform(img,"CV_DIST_L1",3) +======= // srcimg -> Source 8-bit single-channel image. // distance_type -> Type of distance. It can be // CV_DIST_L1, CV_DIST_L2 , or CV_DIST_C @@ -27,14 +42,20 @@ function dstimg = CV_DistanceTransform(srcimg,distance_type,mask_size) // img = CV_LoadImage('~/test.jpg',0) // dst = CV_DistanceTransform(img,"CV_DIST_L1",3) // +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // See also // CV_LoadImage CV_CreateImage CV_CvtColor // // Authors // Siddhesh Wani // +<<<<<<< HEAD + +dstimg = 0 +======= dstimg = 0 // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for OpenCV +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_Erode.sci b/2.3-1/macros/ImageProcessing/imgproc/CV_Erode.sci index d77e9e69..8ae8ca58 100644 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_Erode.sci +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_Erode.sci @@ -8,6 +8,39 @@ // Organization: FOSSEE, IIT Bombay // Email: toolbox@scilab.in +<<<<<<< HEAD +function cvtimg = CV_Erode(srcimg,erosion_type,erosion_size,iterations,border_type,border_value) +// Erodes an image by using a specific structuring element. +// +// Calling Sequence +// cvtimg = CV_Erode(srcimg,erosion_type,erosion_size,[iterations,border_type,border_value]) +// Parameters +// src : input image; the number of channels can be arbitrary, but the depth should be one of CV_8U, CV_16U, CV_16S, CV_32F or CV_64F. +// erosion_type : can be one of : MORPH_RECT, MORPH_CROSS, MORPH_ELLIPSE +// erosion_size : size of kernel to be used for erosion. Must be odd +// iterations : number of times erosion is applied. +// border_type : pixel extrapolation method. +// border_value : border value in case of a constant border +// +// Description +// This function can be used for eroding an image. Kernel used for erosion is decided by type and size. Size must always be odd. Anchor pint of kernel is always center of kernel. Input arguements 'iterations(1), border_type(BORDER_CONSTANT) and border_value' are optionals. Whwn not specified, default values as as mentioned in brackets. +// +// border_type can be : +// <itemizedlist> +// <listitem>BORDER_REPLICATE: aaaaaa|abcdefgh|hhhhhhh</listitem> +// <listitem>BORDER_REFLECT: fedcba|abcdefgh|hgfedcb</listitem> +// <listitem>BORDER_REFLECT_101: gfedcb|abcdefgh|gfedcba</listitem> +// <listitem>BORDER_WRAP: cdefgh|abcdefgh|abcdefg</listitem> +// <listitem>BORDER_CONSTANT: iiiiii|abcdefgh|iiiiiii</listitem> +// </itemizedlist> +// +// This is curretly dummy function. It provides no functionality but is required +// for providing support for generating C code for OpenCV +// +// Examples +// img = CV_LoadImage('~/test.jpg',0) +// dst = CV_Erode(img,"MORPH_RECT",3,1,"BORDER_CONSTANT",0); +======= function cvtimg = CV_Erode(srcimg,erosion_type,erosion_size,iterations, ... border_type,border_value) // Erodes an image by using a specific structuring element. @@ -38,14 +71,20 @@ function cvtimg = CV_Erode(srcimg,erosion_type,erosion_size,iterations, ... // img = CV_LoadImage('~/test.jpg',0) // dst = CV_Erode(img,"MORPH_RECT",3,1,"BORDER_CONSTANT",0); // +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // See also // CV_LoadImage CV_Dilate // // Authors // Siddhesh Wani // +<<<<<<< HEAD + +cvtimg = 0 +======= cvtimg = 0 // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for OpenCV +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_GaussianBlur.sci b/2.3-1/macros/ImageProcessing/imgproc/CV_GaussianBlur.sci index 0799c4dd..99ba008a 100644 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_GaussianBlur.sci +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_GaussianBlur.sci @@ -8,6 +8,41 @@ // Organization: FOSSEE, IIT Bombay // Email: toolbox@scilab.in +<<<<<<< HEAD +function cvtimg = CV_GaussianBlur(srcimg,ksize_width,ksize_height,sigma_x,sigma_y,border_type) +// function to blur image using gaussian filter +// +// Calling Sequence +// cvtimg = CV_GaussianBlur(srcimg,ksize_width,ksize_height,sigma_x,sigma_y,border_type) +// +// Parameters +// srcimg : Source image. +// ksize_width, ksize_height : blurring kernel size. must be odd. +// sigmaX : Gaussian kernel standard deviation in X direction. +// sigmaY : Gaussian kernel standard deviation in Y direction; +// border_type : border mode used to extrapolate pixels outside of the image. +// +// Description +// This function can be used for blurring image using gaussian filter. Image can be of any depth and have any no of channels. +// +// For sigmaX and sigmaY : if sigmaY is zero, it is set to be equal to sigmaX, if both sigmas are zeros, they are computed from ksize.width and ksize.height , respectively. +// +// border_type can be : +// <itemizedlist> +// <listitem>BORDER_REPLICATE: aaaaaa|abcdefgh|hhhhhhh</listitem> +// <listitem>BORDER_REFLECT: fedcba|abcdefgh|hgfedcb</listitem> +// <listitem>BORDER_REFLECT_101: gfedcb|abcdefgh|gfedcba</listitem> +// <listitem>BORDER_WRAP: cdefgh|abcdefgh|abcdefg</listitem> +// <listitem>BORDER_CONSTANT: iiiiii|abcdefgh|iiiiiii</listitem> +// </itemizedlist> +// +// This is curretly dummy function. It provides no functionality but is required +// for providing support for generating C code for OpenCV +// +// Examples +// img = CV_LoadImage('~/test.jpg',0) +// dst = CV_GaussianBlur(img,3,3,0,0,"BORDER_CONSTANT") +======= function cvtimg = CV_GaussianBlur(srcimg,ksize_width,ksize_height,sigma_x,sigma_y, ... border_type) // function to blur image using gaussian filter @@ -38,14 +73,20 @@ function cvtimg = CV_GaussianBlur(srcimg,ksize_width,ksize_height,sigma_x,sigma_ // img = CV_LoadImage('~/test.jpg',0) // dst = CV_GaussianBlur(img,3,3,0,0,"BORDER_CONSTANT") // +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // See also // CV_LoadImage CV_Blur, CV_CvtColor // // Authors // Siddhesh Wani // +<<<<<<< HEAD + +cvtimg = 0 +======= cvtimg = 0 // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for OpenCV +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_MedianBlur.sci b/2.3-1/macros/ImageProcessing/imgproc/CV_MedianBlur.sci index d8f9a900..eb20f53f 100644 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_MedianBlur.sci +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_MedianBlur.sci @@ -12,6 +12,26 @@ function cvtimg = CV_MedianBlur(srcimg,ksize) // function to blur image using median filter // // Calling Sequence +<<<<<<< HEAD +// cvtimg = CV_MedianBlur(srcimg,ksize) +// +// Parameters +// srcimg : input 1-, 3-, or 4-channel image; when ksize is 3 or 5, the image depth should be CV_8U, CV_16U, or CV_32F, for larger aperture sizes, it can only be CV_8U. +// ksize_width : aperture linear size; it must be odd and greater than 1, for example: 3, 5, 7 ... +// +// Description +// This function can be used for blurring image using median +// filter. Image can be of any depth and have any no of channels. +// +// This is curretly dummy function. It provides no functionality but is required +// for providing support for generating C code for OpenCV +// +// Examples +// img = CV_LoadImage('~/test.jpg',0) +// dst = CV_MedianBlur(img,3) +// See also +// CV_GaussianBlur, CV_Blur, CV_CvtColor +======= // dst = CV_Blur(srcimg,ksize_width,ksize_height,anchor_x,anchor_y, ... // border_type) // @@ -30,12 +50,18 @@ function cvtimg = CV_MedianBlur(srcimg,ksize) // // See also // CV_GaussianBlur CV_Blur, CV_CvtColor +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // // Authors // Siddhesh Wani // +<<<<<<< HEAD + +cvtimg = 0 +======= cvtimg = 0 // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for OpenCV +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_Threshold.sci b/2.3-1/macros/ImageProcessing/imgproc/CV_Threshold.sci index 823a5768..2364e2e5 100644 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_Threshold.sci +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_Threshold.sci @@ -16,6 +16,22 @@ function cvtimg = CV_Threshold(srcimg,threshold,max_value,thresh_type) // // Parameters // srcimg: source image to be converted +<<<<<<< HEAD +// 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 +// +// This is curretly dummy function. It provides no functionality but is required +// for providing support for generating C code for OpenCV +// +// Examples +// img = CV_LoadImage('~/test.jpg',0) +// dst = CV_Threshold(img,100,255,'THRESH_BINARY') +======= // 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: @@ -28,14 +44,20 @@ function cvtimg = CV_Threshold(srcimg,threshold,max_value,thresh_type) // img = CV_LoadImage('~/test.jpg',0) // dst = CV_Threshold(img,100,255,'THRESH_BINARY') // +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // See also // CV_LoadImage CV_CreateImage // // Authors // Siddhesh Wani // +<<<<<<< HEAD + +cvtimg = 0 +======= cvtimg = 0 // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for OpenCV +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/imgproc/lib b/2.3-1/macros/ImageProcessing/imgproc/lib Binary files differindex ac605c04..1f0925a0 100644 --- a/2.3-1/macros/ImageProcessing/imgproc/lib +++ b/2.3-1/macros/ImageProcessing/imgproc/lib |