Changeset 7291 for extensions/gvideo/admin/thumbnails.php

Timestamp:

Oct 20, 2010, 10:45:14 AM (14 years ago)

Author:

plg

Message:

feature 1942 added: support PNG files for creating thumbnails

GD version 2 becomes mandatory

File:

• extensions/gvideo/admin/thumbnails.php (modified) (2 diffs)

extensions/gvideo/admin/thumbnails.php

@@ -47 +47 @@
     }
 
-    $ver_info = gd_info();
-    preg_match('/\d/', $ver_info['GD Version'], $gd_ver);
+    $tempfile = $url;
+    if (url_is_remote($url))
+    {
+      $tempfile = tempnam($path, 'jpg');
+      fetchRemote($url, $tempfile_content);
+      file_put_contents($tempfile, $tempfile_content);
+    }
 
-    if (!($tempfile = @tempnam( $path, 'jpg')
-      and $handle = @fopen($tempfile, 'wb')
-      and fetchRemote($url, $handle)
-      and @fclose($handle)
-      and $srcImage = @imagecreatefromjpeg($tempfile)))
+    list($width, $height, $type) = getimagesize($tempfile);
+    if (IMAGETYPE_PNG == $type)
     {
-      return false;
+      $srcImage = imagecreatefrompng($tempfile);
     }
-    @unlink($tempfile);
+    else
+    {
+      $srcImage = imagecreatefromjpeg($tempfile);
+    }
+    
+    unlink($tempfile);
 
     if (isset($_POST['add_band']))
@@ -89 +96 @@
     }
 
-    if ($gd_ver[0] >= 2)
+    $destImage = imagecreatetruecolor($destWidth, $destHigh);
+    
+    imagecopyresampled(
+      $destImage,
+      $srcImage,
+      0,
+      0,
+      0,
+      0,
+      $destWidth,
+      $destHigh,
+      $srcWidth,
+      $srcHeight
+      );
+
+    if (IMAGETYPE_PNG == $type)
     {
-        $destImage = imagecreatetruecolor($destWidth, $destHigh);
-        imagecopyresampled($destImage, $srcImage, 0, 0, 0, 0,
-            $destWidth, $destHigh, $srcWidth, $srcHeight);
+      imagepng($destImage, $path);
     }
     else
     {
-        $destImage = imagecreate($destWidth, $destHigh);
-        imagecopyresized($destImage, $srcImage, 0, 0, 0, 0,
-            $destWidth, $destHigh, $srcWidth, $srcHeight);
+      imagejpeg($destImage, $path, 95);
     }
-
-    imagejpeg($destImage, $path);
+    
     imagedestroy($srcImage);
     imagedestroy($destImage);