forked from bartvdbraak/blender
Cleanup: Use short condition style.
This commit is contained in:
parent
27e4ce0cf6
commit
84a9d171da
@ -141,19 +141,11 @@ ImageManager::ImageDataType ImageManager::get_image_metadata(const string& filen
|
|||||||
|
|
||||||
if(is_float) {
|
if(is_float) {
|
||||||
is_linear = true;
|
is_linear = true;
|
||||||
|
return (channels > 1) ? IMAGE_DATA_TYPE_FLOAT4 : IMAGE_DATA_TYPE_FLOAT;
|
||||||
if(channels > 1)
|
|
||||||
return IMAGE_DATA_TYPE_FLOAT4;
|
|
||||||
else
|
|
||||||
return IMAGE_DATA_TYPE_FLOAT;
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if(channels > 1)
|
return (channels > 1) ? IMAGE_DATA_TYPE_BYTE4 : IMAGE_DATA_TYPE_BYTE;
|
||||||
return IMAGE_DATA_TYPE_BYTE4;
|
|
||||||
else
|
|
||||||
return IMAGE_DATA_TYPE_BYTE;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ImageInput *in = ImageInput::create(filename);
|
ImageInput *in = ImageInput::create(filename);
|
||||||
@ -202,16 +194,10 @@ ImageManager::ImageDataType ImageManager::get_image_metadata(const string& filen
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(is_float) {
|
if(is_float) {
|
||||||
if(channels > 1)
|
return (channels > 1) ? IMAGE_DATA_TYPE_FLOAT4 : IMAGE_DATA_TYPE_FLOAT;
|
||||||
return IMAGE_DATA_TYPE_FLOAT4;
|
|
||||||
else
|
|
||||||
return IMAGE_DATA_TYPE_FLOAT;
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if(channels > 1)
|
return (channels > 1) ? IMAGE_DATA_TYPE_BYTE4 : IMAGE_DATA_TYPE_BYTE;
|
||||||
return IMAGE_DATA_TYPE_BYTE4;
|
|
||||||
else
|
|
||||||
return IMAGE_DATA_TYPE_BYTE;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user