diff options
| author | Brijeshcr | 2017-07-08 20:18:46 +0530 |
|---|---|---|
| committer | GitHub | 2017-07-08 20:18:46 +0530 |
| commit | 26ab8620e89571314bc1a828bd9aca3d288eaede (patch) | |
| tree | e0f47fecb8b5d5e63491c7440d9ecc3072e5cd05 /2.3-1/macros/ImageProcessing/core | |
| parent | 3adebb16388c6712f7d9c268b91849d164e696df (diff) | |
| parent | 39874e472e540ca1bb923b97b52900e1d60439cc (diff) | |
| download | Scilab2C-26ab8620e89571314bc1a828bd9aca3d288eaede.tar.gz Scilab2C-26ab8620e89571314bc1a828bd9aca3d288eaede.tar.bz2 Scilab2C-26ab8620e89571314bc1a828bd9aca3d288eaede.zip | |
Merge pull request #13 from FOSSEE/revert-12-master
Revert "SCi2cDeps updated, Windows compatibility resolved"
Diffstat (limited to '2.3-1/macros/ImageProcessing/core')
| -rw-r--r-- | 2.3-1/macros/ImageProcessing/core/CV_CreateImage.sci | 23 | ||||
| -rw-r--r-- | 2.3-1/macros/ImageProcessing/core/CV_GetImgSize.sci | 17 |
2 files changed, 0 insertions, 40 deletions
diff --git a/2.3-1/macros/ImageProcessing/core/CV_CreateImage.sci b/2.3-1/macros/ImageProcessing/core/CV_CreateImage.sci index 62410c81..90b4578b 100644 --- a/2.3-1/macros/ImageProcessing/core/CV_CreateImage.sci +++ b/2.3-1/macros/ImageProcessing/core/CV_CreateImage.sci @@ -17,7 +17,6 @@ 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 // @@ -36,27 +35,5 @@ 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/2.3-1/macros/ImageProcessing/core/CV_GetImgSize.sci b/2.3-1/macros/ImageProcessing/core/CV_GetImgSize.sci index 5ebbd7dd..2b176dac 100644 --- a/2.3-1/macros/ImageProcessing/core/CV_GetImgSize.sci +++ b/2.3-1/macros/ImageProcessing/core/CV_GetImgSize.sci @@ -15,16 +15,11 @@ 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 @@ -32,25 +27,13 @@ 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 |