Mercurial > hg > mgallery
comparison mgtool.php @ 262:3c9ce1ad3c45
Fix gmagick/imagick checking.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Sun, 16 Dec 2018 16:53:48 +0200 |
parents | 32c13f594e39 |
children | 745af791367d |
comparison
equal
deleted
inserted
replaced
261:32c13f594e39 | 262:3c9ce1ad3c45 |
---|---|
50 // the intermediate size images and thumbnails. Uses the | 50 // the intermediate size images and thumbnails. Uses the |
51 // PHP ImageMagick or GraphicsMagick bindings. | 51 // PHP ImageMagick or GraphicsMagick bindings. |
52 // | 52 // |
53 function mgConvertImage($inFilename, $outFilename, $outDim, $outFormat, $outQuality, $thumb) | 53 function mgConvertImage($inFilename, $outFilename, $outDim, $outFormat, $outQuality, $thumb) |
54 { | 54 { |
55 if (extension_loaded("imagick") && extension_loaded("imagick")) | 55 if (extension_loaded("imagick") && extension_loaded("gmagick")) |
56 { | 56 { |
57 return mgError("WARNING! Both ImageMagick AND GraphicsMagick modules enabled in PHP! This will cause problems! Refusing to work.\n"); | 57 mgError("FATAL ERROR! Both ImageMagick AND GraphicsMagick modules enabled in PHP! This will cause problems! Refusing to work.\n"); |
58 exit(1); | |
58 } | 59 } |
59 | 60 |
60 if (extension_loaded("imagick")) | 61 if (extension_loaded("imagick")) |
61 { | 62 { |
62 // Create conversion entity | 63 // Create conversion entity |