Changeset 831 for OpenPNE/branches/2_4/public_html/img.php

Timestamp:

Nov 22, 2006, 4:26:10 PM (17 years ago)

Author:

takanashi

Message:

ImageMagickが特定JPG(PNG)画像でSegFaultする問題のアプリ側対処

File:

• OpenPNE/branches/2_4/public_html/img.php (modified) (1 diff)

OpenPNE/branches/2_4/public_html/img.php

@@ -36 +36 @@
 );
 
-if (defined('USE_IMAGEMAGICK') && USE_IMAGEMAGICK) {
+if (defined('USE_IMAGEMAGICK')) {
+    switch (USE_IMAGEMAGICK) {
+        case 0:
+        $use_IM = false;
+        break;
+        case 1:
+        $pieces = explode('.', $_GET['filename']);
+        $source_format = OpenPNE_Img::check_format(array_pop($pieces));
+        $use_IM = ($source_format == 'gif');
+        break;
+        case 2:
+        $use_IM = true;
+        break;
+        default:
+        exit;
+    }
+} else {
+        $use_IM = false;
+}
+
+if ($use_IM) {
     require_once 'OpenPNE/Img/ImageMagick.php';
     $img =& new OpenPNE_Img_ImageMagick($options);