1. 19 May, 2015 3 commits
  2. 18 May, 2015 2 commits
  3. 12 May, 2015 1 commit
  4. 06 May, 2015 27 commits
  5. 04 May, 2015 2 commits
  6. 02 May, 2015 1 commit
    • Patrik Huber's avatar
      Add support for VS2015 · 2b1103c1
      Patrik Huber authored
      Without the fix, OpenCV will compile and silently copy the compiled libs/executables to a location not prefixed with arch/vc14, and OpenCV won't be picked up by find_package and OpenCVConfig.cmake.
      2b1103c1
  7. 30 Apr, 2015 2 commits
    • Roman Donchenko's avatar
      Remove insertIframe.js · 007a3ef8
      Roman Donchenko authored
      It hasn't been used since f82c04f4. Also, the line adding the script had
      an unneeded pathto call, so the script was being loaded from the wrong path
      anyway.
      007a3ef8
    • Belev's avatar
      Fix typo · 83eb1d36
      Belev authored
      Fixed difference in the given arguments to the ellipse function and the description after that
      
      Fixed two more typos
      
      Replaced unnecessary the with to
      
      Conflicts:
      	doc/tutorials/core/adding_images/adding_images.markdown
      	doc/tutorials/core/basic_geometric_drawing/basic_geometric_drawing.markdown
      	doc/tutorials/core/random_generator_and_text/random_generator_and_text.markdown
      	modules/imgproc/include/opencv2/imgproc.hpp
      83eb1d36
  8. 28 Apr, 2015 2 commits
    • Andrey Pavlenko's avatar
    • Martin Ueding's avatar
      Add example data types for calibrateCamera call · 9e297628
      Martin Ueding authored
      It took me a while to figure out what was meant with
      
          OpenCV Error: Assertion failed (i < 0) in getMat
      
      While searching for this error message I found [a list of error
      messages](https://adventuresandwhathaveyou.wordpress.com/2014/03/14/opencv-error-messages-suck/)
      which also explained what the problem was: The data type for `rvecs` was
      not a simple `cv::Mat` but a `std::vector<cv::Mat>`.
      
      After I fixed that, I got the next error message:
      
          OpenCV Error: Assertion failed (ni > 0 && ni == ni1) in
          collectCalibrationData, file
          /build/buildd/opencv-2.4.9+dfsg/modules/calib3d/src/calibration.cpp,
          line 3193
      
      The problem here was that my data type for the `objectPoints` was just
      `vector<Vec3f>` and not `vector<vector<Vec3f>>`.
      
      In order to save other people the time looking for this, I added
      explicit examples of the needed data types into the documentation of the
      function. I had to re-read the current version a couple of times until I
      can read the needed levels of `vector<>`. Having this example would have
      really helped me there.
      
      Conflicts:
      	modules/calib3d/include/opencv2/calib3d.hpp
      9e297628