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

Skip to content

Commit 72870c9

Browse files
committed
test
1 parent dde3c72 commit 72870c9

File tree

2 files changed

+1
-27
lines changed

2 files changed

+1
-27
lines changed

modules/imgcodecs/src/grfmt_base.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ BaseImageDecoder::BaseImageDecoder()
5353
m_type = -1;
5454
m_buf_supported = false;
5555
m_scale_denom = 1;
56-
m_frame_count = 0;
56+
m_frame_count = 1;
5757
}
5858

5959

modules/imgcodecs/src/loadsave.cpp

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1237,38 +1237,12 @@ void ImageCollection::Impl::init(String const& filename, int flags) {
12371237
}
12381238
#endif
12391239

1240-
12411240
CV_Assert(m_decoder);
12421241
m_decoder->setSource(filename);
12431242
CV_Assert(m_decoder->readHeader());
12441243

12451244
m_size = m_decoder->getFrameCount();
1246-
1247-
if (m_size > 0) {
1248-
m_pages.resize(m_size);
1249-
return;
1250-
}
1251-
1252-
// count the pages of the image collection
1253-
size_t count = 1;
1254-
while(m_decoder->nextPage()) count++;
1255-
1256-
m_size = count;
12571245
m_pages.resize(m_size);
1258-
// Reinitialize the decoder because we advanced to the last page while counting the pages of the image
1259-
#ifdef HAVE_GDAL
1260-
if (m_flags != IMREAD_UNCHANGED && (m_flags & IMREAD_LOAD_GDAL) == IMREAD_LOAD_GDAL) {
1261-
m_decoder = GdalDecoder().newDecoder();
1262-
}
1263-
else {
1264-
#endif
1265-
m_decoder = findDecoder(m_filename);
1266-
#ifdef HAVE_GDAL
1267-
}
1268-
#endif
1269-
1270-
m_decoder->setSource(m_filename);
1271-
m_decoder->readHeader();
12721246
}
12731247

12741248
size_t ImageCollection::Impl::size() const { return m_size; }

0 commit comments

Comments
 (0)