diff options
| author | yash1112 | 2017-07-07 22:34:47 +0530 |
|---|---|---|
| committer | yash1112 | 2017-07-07 22:34:47 +0530 |
| commit | 2340409c98f9b15bb23944b991e97a1aa4e88ce0 (patch) | |
| tree | 8fa462e65aca52e5e933dee026a78c31baf0181c /macros/ImageProcessing/core | |
| parent | f577f255fd5c1d30bc770e9b053823ada8684528 (diff) | |
| parent | 69c573fe2e59236f063aaa94dcd44b556f945cbc (diff) | |
| download | scilab2c-2340409c98f9b15bb23944b991e97a1aa4e88ce0.tar.gz scilab2c-2340409c98f9b15bb23944b991e97a1aa4e88ce0.tar.bz2 scilab2c-2340409c98f9b15bb23944b991e97a1aa4e88ce0.zip | |
1.Sci2cDeps updated 2.Windows compatibility resolved
Diffstat (limited to 'macros/ImageProcessing/core')
| -rw-r--r-- | macros/ImageProcessing/core/CV_CreateImage.sci | 23 | ||||
| -rw-r--r-- | macros/ImageProcessing/core/CV_GetImgSize.sci | 17 |
2 files changed, 40 insertions, 0 deletions
diff --git a/macros/ImageProcessing/core/CV_CreateImage.sci b/macros/ImageProcessing/core/CV_CreateImage.sci index 90b4578b..62410c81 100644 --- a/macros/ImageProcessing/core/CV_CreateImage.sci +++ b/macros/ImageProcessing/core/CV_CreateImage.sci @@ -17,6 +17,7 @@ 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 // @@ -35,5 +36,27 @@ function img = CV_CreateImage(width,height,bit_depth,no_of_channels) // img = 0; +======= +// 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], "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; +// 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/macros/ImageProcessing/core/CV_GetImgSize.sci b/macros/ImageProcessing/core/CV_GetImgSize.sci index 2b176dac..5ebbd7dd 100644 --- a/macros/ImageProcessing/core/CV_GetImgSize.sci +++ b/macros/ImageProcessing/core/CV_GetImgSize.sci @@ -15,11 +15,16 @@ 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 @@ -27,13 +32,25 @@ function imgsize = CV_GetImgSize(img) // 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 |