Merge pull request #2410 from asmorkalov:android_tiff_lowmem_fix

pull/2413/merge
Roman Donchenko 11 years ago committed by OpenCV Buildbot
commit 1db1a83410
  1. 6
      modules/highgui/test/test_grfmt.cpp

@ -392,7 +392,13 @@ TEST(Highgui_Jpeg, encode_empty)
#define int64 int64_hack_ #define int64 int64_hack_
#include "tiff.h" #include "tiff.h"
#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)
#else
TEST(Highgui_Tiff, decode_tile16384x16384) TEST(Highgui_Tiff, decode_tile16384x16384)
#endif
{ {
// see issue #2161 // see issue #2161
cv::Mat big(16384, 16384, CV_8UC1, cv::Scalar::all(0)); cv::Mat big(16384, 16384, CV_8UC1, cv::Scalar::all(0));

Loading…
Cancel
Save