From 72a037fba2db14f2c4d6ca274687f7293abbca6b Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 21 Jul 2011 03:43:15 -0400 Subject: [PATCH] Removed all obsolete QUALITY related literals --- apps/converter/backends/graphicsmagick/base.py | 8 ++++---- apps/converter/backends/imagemagick/base.py | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/apps/converter/backends/graphicsmagick/base.py b/apps/converter/backends/graphicsmagick/base.py index 54ebbaaa95..1d70108a94 100644 --- a/apps/converter/backends/graphicsmagick/base.py +++ b/apps/converter/backends/graphicsmagick/base.py @@ -3,7 +3,6 @@ import re from converter.conf.settings import GM_PATH from converter.conf.settings import GM_SETTINGS -from converter.literals import QUALITY_DEFAULT, QUALITY_SETTINGS from converter.exceptions import ConvertError, UnknownFormat, \ IdentifyError from converter.backends import ConverterBase @@ -31,8 +30,10 @@ class ConverterClass(ConverterBase): raise IdentifyError(proc.stderr.readline()) return proc.stdout.read() - def convert_file(self, input_filepath, output_filepath, transformations=None, quality=QUALITY_DEFAULT, page=DEFAULT_PAGE_NUMBER, file_format=DEFAULT_FILE_FORMAT): + def convert_file(self, input_filepath, output_filepath, transformations=None, page=DEFAULT_PAGE_NUMBER, file_format=DEFAULT_FILE_FORMAT): arguments = [] + + if transformations: for transformation in transformations: if transformation['transformation'] == TRANSFORMATION_RESIZE: @@ -51,7 +52,7 @@ class ConverterClass(ConverterBase): arguments.append(u'-rotate') arguments.append(u'%s' % transformation['arguments']['degrees']) - if format == u'jpeg': + if file_format.lower() == u'jpeg' or file_format.lower() == u'jpg': arguments.append(u'-quality') arguments.append(u'85') @@ -64,7 +65,6 @@ class ConverterClass(ConverterBase): command = [] command.append(unicode(GM_PATH)) command.append(u'convert') - command.extend(unicode(QUALITY_SETTINGS[quality]).split()) command.extend(unicode(GM_SETTINGS).split()) command.append(unicode(input_arg)) if arguments: diff --git a/apps/converter/backends/imagemagick/base.py b/apps/converter/backends/imagemagick/base.py index 4f924316ed..977da783c2 100644 --- a/apps/converter/backends/imagemagick/base.py +++ b/apps/converter/backends/imagemagick/base.py @@ -3,7 +3,6 @@ import re from converter.conf.settings import IM_IDENTIFY_PATH from converter.conf.settings import IM_CONVERT_PATH -from converter.literals import QUALITY_DEFAULT, QUALITY_SETTINGS from converter.exceptions import ConvertError, UnknownFormat, \ IdentifyError from converter.backends import ConverterBase @@ -30,7 +29,7 @@ class ConverterClass(ConverterBase): raise IdentifyError(proc.stderr.readline()) return proc.stdout.read() - def convert_file(self, input_filepath, output_filepath, transformations=None, quality=QUALITY_DEFAULT, page=DEFAULT_PAGE_NUMBER, file_format=DEFAULT_FILE_FORMAT): + def convert_file(self, input_filepath, output_filepath, transformations=None, page=DEFAULT_PAGE_NUMBER, file_format=DEFAULT_FILE_FORMAT): arguments = [] if transformations: for transformation in transformations: @@ -50,7 +49,7 @@ class ConverterClass(ConverterBase): arguments.append(u'-rotate') arguments.append(u'%s' % transformation['arguments']['degrees']) - if format == u'jpeg': + if file_format.lower() == u'jpeg' or file_format.lower() == u'jpg': arguments.append(u'-quality') arguments.append(u'85') @@ -62,7 +61,6 @@ class ConverterClass(ConverterBase): command = [] command.append(unicode(IM_CONVERT_PATH)) - command.extend(unicode(QUALITY_SETTINGS[quality]).split()) command.append(unicode(input_arg)) if arguments: command.extend(arguments)