generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Split highgui module to videoio and highgui

Browse Source
This commit is contained in:
vbystricky
2014-07-10 18:27:32 +04:00
committed by VBystricky
parent f773cd9a3e
commit d58f736935
149 changed files with 1673 additions and 1309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/imgcodecs/include/opencv2/imgcodecs/imgcodecs_c.h
View File

@@ -109,6 +109,18 @@ enum
/* utility function: convert one image to another with optional vertical flip */
CVAPI(void) cvConvertImage( const CvArr* src, CvArr* dst, int flags CV_DEFAULT(0));
CVAPI(int) cvHaveImageReader(const char* filename);
CVAPI(int) cvHaveImageWriter(const char* filename);
/****************************************************************************************\
* Obsolete functions/synonyms *
\****************************************************************************************/
#define cvvLoadImage(name) cvLoadImage((name),1)
#define cvvSaveImage cvSaveImage
#define cvvConvertImage cvConvertImage
#ifdef __cplusplus
}

4
modules/imgcodecs/include/opencv2/imgcodecs/ios.h
View File

@@ -41,6 +41,10 @@
//
//M*/
#import <UIKit/UIKit.h>
#import <Accelerate/Accelerate.h>
#import <AVFoundation/AVFoundation.h>
#import <ImageIO/ImageIO.h>
#include "opencv2/core/core.hpp"
UIImage* MatToUIImage(const cv::Mat& image);

2
modules/imgcodecs/perf/perf_main.cpp
View File

@@ -1,3 +1,3 @@
#include "perf_precomp.hpp"
CV_PERF_TEST_MAIN(highgui)
CV_PERF_TEST_MAIN(imgcodecs)

6
modules/imgcodecs/src/ios_conversions.mm
View File

@@ -40,7 +40,11 @@
//
//M*/
#import "opencv2/highgui/cap_ios.h"
#import <UIKit/UIKit.h>
#import <Accelerate/Accelerate.h>
#import <AVFoundation/AVFoundation.h>
#import <ImageIO/ImageIO.h>
#include "opencv2/core.hpp"
#include "precomp.hpp"
UIImage* MatToUIImage(const cv::Mat& image) {

2
modules/imgcodecs/src/loadsave.cpp
View File

@@ -454,7 +454,7 @@ bool imencode( const String& ext, InputArray _image,
}
/****************************************************************************************\
* HighGUI loading & saving function implementation *
* Imgcodecs loading & saving function implementation *
\****************************************************************************************/
CV_IMPL int

5
modules/imgcodecs/src/precomp.hpp
View File

@@ -81,7 +81,4 @@
#define __END__ __CV_END__
#define EXIT __CV_EXIT__
CVAPI(int) cvHaveImageReader(const char* filename);
CVAPI(int) cvHaveImageWriter(const char* filename);
#endif /* __HIGHGUI_H_ */
#endif /* __IMGCODECS_H_ */

6
modules/imgcodecs/test/test_drawing.cpp
View File

@@ -407,8 +407,8 @@ int CV_DrawingTest_C::checkLineIterator( Mat& _img )
}
#ifdef HAVE_JPEG
TEST(Highgui_Drawing, cpp_regression) { CV_DrawingTest_CPP test; test.safe_run(); }
TEST(Highgui_Drawing, c_regression) { CV_DrawingTest_C test; test.safe_run(); }
TEST(Imgcodecs_Drawing, cpp_regression) { CV_DrawingTest_CPP test; test.safe_run(); }
TEST(Imgcodecs_Drawing, c_regression) { CV_DrawingTest_C test; test.safe_run(); }
#endif
class CV_FillConvexPolyTest : public cvtest::BaseTest
@@ -443,4 +443,4 @@ protected:
}
};
TEST(Highgui_Drawing, fillconvexpoly_clipping) { CV_FillConvexPolyTest test; test.safe_run(); }
TEST(Imgcodecs_Drawing, fillconvexpoly_clipping) { CV_FillConvexPolyTest test; test.safe_run(); }

34
modules/imgcodecs/test/test_grfmt.cpp
View File

@@ -222,12 +222,12 @@ public:
#ifdef HAVE_PNG
TEST(Highgui_Image, write_big) { CV_GrfmtWriteBigImageTest test; test.safe_run(); }
TEST(Imgcodecs_Image, write_big) { CV_GrfmtWriteBigImageTest test; test.safe_run(); }
#endif
TEST(Highgui_Image, write_imageseq) { CV_GrfmtWriteSequenceImageTest test; test.safe_run(); }
TEST(Imgcodecs_Image, write_imageseq) { CV_GrfmtWriteSequenceImageTest test; test.safe_run(); }
TEST(Highgui_Image, read_bmp_rle8) { CV_GrfmtReadBMPRLE8Test test; test.safe_run(); }
TEST(Imgcodecs_Image, read_bmp_rle8) { CV_GrfmtReadBMPRLE8Test test; test.safe_run(); }
#ifdef HAVE_PNG
class CV_GrfmtPNGEncodeTest : public cvtest::BaseTest
@@ -256,9 +256,9 @@ public:
}
};
TEST(Highgui_Image, encode_png) { CV_GrfmtPNGEncodeTest test; test.safe_run(); }
TEST(Imgcodecs_Image, encode_png) { CV_GrfmtPNGEncodeTest test; test.safe_run(); }
TEST(Highgui_ImreadVSCvtColor, regression)
TEST(Imgcodecs_ImreadVSCvtColor, regression)
{
cvtest::TS& ts = *cvtest::TS::ptr();
@@ -374,11 +374,11 @@ public:
}
};
TEST(Highgui_Image, read_png_color_palette_with_alpha) { CV_GrfmtReadPNGColorPaletteWithAlphaTest test; test.safe_run(); }
TEST(Imgcodecs_Image, read_png_color_palette_with_alpha) { CV_GrfmtReadPNGColorPaletteWithAlphaTest test; test.safe_run(); }
#endif
#ifdef HAVE_JPEG
TEST(Highgui_Jpeg, encode_empty)
TEST(Imgcodecs_Jpeg, encode_empty)
{
cv::Mat img;
std::vector<uchar> jpegImg;
@@ -386,7 +386,7 @@ TEST(Highgui_Jpeg, encode_empty)
ASSERT_THROW(cv::imencode(".jpg", img, jpegImg), cv::Exception);
}
TEST(Highgui_Jpeg, encode_decode_progressive_jpeg)
TEST(Imgcodecs_Jpeg, encode_decode_progressive_jpeg)
{
cvtest::TS& ts = *cvtest::TS::ptr();
string input = string(ts.get_data_path()) + "../cv/shared/lena.png";
@@ -410,7 +410,7 @@ TEST(Highgui_Jpeg, encode_decode_progressive_jpeg)
remove(output_progressive.c_str());
}
TEST(Highgui_Jpeg, encode_decode_optimize_jpeg)
TEST(Imgcodecs_Jpeg, encode_decode_optimize_jpeg)
{
cvtest::TS& ts = *cvtest::TS::ptr();
string input = string(ts.get_data_path()) + "../cv/shared/lena.png";
@@ -446,9 +446,9 @@ TEST(Highgui_Jpeg, encode_decode_optimize_jpeg)
#ifdef ANDROID
// Test disabled as it uses a lot of memory.
// It is killed with SIGKILL by out of memory killer.
TEST(Highgui_Tiff, DISABLED_decode_tile16384x16384)
TEST(Imgcodecs_Tiff, DISABLED_decode_tile16384x16384)
#else
TEST(Highgui_Tiff, decode_tile16384x16384)
TEST(Imgcodecs_Tiff, decode_tile16384x16384)
#endif
{
// see issue #2161
@@ -477,7 +477,7 @@ TEST(Highgui_Tiff, decode_tile16384x16384)
remove(file4.c_str());
}
TEST(Highgui_Tiff, write_read_16bit_big_little_endian)
TEST(Imgcodecs_Tiff, write_read_16bit_big_little_endian)
{
// see issue #2601 "16-bit Grayscale TIFF Load Failures Due to Buffer Underflow and Endianness"
@@ -560,7 +560,7 @@ public:
}
};
TEST(Highgui_Tiff, decode_tile_remainder)
TEST(Imgcodecs_Tiff, decode_tile_remainder)
{
CV_GrfmtReadTifTiledWithNotFullTiles test; test.safe_run();
}
@@ -569,7 +569,7 @@ TEST(Highgui_Tiff, decode_tile_remainder)
#ifdef HAVE_WEBP
TEST(Highgui_WebP, encode_decode_lossless_webp)
TEST(Imgcodecs_WebP, encode_decode_lossless_webp)
{
cvtest::TS& ts = *cvtest::TS::ptr();
string input = string(ts.get_data_path()) + "../cv/shared/lena.png";
@@ -618,7 +618,7 @@ TEST(Highgui_WebP, encode_decode_lossless_webp)
EXPECT_TRUE(cvtest::norm(img, img_webp, NORM_INF) == 0);
}
TEST(Highgui_WebP, encode_decode_lossy_webp)
TEST(Imgcodecs_WebP, encode_decode_lossy_webp)
{
cvtest::TS& ts = *cvtest::TS::ptr();
std::string input = std::string(ts.get_data_path()) + "../cv/shared/lena.png";
@@ -642,7 +642,7 @@ TEST(Highgui_WebP, encode_decode_lossy_webp)
}
}
TEST(Highgui_WebP, encode_decode_with_alpha_webp)
TEST(Imgcodecs_WebP, encode_decode_with_alpha_webp)
{
cvtest::TS& ts = *cvtest::TS::ptr();
std::string input = std::string(ts.get_data_path()) + "../cv/shared/lena.png";
@@ -668,7 +668,7 @@ TEST(Highgui_WebP, encode_decode_with_alpha_webp)
#endif
TEST(Highgui_Hdr, regression)
TEST(Imgcodecs_Hdr, regression)
{
string folder = string(cvtest::TS::ptr()->get_data_path()) + "/readwrite/";
string name_rle = folder + "rle.hdr";