Merge branch '2.4'

2013-01-29 14:16:07 +04:00
parent 9de36c5592 2b4ffd1161
commit 0734d9b877
14 changed files with 66 additions and 30 deletions
--- a/modules/highgui/test/test_grfmt.cpp
+++ b/modules/highgui/test/test_grfmt.cpp
@@ -282,3 +282,12 @@ TEST(Highgui_ImreadVSCvtColor, regression)
 }
 #endif

+#ifdef HAVE_JPEG
+TEST(Highgui_Jpeg, encode_empty)
+{
+    cv::Mat img;
+    std::vector<uchar> jpegImg;
+
+    ASSERT_THROW(cv::imencode(".jpg", img, jpegImg), cv::Exception);
+}
+#endif