Removed build errors and removed test images
authorsiddharth <siddharthkherada27@gmail.com>
Mon, 21 Oct 2013 14:24:32 +0000 (19:54 +0530)
committersiddharth <siddharthkherada27@gmail.com>
Wed, 4 Dec 2013 13:48:00 +0000 (19:18 +0530)
commit33e6c074855c8d84e28fff8e3158a33bf17be800
tree4d7204bd055227b16943c2586e9fabfe75e6f73a
parent2f65a0d4bab9c38854042a7e64814c59240f2f29
Removed build errors and removed test images

Removed conflict

Error fix 1

Error fix 2

Error fix 3

Error fix 3

Error fix 4

Error fix 5

Error fix 6

Error fix 7

Error fix 8

Error fix 9

Error fix 10

Error fix 11

Error fix 12

Errors fixed

Removed opencv_extra folder inside opencv folder
modules/photo/doc/cloning.rst
modules/photo/doc/npr.rst
modules/photo/include/opencv2/photo.hpp
modules/photo/src/contrast_preserve.hpp
modules/photo/src/npr.cpp
modules/photo/src/npr.hpp
modules/photo/test/test_npr.cpp [changed mode: 0644->0755]
samples/cpp/cloning_demo.cpp
samples/cpp/npr_demo.cpp