Merge new changes
authorFedor Morozov <f-morozov@ya.ru>
Wed, 18 Sep 2013 14:21:45 +0000 (18:21 +0400)
committerFedor Morozov <f-morozov@ya.ru>
Wed, 18 Sep 2013 14:21:45 +0000 (18:21 +0400)
commit90b6af149658637b65c3697b2ee01d6be29c1f87
treeda2bf151d77b2bbd129b5dc4d0f74fe2588c7eaf
parentcf275acbce344a8785ca70fc19027986a59792c1
parentb1af5cc4782112ff58f8ea0c03b751bb8c0d7308
Merge new changes
modules/photo/src/calibrate.cpp
modules/photo/test/test_hdr.cpp