matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed all obsolete QUALITY related literals

Browse Source
This commit is contained in:
Roberto Rosario
2011-07-21 03:43:15 -04:00
parent b4f5acc09a
commit 72a037fba2
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/converter/backends/graphicsmagick/base.py
+4 -4
View File
@@ -3,7 +3,6 @@ import re
from converter.conf.settings import GM_PATH from converter.conf.settings import GM_PATH
from converter.conf.settings import GM_SETTINGS from converter.conf.settings import GM_SETTINGS
from converter.literals import QUALITY_DEFAULT, QUALITY_SETTINGS
from converter.exceptions import ConvertError, UnknownFormat, \ from converter.exceptions import ConvertError, UnknownFormat, \
IdentifyError IdentifyError
from converter.backends import ConverterBase from converter.backends import ConverterBase
@@ -31,8 +30,10 @@ class ConverterClass(ConverterBase):
raise IdentifyError(proc.stderr.readline()) raise IdentifyError(proc.stderr.readline())
return proc.stdout.read() 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 = [] arguments = []
if transformations: if transformations:
for transformation in transformations: for transformation in transformations:
if transformation['transformation'] == TRANSFORMATION_RESIZE: if transformation['transformation'] == TRANSFORMATION_RESIZE:
@@ -51,7 +52,7 @@ class ConverterClass(ConverterBase):
arguments.append(u'-rotate') arguments.append(u'-rotate')
arguments.append(u'%s' % transformation['arguments']['degrees']) 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'-quality')
arguments.append(u'85') arguments.append(u'85')
@@ -64,7 +65,6 @@ class ConverterClass(ConverterBase):
command = [] command = []
command.append(unicode(GM_PATH)) command.append(unicode(GM_PATH))
command.append(u'convert') command.append(u'convert')
command.extend(unicode(QUALITY_SETTINGS[quality]).split())
command.extend(unicode(GM_SETTINGS).split()) command.extend(unicode(GM_SETTINGS).split())
command.append(unicode(input_arg)) command.append(unicode(input_arg))
if arguments: if arguments:
apps/converter/backends/imagemagick/base.py
+2 -4
View File
@@ -3,7 +3,6 @@ import re
from converter.conf.settings import IM_IDENTIFY_PATH from converter.conf.settings import IM_IDENTIFY_PATH
from converter.conf.settings import IM_CONVERT_PATH from converter.conf.settings import IM_CONVERT_PATH
from converter.literals import QUALITY_DEFAULT, QUALITY_SETTINGS
from converter.exceptions import ConvertError, UnknownFormat, \ from converter.exceptions import ConvertError, UnknownFormat, \
IdentifyError IdentifyError
from converter.backends import ConverterBase from converter.backends import ConverterBase
@@ -30,7 +29,7 @@ class ConverterClass(ConverterBase):
raise IdentifyError(proc.stderr.readline()) raise IdentifyError(proc.stderr.readline())
return proc.stdout.read() 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 = [] arguments = []
if transformations: if transformations:
for transformation in transformations: for transformation in transformations:
@@ -50,7 +49,7 @@ class ConverterClass(ConverterBase):
arguments.append(u'-rotate') arguments.append(u'-rotate')
arguments.append(u'%s' % transformation['arguments']['degrees']) 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'-quality')
arguments.append(u'85') arguments.append(u'85')
@@ -62,7 +61,6 @@ class ConverterClass(ConverterBase):
command = [] command = []
command.append(unicode(IM_CONVERT_PATH)) command.append(unicode(IM_CONVERT_PATH))
command.extend(unicode(QUALITY_SETTINGS[quality]).split())
command.append(unicode(input_arg)) command.append(unicode(input_arg))
if arguments: if arguments:
command.extend(arguments) command.extend(arguments)