Skip to content

Commit ec2c2a8

Browse files
committed
PbiStream: check if only a single file is given
1 parent 5605b2a commit ec2c2a8

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

osmpbf/pbistream.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,10 +210,14 @@ m_priv(std::make_unique<imp::SingleFilePbiStream>(std::move(fileIn)))
210210
{}
211211

212212
PbiStream::PbiStream(std::vector<OSMFileIn> && files) {
213-
if (files.size()) {
213+
if (files.size() > 1) {
214214
m_priv = std::make_unique<imp::MultiFilePbiStream>(files.begin(), files.end());
215-
files.clear();
215+
216+
}
217+
else if (files.size()) {
218+
m_priv = std::make_unique<imp::SingleFilePbiStream>(std::move(files.front()));
216219
}
220+
files.clear();
217221
}
218222

219223
PbiStream::PbiStream(const std::vector<std::string> & fileNames) {
@@ -229,7 +233,7 @@ PbiStream::PbiStream(const std::vector<std::string> & fileNames) {
229233
}
230234
}
231235
if (files.size() == 1) {
232-
m_priv.reset(new imp::SingleFilePbiStream(std::move(files[0])));
236+
m_priv.reset(new imp::SingleFilePbiStream(std::move(files.front())));
233237
}
234238
else if (files.size() > 1) {
235239
m_priv.reset(new imp::MultiFilePbiStream(files.begin(), files.end()));

0 commit comments

Comments
 (0)