Attachment 5911 Details for Bug 15266 – hplip-pstotiff-is-rubbish.patch

[patch] hplip-pstotiff-is-rubbish.patch

hplip-pstotiff-is-rubbish.patch (text/plain), 1.74 KB, created by Vincent D on 2015-02-13 22:20:34 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Vincent D

Created: 2015-02-13 22:20:34 CET

Size: 1.74 KB

patch

obsolete

>diff -up hplip-3.15.2/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.15.2/fax/filters/pstotiff
>--- hplip-3.15.2/fax/filters/pstotiff.pstotiff-is-rubbish	2015-01-29 13:20:35.000000000 +0200
>+++ hplip-3.15.2/fax/filters/pstotiff	2015-02-11 14:29:29.581107244 +0200
>@@ -1,45 +1,16 @@
>-#!/usr/bin/env python
>-
>-import os
>-import os.path
>-import time 
>-import sys
>-import tempfile
>-
>-PY3 = sys.version_info[0] == 3
>-
>-READ_SIZE = 8192
>-
>-total_bytes_read = 0
>-temp_in_file = "-"
>-
>-if (len(sys.argv) > 6):
>-   temp_in_file = sys.argv[6] 
>-
>-temp_out_handle, temp_out_fname = tempfile.mkstemp()
>-
>-font = "-I/usr/share/cups/fonts"
>-device = "-sDEVICE=tiffg4 -dMaxStripSize=0 -r204x196 -dNOPAUSE -dBATCH -dSAFER -dPARANOIDSAFER -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT -sstdout=%stderr -sOutputFile=" + temp_out_fname + " " + temp_in_file
>-
>-gs_command = "/usr/bin/gs" + " " + font + " " + device
>-
>-exit_code = os.system(gs_command)
>-
>-file_len = os.stat(temp_out_fname).st_size
>-if (file_len < READ_SIZE):
>-    READ_SIZE = file_len
>-
>-os.close(temp_out_handle)
>-
>-out_handle = open(temp_out_fname, mode='rb')
>-while (total_bytes_read < file_len):
>-      data = out_handle.read(READ_SIZE)
>-      if PY3:
>-          sys.stdout.buffer.write(data)
>-      else:
>-          sys.stdout.write(data)
>-      total_bytes_read += READ_SIZE
>-out_handle.close()
>-
>-os.remove(temp_out_fname)
>-sys.exit(0)
>+#!/bin/sh
>+if [ $# -lt 6 ]; then
>+  IN=-_
>+else
>+  IN="$6"
>+fi
>+
>+TMPFILE=`mktemp /tmp/pstotiff.XXXXXX` || exit 1
>+gs -I/usr/share/cups/fonts -sDEVICE=tiffg4 -dMaxStripSize=0 -r204x196 \
>+    -dNOPAUSE -dBATCH -dSAFER -dPARANOIDSAFER \
>+   -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT \
>+   -sstdout=%stderr -sOutputFile="$TMPFILE" "$IN"
>+RET=$?
>+cat "$TMPFILE"
>+rm -f "$TMPFILE"
>+exit $RET

diff -up hplip-3.15.2/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.15.2/fax/filters/pstotiff
--- hplip-3.15.2/fax/filters/pstotiff.pstotiff-is-rubbish	2015-01-29 13:20:35.000000000 +0200
+++ hplip-3.15.2/fax/filters/pstotiff	2015-02-11 14:29:29.581107244 +0200
@@ -1,45 +1,16 @@
-#!/usr/bin/env python
-
-import os
-import os.path
-import time 
-import sys
-import tempfile
-
-PY3 = sys.version_info[0] == 3
-
-READ_SIZE = 8192
-
-total_bytes_read = 0
-temp_in_file = "-"
-
-if (len(sys.argv) > 6):
-   temp_in_file = sys.argv[6] 
-
-temp_out_handle, temp_out_fname = tempfile.mkstemp()
-
-font = "-I/usr/share/cups/fonts"
-device = "-sDEVICE=tiffg4 -dMaxStripSize=0 -r204x196 -dNOPAUSE -dBATCH -dSAFER -dPARANOIDSAFER -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT -sstdout=%stderr -sOutputFile=" + temp_out_fname + " " + temp_in_file
-
-gs_command = "/usr/bin/gs" + " " + font + " " + device
-
-exit_code = os.system(gs_command)
-
-file_len = os.stat(temp_out_fname).st_size
-if (file_len < READ_SIZE):
-    READ_SIZE = file_len
-
-os.close(temp_out_handle)
-
-out_handle = open(temp_out_fname, mode='rb')
-while (total_bytes_read < file_len):
-      data = out_handle.read(READ_SIZE)
-      if PY3:
-          sys.stdout.buffer.write(data)
-      else:
-          sys.stdout.write(data)
-      total_bytes_read += READ_SIZE
-out_handle.close()
-
-os.remove(temp_out_fname)
-sys.exit(0)
+#!/bin/sh
+if [ $# -lt 6 ]; then
+  IN=-_
+else
+  IN="$6"
+fi
+
+TMPFILE=`mktemp /tmp/pstotiff.XXXXXX` || exit 1
+gs -I/usr/share/cups/fonts -sDEVICE=tiffg4 -dMaxStripSize=0 -r204x196 \
+    -dNOPAUSE -dBATCH -dSAFER -dPARANOIDSAFER \
+   -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT \
+   -sstdout=%stderr -sOutputFile="$TMPFILE" "$IN"
+RET=$?
+cat "$TMPFILE"
+rm -f "$TMPFILE"
+exit $RET

Actions: View | Diff

Attachments on bug 15266: 5909 | 5910 | 5911 | 5912 | 6704 | 6705 | 6895 | 6896 | 6897