1. 26 Nov, 2013 4 commits
  2. 25 Nov, 2013 3 commits
    • GregoryMorse's avatar
      Update system.cpp · e4793e3d
      GregoryMorse authored
      Fixed to use native C++ instead of C++/CX although it does require significantly more code, it goes along with the spirit of keeping the project in native C++
      
      Update system.cpp
      
      Cleaned up whitespace, removed redundant code and added edge cases for string cleanup
      
      Update system.cpp
      
      Fixed compiler warning over comma operator clause
      
      Update system.cpp
      
      NULL initialization
      
      Update system.cpp
      
      Fixed use of WindowsGetStringRawBuffer which returns internal pointer to buffer
      
      Update system.cpp
      
      Support C++/CX and native C++ through conditional compilation.  Fixed style - long lines, comma operators, long conditional.  Optimized string usage to use reference.
      
      Update system.cpp
      
      Fixed conditional compilation around include and library
      
      Update system.cpp
      
      Fixed trailing space
      
      Update system.cpp
      
      Cleaned up whitespace, removed redundant code and added edge cases for string cleanup
      
      Update system.cpp
      
      Fixed compiler warning over comma operator clause
      
      Update system.cpp
      
      NULL initialization
      
      Update system.cpp
      
      Fixed use of WindowsGetStringRawBuffer which returns internal pointer to buffer
      
      Update system.cpp
      
      Support C++/CX and native C++ through conditional compilation.  Fixed style - long lines, comma operators, long conditional.  Optimized string usage to use reference.
      
      Update system.cpp
      
      Fixed conditional compilation around include and library
      
      Update system.cpp
      
      Fixed trailing space
      e4793e3d
    • Roman Donchenko's avatar
      684ff703
    • Roman Donchenko's avatar
  3. 24 Nov, 2013 2 commits
  4. 23 Nov, 2013 4 commits
  5. 22 Nov, 2013 7 commits
  6. 21 Nov, 2013 6 commits
  7. 20 Nov, 2013 7 commits
  8. 19 Nov, 2013 5 commits
    • Roman Donchenko's avatar
      In the example in OpenCVConfig.cmake.in, explicitly add the include paths. · ef27ac37
      Roman Donchenko authored
      After #1801, the include directories are no longer added automatically,
      so we should show the user how to do that.
      ef27ac37
    • Roman Donchenko's avatar
      In OpenCVConfig.cmake.in, lowercased the commands in the example. · 7f935717
      Roman Donchenko authored
      This is the preferred style nowadays, and more consistent with the
      rest of the code.
      7f935717
    • Roman Donchenko's avatar
      Merge remote-tracking branch 'origin/2.4' into merge-2.4 · aacf188e
      Roman Donchenko authored
      Conflicts:
      	modules/ocl/include/opencv2/ocl/ocl.hpp
      	modules/ocl/src/arithm.cpp
      	modules/ocl/src/build_warps.cpp
      	modules/ocl/src/color.cpp
      	modules/ocl/src/haar.cpp
      	modules/ocl/src/imgproc.cpp
      	modules/ocl/src/split_merge.cpp
      	modules/ocl/test/test_color.cpp
      	samples/cpp/3calibration.cpp
      	samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp
      	samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp
      	samples/cpp/Qt_sample/main.cpp
      	samples/cpp/camshiftdemo.cpp
      	samples/cpp/descriptor_extractor_matcher.cpp
      	samples/cpp/distrans.cpp
      	samples/cpp/generic_descriptor_match.cpp
      	samples/cpp/grabcut.cpp
      	samples/cpp/morphology2.cpp
      	samples/cpp/segment_objects.cpp
      	samples/cpp/stereo_calib.cpp
      	samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp
      	samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp
      	samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
      	samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
      	samples/cpp/tutorial_code/objectDetection/objectDetection.cpp
      	samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp
      	samples/cpp/video_dmtx.cpp
      aacf188e
    • Vadim Pisarevsky's avatar
      added some diagnostic into Tonemap test · d0b3c7a5
      Vadim Pisarevsky authored
      d0b3c7a5
    • Vadim Pisarevsky's avatar
      another attempt to fix compile errors · 8c44995e
      Vadim Pisarevsky authored
      8c44995e
  9. 18 Nov, 2013 2 commits