Changeset View
Changeset View
Standalone View
Standalone View
source/blender/blenkernel/intern/image.c
| Show First 20 Lines • Show All 1,772 Lines • ▼ Show 20 Lines | if (im_format) { | ||||
| } | } | ||||
| } | } | ||||
| else if (im_format->jp2_codec == R_IMF_JP2_CODEC_J2K) { | else if (im_format->jp2_codec == R_IMF_JP2_CODEC_J2K) { | ||||
| if (!BLI_path_extension_check(string, extension_test = ".j2c")) { | if (!BLI_path_extension_check(string, extension_test = ".j2c")) { | ||||
| extension = extension_test; | extension = extension_test; | ||||
| } | } | ||||
| } | } | ||||
| else { | else { | ||||
| BLI_assert(!"Unsupported jp2 codec was specified in im_format->jp2_codec"); | BLI_assert_msg(0, "Unsupported jp2 codec was specified in im_format->jp2_codec"); | ||||
| } | } | ||||
| } | } | ||||
| else { | else { | ||||
| if (!BLI_path_extension_check(string, extension_test = ".jp2")) { | if (!BLI_path_extension_check(string, extension_test = ".jp2")) { | ||||
| extension = extension_test; | extension = extension_test; | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| ▲ Show 20 Lines • Show All 154 Lines • ▼ Show 20 Lines | else if (ftype == IMB_FTYPE_JP2) { | ||||
| if (custom_flags & JP2_JP2) { | if (custom_flags & JP2_JP2) { | ||||
| im_format->jp2_codec = R_IMF_JP2_CODEC_JP2; | im_format->jp2_codec = R_IMF_JP2_CODEC_JP2; | ||||
| } | } | ||||
| else if (custom_flags & JP2_J2K) { | else if (custom_flags & JP2_J2K) { | ||||
| im_format->jp2_codec = R_IMF_JP2_CODEC_J2K; | im_format->jp2_codec = R_IMF_JP2_CODEC_J2K; | ||||
| } | } | ||||
| else { | else { | ||||
| BLI_assert(!"Unsupported jp2 codec was specified in file type"); | BLI_assert_msg(0, "Unsupported jp2 codec was specified in file type"); | ||||
| } | } | ||||
| } | } | ||||
| #endif | #endif | ||||
| else { | else { | ||||
| im_format->imtype = R_IMF_IMTYPE_JPEG90; | im_format->imtype = R_IMF_IMTYPE_JPEG90; | ||||
| im_format->quality = quality; | im_format->quality = quality; | ||||
| } | } | ||||
| ▲ Show 20 Lines • Show All 1,051 Lines • ▼ Show 20 Lines | else if (imtype == R_IMF_IMTYPE_JP2) { | ||||
| if (imf->jp2_codec == R_IMF_JP2_CODEC_JP2) { | if (imf->jp2_codec == R_IMF_JP2_CODEC_JP2) { | ||||
| ibuf->foptions.flag |= JP2_JP2; | ibuf->foptions.flag |= JP2_JP2; | ||||
| } | } | ||||
| else if (imf->jp2_codec == R_IMF_JP2_CODEC_J2K) { | else if (imf->jp2_codec == R_IMF_JP2_CODEC_J2K) { | ||||
| ibuf->foptions.flag |= JP2_J2K; | ibuf->foptions.flag |= JP2_J2K; | ||||
| } | } | ||||
| else { | else { | ||||
| BLI_assert(!"Unsupported jp2 codec was specified in im_format->jp2_codec"); | BLI_assert_msg(0, "Unsupported jp2 codec was specified in im_format->jp2_codec"); | ||||
| } | } | ||||
| } | } | ||||
| #endif | #endif | ||||
| else { | else { | ||||
| /* R_IMF_IMTYPE_JPEG90, etc. default we save jpegs */ | /* R_IMF_IMTYPE_JPEG90, etc. default we save jpegs */ | ||||
| if (quality < 10) { | if (quality < 10) { | ||||
| quality = 90; | quality = 90; | ||||
| } | } | ||||
| ▲ Show 20 Lines • Show All 2,987 Lines • Show Last 20 Lines | |||||