StarMirror/xlnt
1
0
Fork 0
mirror of https://github.com/tfussell/xlnt.git synced 2024-03-22 13:11:17 +08:00
Code Issues Projects Releases Wiki Activity

use std::find and don't double iterate the list

Browse Source 
- ~5% perf improvement in img2xlsx example
This commit is contained in:
Crzyrndm 2018-07-29 16:48:18 +12:00
parent f64dbc00c4
commit 5a5db1a50b
1 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
source/detail/implementations/stylesheet.hpp
View File

@ -178,32 +178,15 @@ struct stylesheet
}
template<typename T, typename C>
std::size_t find_or_add(C &container, const T &item, bool *added = nullptr)
std::size_t find_or_add(C &container, const T &item)
{
if (added != nullptr)
{
*added = false;
}
std::size_t i = 0;
for (auto iter = container.begin(); iter != container.end(); ++iter)
auto iter = std::find(container.begin(), container.end(), item);
if (iter != container.end())
{
if (*iter == item)
{
return i;
return iter - container.begin();
}
++i;
}
if (added != nullptr)
{
*added = true;
}
container.emplace(container.end(), item);
container.emplace_back(item);
return container.size() - 1;
}
@ -235,7 +218,6 @@ struct stylesheet
if (!garbage_collection_enabled) return;
auto format_iter = format_impls.begin();
while (format_iter != format_impls.end())
{
auto &impl = *format_iter;
@ -399,12 +381,18 @@ struct stylesheet
format_impl *find_or_create(format_impl &pattern)
{
auto iter = format_impls.begin();
bool added = false;
pattern.references = 0;
auto id = find_or_add(format_impls, pattern, &added);
std::advance(iter, static_cast<std::list<format_impl>::difference_type>(id));
auto id = 0;
auto iter = format_impls.begin();
while (iter != format_impls.end() && !(*iter == pattern))
{
++id;
++iter;
}
if (iter == format_impls.end())
{
iter = format_impls.emplace(format_impls.end(), pattern);
}
auto &result = *iter;
result.parent = this;