archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cycles: Some cleanup, should be no functional changes

Browse Source 
Addressing meaningful feedback from coverity.
This commit is contained in:
Sergey Sharybin
2016-02-16 15:32:26 +01:00
parent 21c88df7c7
commit d0246d5f30
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/blender/blender_shader.cpp
View File

@@ -78,7 +78,7 @@ static int validate_enum_value(int value, int num_values, int default_value)
} }
template<typename NodeType> template<typename NodeType>
static InterpolationType get_image_interpolation(NodeType b_node) static InterpolationType get_image_interpolation(NodeType& b_node)
{ {
int value = b_node.interpolation(); int value = b_node.interpolation();
return (InterpolationType)validate_enum_value(value, return (InterpolationType)validate_enum_value(value,
@@ -87,7 +87,7 @@ static InterpolationType get_image_interpolation(NodeType b_node)
} }
template<typename NodeType> template<typename NodeType>
static ExtensionType get_image_extension(NodeType b_node) static ExtensionType get_image_extension(NodeType& b_node)
{ {
int value = b_node.extension(); int value = b_node.extension();
return (ExtensionType)validate_enum_value(value, return (ExtensionType)validate_enum_value(value,

3
intern/cycles/util/util_aligned_malloc.cpp
View File

@@ -44,8 +44,7 @@ void *util_aligned_malloc(size_t size, int alignment)
{ {
#ifdef WITH_BLENDER_GUARDEDALLOC #ifdef WITH_BLENDER_GUARDEDALLOC
return MEM_mallocN_aligned(size, alignment, "Cycles Aligned Alloc"); return MEM_mallocN_aligned(size, alignment, "Cycles Aligned Alloc");
#endif #elif defined(_WIN32)
#ifdef _WIN32
return _aligned_malloc(size, alignment); return _aligned_malloc(size, alignment);
#elif defined(__APPLE__) #elif defined(__APPLE__)
/* On Mac OS X, both the heap and the stack are guaranteed 16-byte aligned so /* On Mac OS X, both the heap and the stack are guaranteed 16-byte aligned so

3
intern/cycles/util/util_path.cpp
View File

@@ -178,7 +178,8 @@ public:
class path_info { class path_info {
public: public:
path_info(const string& path) path_info(const string& path)
: path_(path) : path_(path),
entry_(NULL)
{ {
} }