diff --git a/library/borealis b/library/borealis index 53ee60dd..a532f228 160000 --- a/library/borealis +++ b/library/borealis @@ -1 +1 @@ -Subproject commit 53ee60dd655a71353fad07fb505258c39222b264 +Subproject commit a532f2285484e704b09d380d1bfb55a152d8ab20 diff --git a/wiliwili/source/activity/pgc_index_activity.cpp b/wiliwili/source/activity/pgc_index_activity.cpp index 46df1b27..ba02fdcd 100644 --- a/wiliwili/source/activity/pgc_index_activity.cpp +++ b/wiliwili/source/activity/pgc_index_activity.cpp @@ -3,6 +3,7 @@ // #include +#include #include #include #include diff --git a/wiliwili/source/fragment/player_single_comment.cpp b/wiliwili/source/fragment/player_single_comment.cpp index 32523468..de1d318a 100644 --- a/wiliwili/source/fragment/player_single_comment.cpp +++ b/wiliwili/source/fragment/player_single_comment.cpp @@ -2,6 +2,7 @@ // Created by fang on 2023/1/6. // +#include #include #include #include @@ -299,7 +300,7 @@ void PlayerSingleComment::setCommentData(const bilibili::VideoCommentResult& res } void PlayerSingleComment::showStartAnimation(float y) { - if (isnan(y)) return; + if (std::isnan(y)) return; commentOriginalPosition = y; brls::Application::blockInputs(); diff --git a/wiliwili/source/utils/config_helper.cpp b/wiliwili/source/utils/config_helper.cpp index 573c6cd6..8116e88f 100644 --- a/wiliwili/source/utils/config_helper.cpp +++ b/wiliwili/source/utils/config_helper.cpp @@ -12,6 +12,7 @@ #endif #endif +#include #include #include #include @@ -381,7 +382,7 @@ void ProgramConfig::loadHomeWindowState() { } void ProgramConfig::saveHomeWindowState() { - if (isnan(VideoContext::posX) || isnan(VideoContext::posY)) return; + if (std::isnan(VideoContext::posX) || std::isnan(VideoContext::posY)) return; if (VideoContext::FULLSCREEN) return; auto videoContext = brls::Application::getPlatform()->getVideoContext(); diff --git a/wiliwili/source/view/auto_tab_frame.cpp b/wiliwili/source/view/auto_tab_frame.cpp index bcb50f27..4c688e58 100644 --- a/wiliwili/source/view/auto_tab_frame.cpp +++ b/wiliwili/source/view/auto_tab_frame.cpp @@ -17,6 +17,7 @@ limitations under the License. */ +#include #include #include diff --git a/wiliwili/source/view/gallery_view.cpp b/wiliwili/source/view/gallery_view.cpp index 7557afb0..1bfc1849 100644 --- a/wiliwili/source/view/gallery_view.cpp +++ b/wiliwili/source/view/gallery_view.cpp @@ -2,6 +2,7 @@ // Created by fang on 2022/8/21. // +#include #include #include #include @@ -53,7 +54,7 @@ GalleryView::GalleryView() { if (status.state != brls::GestureState::END) return; float width = getWidth(); float x = getX(); - if (isnan(width) || isnan(x)) return; + if (std::isnan(width) || std::isnan(x)) return; if (status.position.x < x + width * 0.25) { this->prev(); } else if (status.position.x > x + width * 0.75) { diff --git a/wiliwili/source/view/mpv_core.cpp b/wiliwili/source/view/mpv_core.cpp index f729ac77..736fee0f 100644 --- a/wiliwili/source/view/mpv_core.cpp +++ b/wiliwili/source/view/mpv_core.cpp @@ -4,6 +4,7 @@ #include #include +#include #include #include #include @@ -625,7 +626,7 @@ void MPVCore::initializeVideo() { void MPVCore::setFrameSize(brls::Rect r) { rect = r; - if (isnan(rect.getWidth()) || isnan(rect.getHeight())) return; + if (std::isnan(rect.getWidth()) || std::isnan(rect.getHeight())) return; #ifdef MPV_SW_RENDER #ifdef BOREALIS_USE_D3D11 diff --git a/wiliwili/source/view/text_box.cpp b/wiliwili/source/view/text_box.cpp index bf70d026..a6f488f3 100644 --- a/wiliwili/source/view/text_box.cpp +++ b/wiliwili/source/view/text_box.cpp @@ -7,6 +7,8 @@ #include #include #include +#include +#include #include #include "view/text_box.hpp" @@ -93,7 +95,7 @@ static YGSize textBoxMeasureFunc(YGNodeRef node, float width, YGMeasureMode widt }; if (heightMode == YGMeasureMode::YGMeasureModeExactly) return size; - if (richTextData.empty() || isnan(width)) return size; + if (richTextData.empty() || std::isnan(width)) return size; size.height = textBox->cutRichTextLines(width); textBox->setParsedDone(true); @@ -162,7 +164,7 @@ void TextBox::setText(const std::string& value) { void TextBox::onLayout() { float width = getWidth(); - if (isnan(width) || width == 0) return; + if (std::isnan(width) || width == 0) return; if (this->richContent.empty()) return; if (!this->parsedDone) this->cutRichTextLines(width); } diff --git a/wiliwili/source/view/video_view.cpp b/wiliwili/source/view/video_view.cpp index 8eded91e..111ffa4a 100644 --- a/wiliwili/source/view/video_view.cpp +++ b/wiliwili/source/view/video_view.cpp @@ -3,6 +3,7 @@ // #include +#include #include #include @@ -1119,7 +1120,7 @@ void VideoView::refreshToggleIcon() { void VideoView::setProgress(float value) { if (is_seeking) return; - if (isnan(value)) return; + if (std::isnan(value)) return; this->osdSlider->setProgress(value); }