diff options
| author | Nicolas Werner <nicolas.werner@gmx.net> | 2020-12-08 13:40:44 -0500 |
|---|---|---|
| committer | Nicolas Werner <nicolas.werner@gmx.net> | 2020-12-08 13:40:44 -0500 |
| commit | 622a9f709b9a17d6c872d9de5ce9245951ab8bd6 (patch) | |
| tree | 1c1c9cc322557301521fc02636443f12acb7e0f8 /src | |
| parent | 5aa221800667687a7b8178abb905a1dc87843b59 (diff) | |
| parent | ab7a75a988a3d94d11c8484abfccd238af119d82 (diff) | |
Merge branch 'gitlab-ci' into 'master'
Update .gitlab-ci.yml
See merge request nheko-reborn/nheko!1
Diffstat (limited to 'src')
| -rw-r--r-- | src/Olm.cpp | 4 | ||||
| -rw-r--r-- | src/Utils.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Olm.cpp b/src/Olm.cpp index 91f94ccd..808279a3 100644 --- a/src/Olm.cpp +++ b/src/Olm.cpp @@ -602,8 +602,8 @@ send_key_request_for(mtx::events::EncryptedEvent<mtx::events::msg::Encrypted> e, e.content.session_id); mtx::events::msg::KeyRequest request; - request.action = !cancel ? mtx::events::msg::RequestAction::Request - : mtx::events::msg::RequestAction::Cancellation; + request.action = !cancel ? mtx::events::msg::RequestAction::Request + : mtx::events::msg::RequestAction::Cancellation; request.algorithm = MEGOLM_ALGO; request.room_id = e.room_id; request.sender_key = e.content.sender_key; diff --git a/src/Utils.cpp b/src/Utils.cpp index 743c393f..463c8af3 100644 --- a/src/Utils.cpp +++ b/src/Utils.cpp @@ -638,7 +638,7 @@ utils::luminance(const QColor &col) qreal lumRgb[3]; for (int i = 0; i < 3; i++) { - qreal v = colRgb[i] / 255.0; + qreal v = colRgb[i] / 255.0; v <= 0.03928 ? lumRgb[i] = v / 12.92 : lumRgb[i] = qPow((v + 0.055) / 1.055, 2.4); } |