Skip to content

Fix build with latest MSVC #100

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

Closed
mos9527 wants to merge 2 commits into from
Closed

Fix build with latest MSVC #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
591a43a
Build: Ambiguous call to isfinite for MSVC 17.11
jessey-git Aug 14, 2024
6dfd2b5
Fix build with latest MSVC
brechtvl Feb 12, 2025
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
16 changes: 1 addition & 15 deletions intern/cycles/scene/image.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,6 @@ CCL_NAMESPACE_BEGIN

namespace {

/* Some helpers to silence warning in templated function. */
bool isfinite(uchar /*value*/)
{
return true;
}
bool isfinite(half /*value*/)
{
return true;
}
bool isfinite(uint16_t /*value*/)
{
return true;
}

const char *name_from_type(ImageDataType type)
{
switch (type) {
Expand Down Expand Up @@ -628,7 +614,7 @@ bool ImageManager::file_load_image(Image *img, int texture_limit)
}

/* Make sure we don't have buggy values. */
if (FileFormat == TypeDesc::FLOAT) {
if constexpr (FileFormat == TypeDesc::FLOAT) {
/* For RGBA buffers we put all channels to 0 if either of them is not
* finite. This way we avoid possible artifacts caused by fully changed
* hue. */
Expand Down
2 changes: 2 additions & 0 deletions intern/cycles/util/profiling.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
#include "util/foreach.h"
#include "util/set.h"

#include <chrono>

CCL_NAMESPACE_BEGIN

Profiler::Profiler() : do_stop_worker(true), worker(NULL) {}
Expand Down