changed the pragmas to be compatible with build bot

Update README.md
pull/251/head
Muresan Mircea Paul 10 years ago
parent 01d8c7b491
commit 3ac150bce0
  1. 2
      modules/README.md
  2. 1
      modules/stereo/src/precomp.hpp
  3. 4
      modules/stereo/src/stereo_binary_bm.cpp
  4. 1
      modules/stereo/src/stereo_binary_sgbm.cpp

@ -51,3 +51,5 @@ $ cmake -D OPENCV_EXTRA_MODULES_PATH=<opencv_contrib>/modules -D BUILD_opencv_re
21. **opencv_xobjdetect**: Integral Channel Features Detector Framework. 21. **opencv_xobjdetect**: Integral Channel Features Detector Framework.
22. **opencv_xphoto**: Additional photo processing algorithms: Color balance / Denoising / Inpainting. 22. **opencv_xphoto**: Additional photo processing algorithms: Color balance / Denoising / Inpainting.
23. **opencv_stereo**: Stereo Correspondence done with different descriptors: Census / CS-Census / MCT / BRIEF / MV / RT.

@ -39,7 +39,6 @@
// the use of this software, even if advised of the possibility of such damage. // the use of this software, even if advised of the possibility of such damage.
// //
//M*/ //M*/
#pragma once
#ifndef __OPENCV_STEREO_PRECOMP_H__ #ifndef __OPENCV_STEREO_PRECOMP_H__
#define __OPENCV_STEREO_PRECOMP_H__ #define __OPENCV_STEREO_PRECOMP_H__

@ -337,7 +337,6 @@ namespace cv
// initialize sums // initialize sums
int tsum = 0; int tsum = 0;
#pragma region sume_partiale
{ {
for (d = 0; d < ndisp; d++) for (d = 0; d < ndisp; d++)
sad[d] = (int)(hsad0[d - ndisp*dy0] * (wsz2 + 2 - dy0)); sad[d] = (int)(hsad0[d - ndisp*dy0] * (wsz2 + 2 - dy0));
@ -350,9 +349,7 @@ namespace cv
for (y = -wsz2 - 1; y < wsz2; y++) for (y = -wsz2 - 1; y < wsz2; y++)
tsum += htext[y]; tsum += htext[y];
} }
#pragma endregion sume_partiale pentru SAD
// finally, start the real processing // finally, start the real processing
#pragma region SAD
{ {
for (y = 0; y < height; y++) for (y = 0; y < height; y++)
{ {
@ -403,7 +400,6 @@ namespace cv
} }
} }
} }
#pragma endregion SAD
} }
} }

@ -51,6 +51,7 @@
*/ */
#include "precomp.hpp" #include "precomp.hpp"
#include "opencv2\core\private.hpp"
#include <limits.h> #include <limits.h>
namespace cv namespace cv

Loading…
Cancel
Save