blender
/
blender
133
398
Fork 579
Code Issues 6.3k Pull Requests 747 Projects 19 Wiki Activity

Cleanup: Use short condition style.

This commit is contained in:
Thomas Dinges 2016-05-22 22:47:37 +02:00
parent 27e4ce0cf6
commit 84a9d171da
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
intern/cycles/render/image.cpp
View File

@ -141,19 +141,11 @@ ImageManager::ImageDataType ImageManager::get_image_metadata(const string& filen
if(is_float) {
is_linear = true;
if(channels > 1)
return IMAGE_DATA_TYPE_FLOAT4;
else
return IMAGE_DATA_TYPE_FLOAT;
return (channels > 1) ? IMAGE_DATA_TYPE_FLOAT4 : IMAGE_DATA_TYPE_FLOAT;
}
else {
if(channels > 1)
return IMAGE_DATA_TYPE_BYTE4;
else
return IMAGE_DATA_TYPE_BYTE;
return (channels > 1) ? IMAGE_DATA_TYPE_BYTE4 : IMAGE_DATA_TYPE_BYTE;
}
}
ImageInput *in = ImageInput::create(filename);
@ -202,16 +194,10 @@ ImageManager::ImageDataType ImageManager::get_image_metadata(const string& filen
}
if(is_float) {
if(channels > 1)
return IMAGE_DATA_TYPE_FLOAT4;
else
return IMAGE_DATA_TYPE_FLOAT;
return (channels > 1) ? IMAGE_DATA_TYPE_FLOAT4 : IMAGE_DATA_TYPE_FLOAT;
}
else {
if(channels > 1)
return IMAGE_DATA_TYPE_BYTE4;
else
return IMAGE_DATA_TYPE_BYTE;
return (channels > 1) ? IMAGE_DATA_TYPE_BYTE4 : IMAGE_DATA_TYPE_BYTE;
}
}