Include error code in error message when convert fails

This info is logged, but it makes it much easier to debug
things if the info is right there.

Change-Id: I3a331a19a13a932c6b7aefdd9885ad351f3f48e3

diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index 13849f4..d93168f 100644 (file)
--- a/includes/media/Bitmap.php
+++ b/includes/media/Bitmap.php
@@ -382,7 +382,7 @@ class BitmapHandler extends ImageHandler {
                if ( $retval !== 0 ) {
                        $this->logErrorForExternalProcess( $retval, $err, $cmd );
 
-                       return $this->getMediaTransformError( $params, $err );
+                       return $this->getMediaTransformError( $params, "$err\nError code: $retval" );
                }
 
                return false; # No error