Skip to content

BK-2451 Improve default parameters for color_space_conversion method #856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ride90 merged 1 commit into from
Mar 22, 2018
Merged

BK-2451 Improve default parameters for color_space_conversion method #856

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions lib/booktype/convert/image_editor_conversion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,10 @@ def convert(self, html):
self._edit_image(img_element)

if not hasattr(settings, 'COLOR_SPACE_CONVERTER'):
logger.warning(
'`COLOR_SPACE_CONVERTER` value is not specified in settings file. \
Color space convertion will not run.')
warn_msg = [
'`COLOR_SPACE_CONVERTER` value is not specified in settings file.',
'Color space conversion not running.']
logger.warn(" ".join(warn_msg))

if getattr(settings, 'COLOR_SPACE_CONVERTER', False):
self._color_space_convert(img_element)
Expand Down Expand Up @@ -384,9 +385,16 @@ def _edit_image(self, elem):
# change image src in html
elem.set("src", dst)

def _color_space_convert(self, elem,
rgb_icc_profile_path=settings.CMYK2RGB_CONVERTER_RGB_PROFILE_PATH,
cmyk_icc_profile_path=settings.CMYK2RGB_CONVERTER_CMYK_PROFILE_PATH):
def _color_space_convert(self, elem, rgb_icc_profile_path=None, cmyk_icc_profile_path=None):

if rgb_icc_profile_path is None or cmyk_icc_profile_path is None:
try:
rgb_icc_profile_path = settings.CMYK2RGB_CONVERTER_RGB_PROFILE_PATH
cmyk_icc_profile_path = settings.CMYK2RGB_CONVERTER_CMYK_PROFILE_PATH
except AttributeError as err:
logger.warning("Color space conversion not running. Details: %s" % err)
return

src = elem.get('src')
image_mode = None
cmd = None
Expand Down