nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1679568. Cleanup profile creation. r=aosmond

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D98084
This commit is contained in:
Jeff Muizelaar 2020-11-27 19:09:24 +00:00
parent ba25e09021
commit 692b11db89
1 changed files with 15 additions and 19 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

34
gfx/qcms/src/iccread.rs
View file

@ -1082,19 +1082,15 @@ pub unsafe extern "C" fn qcms_profile_create_rgb_with_gamma_set(
//XXX: should store the whitepoint
if !set_rgb_colorants(&mut profile, white_point, primaries) {
return 0 as *mut qcms_profile;
return null_mut();
}
(*profile).redTRC = Some(curve_from_gamma(redGamma));
(*profile).blueTRC = Some(curve_from_gamma(blueGamma));
(*profile).greenTRC = Some(curve_from_gamma(greenGamma));
if (*profile).redTRC.is_none() || (*profile).blueTRC.is_none() || (*profile).greenTRC.is_none()
{
return 0 as *mut qcms_profile;
}
(*profile).class_type = DISPLAY_DEVICE_PROFILE;
(*profile).rendering_intent = QCMS_INTENT_PERCEPTUAL;
(*profile).color_space = RGB_SIGNATURE;
(*profile).pcs = XYZ_TYPE;
profile.redTRC = Some(curve_from_gamma(redGamma));
profile.blueTRC = Some(curve_from_gamma(blueGamma));
profile.greenTRC = Some(curve_from_gamma(greenGamma));
profile.class_type = DISPLAY_DEVICE_PROFILE;
profile.rendering_intent = QCMS_INTENT_PERCEPTUAL;
profile.color_space = RGB_SIGNATURE;
profile.pcs = XYZ_TYPE;
return Box::into_raw(profile);
}
@ -1102,14 +1098,14 @@ pub unsafe extern "C" fn qcms_profile_create_rgb_with_gamma_set(
pub unsafe extern "C" fn qcms_profile_create_gray_with_gamma(mut gamma: f32) -> *mut qcms_profile {
let mut profile = qcms_profile_create();
(*profile).grayTRC = Some(curve_from_gamma(gamma));
if (*profile).grayTRC.is_none() {
return 0 as *mut qcms_profile;
profile.grayTRC = Some(curve_from_gamma(gamma));
if profile.grayTRC.is_none() {
return null_mut();
}
(*profile).class_type = DISPLAY_DEVICE_PROFILE;
(*profile).rendering_intent = QCMS_INTENT_PERCEPTUAL;
(*profile).color_space = GRAY_SIGNATURE;
(*profile).pcs = XYZ_TYPE;
profile.class_type = DISPLAY_DEVICE_PROFILE;
profile.rendering_intent = QCMS_INTENT_PERCEPTUAL;
profile.color_space = GRAY_SIGNATURE;
profile.pcs = XYZ_TYPE;
return Box::into_raw(profile);
}