From 3de2969ec547d8f9c19138231feb6bcb009e6158 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sat, 23 Apr 2011 19:41:51 -0400 Subject: [PATCH] Improved unkwnown format detection in the graphicsmagick backend --- apps/converter/backends/graphicsmagick.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/converter/backends/graphicsmagick.py b/apps/converter/backends/graphicsmagick.py index 128c337296..dbcf549810 100644 --- a/apps/converter/backends/graphicsmagick.py +++ b/apps/converter/backends/graphicsmagick.py @@ -6,7 +6,7 @@ from converter.api import QUALITY_DEFAULT, QUALITY_SETTINGS from converter.exceptions import ConvertError, UnknownFormat, IdentifyError CONVERTER_ERROR_STRING_NO_DECODER = u'No decode delegate for this image format' - +CONVERTER_ERROR_STARTS_WITH = u'starts with' def execute_identify(input_filepath, arguments=u''): command = [] @@ -36,7 +36,7 @@ def execute_convert(input_filepath, output_filepath, quality=QUALITY_DEFAULT, ar if return_code != 0: #Got an error from convert program error_line = proc.stderr.readline() - if CONVERTER_ERROR_STRING_NO_DECODER in error_line: + if (CONVERTER_ERROR_STRING_NO_DECODER in error_line) or (CONVERTER_ERROR_STARTS_WITH in error_line): #Try to determine from error message which class of error is it raise UnknownFormat else: