| Index: trunk/phase3/includes/media/Bitmap.php |
| — | — | @@ -181,13 +181,13 @@ |
| 182 | 182 | $scaler = 'client'; |
| 183 | 183 | } elseif ( !$wgUseImageResize ) { |
| 184 | 184 | $scaler = 'client'; |
| 185 | | - }/* elseif ( $wgUseImageMagick ) { |
| | 185 | + } elseif ( $wgUseImageMagick ) { |
| 186 | 186 | $scaler = 'im'; |
| 187 | 187 | } elseif ( $wgCustomConvertCommand ) { |
| 188 | 188 | $scaler = 'custom'; |
| 189 | 189 | } elseif ( function_exists( 'imagecreatetruecolor' ) ) { |
| 190 | 190 | $scaler = 'gd'; |
| 191 | | - }*/ elseif ( class_exists( 'Imagick' ) ) { |
| | 191 | + } elseif ( class_exists( 'Imagick' ) ) { |
| 192 | 192 | $scaler = 'imext'; |
| 193 | 193 | } else { |
| 194 | 194 | $scaler = 'client'; |