Thanks to visit codestin.com
Credit goes to github.com

Skip to content

improvements on tests of imagecodecs module #25525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 17, 2024
Merged

improvements on tests of imagecodecs module #25525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/highgui/src/window_w32.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2161,7 +2161,7 @@ static void showSaveDialog(CvWindow& window)
#ifdef HAVE_TIFF
"TIFF Files (*.tiff;*.tif)\0*.tiff;*.tif\0"
#endif
#ifdef HAVE_JASPER
#if defined(HAVE_JASPER) || defined(HAVE_OPENJPEG)
"JPEG-2000 files (*.jp2)\0*.jp2\0"
#endif
#ifdef HAVE_WEBP
Expand Down
5 changes: 5 additions & 0 deletions modules/imgcodecs/perf/perf_jpeg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@

namespace opencv_test
{

#ifdef HAVE_JPEG

using namespace perf;

PERF_TEST(JPEG, Decode)
Expand Down Expand Up @@ -35,4 +38,6 @@ PERF_TEST(JPEG, Encode)
SANITY_CHECK_NOTHING();
}

#endif // HAVE_JPEG

} // namespace
5 changes: 5 additions & 0 deletions modules/imgcodecs/perf/perf_png.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

namespace opencv_test
{

#if defined(HAVE_PNG) || defined(HAVE_SPNG)

using namespace perf;

typedef perf::TestBaseWithParam<std::string> PNG;
Expand Down Expand Up @@ -38,4 +41,6 @@ PERF_TEST(PNG, encode)
SANITY_CHECK_NOTHING();
}

#endif // HAVE_PNG

} // namespace
6 changes: 6 additions & 0 deletions modules/imgcodecs/test/test_grfmt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,17 @@ const string all_images[] =
"readwrite/uint16-mono2.dcm",
"readwrite/uint8-rgb.dcm",
#endif
#if defined(HAVE_PNG) || defined(HAVE_SPNG)
Copy link
Contributor

@mshabunin mshabunin May 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have GDAL library integration which should support all these image types (PNG, JPEG, TIFF). Perhaps it should be accounted too, though I didn't try to test GDAL backend specifically (with no other backends).

"readwrite/color_palette_alpha.png",
#endif
#ifdef HAVE_TIFF
"readwrite/multipage.tif",
#endif
"readwrite/ordinary.bmp",
"readwrite/rle8.bmp",
#ifdef HAVE_JPEG
"readwrite/test_1_c1.jpg",
#endif
#ifdef HAVE_IMGCODEC_HDR
"readwrite/rle.hdr"
#endif
Expand Down
2 changes: 2 additions & 0 deletions modules/imgcodecs/test/test_read_write.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,7 @@ TEST(Imgcodecs_Image, write_umat)
EXPECT_EQ(0, remove(dst_name.c_str()));
}

#ifdef HAVE_TIFF
TEST(Imgcodecs_Image, multipage_collection_size)
{
const string root = cvtest::TS::ptr()->get_data_path();
Expand Down Expand Up @@ -479,6 +480,7 @@ TEST(ImgCodecs, multipage_collection_two_iterator_operatorpp)
EXPECT_TRUE(cv::norm(img1, img[i], NORM_INF) == 0);
}
}
#endif


TEST(Imgcodecs_Params, imwrite_regression_22752)
Expand Down