Skip to content
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

Jump to bottom

thorvg: Re-enable thread support, made opt-in upstream #88053

Merged
merged 1 commit into from
Feb 7, 2024
Merged

thorvg: Re-enable thread support, made opt-in upstream #88053

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
1 change: 1 addition & 0 deletions thirdparty/thorvg/inc/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#define THORVG_SVG_LOADER_SUPPORT
#define THORVG_PNG_LOADER_SUPPORT
#define THORVG_JPG_LOADER_SUPPORT
#define THORVG_THREAD_SUPPORT

// For internal debugging:
//#define THORVG_LOG_ENABLED
Expand Down
6 changes: 3 additions & 3 deletions thirdparty/thorvg/src/common/tvgLock.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ namespace tvg {
{
Key* key = nullptr;

ScopedLock(Key& key)
ScopedLock(Key& p_key)
Copy link
Member Author

Choose a reason for hiding this comment

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

@hermet FYI, I was getting a -Wshadow warning from GCC here.
Happy to make a PR upstream if this kind of change looks acceptable, possibly with a different naming convention if there's one you favor.

{
key.mtx.lock();
this->key = &key;
p_key.mtx.lock();
key = &p_key;
}

~ScopedLock()
Expand Down
1 change: 1 addition & 0 deletions thirdparty/thorvg/update-thorvg.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ cat << EOF > ../inc/config.h
#define THORVG_SVG_LOADER_SUPPORT
#define THORVG_PNG_LOADER_SUPPORT
#define THORVG_JPG_LOADER_SUPPORT
#define THORVG_THREAD_SUPPORT

// For internal debugging:
//#define THORVG_LOG_ENABLED
Expand Down
Loading