Merge pull request #620 from kojoty/pju-imagegd-fix

 #619: imagegd2 is no used as it is removed from latest libgd

Author: kojoty

okapi/services/caches/map/TileRenderer.php

@@ -15,7 +15,7 @@ class TileRenderer
      * Changing this will affect all generated hashes. You should increment it
      * whenever you alter anything in the drawing algorithm.
      */
-    private static $VERSION = 61;
+    private static $VERSION = 62;
 
     /**
      * Should be always true. You may temporarily set it to false, when you're
@@ -115,13 +115,13 @@ private static function get_image($name, $opacity=1, $brightness=0,
             try
             {
                 $cache_key = "tilesrc/".Okapi::getGitRevision()."/".self::$VERSION."/".$key;
-                $gd2_path = self::$USE_STATIC_IMAGE_CACHE
+                $img_path = self::$USE_STATIC_IMAGE_CACHE
                     ? FileCache::get_file_path($cache_key) : null;
-                if ($gd2_path === null)
+                if ($img_path === null)
                     throw new Exception("Not in cache");
                 # File cache hit. GD2 files are much faster to read than PNGs.
                 # This can throw an Exception (see bug#160).
-                $locmem_cache[$key] = imagecreatefromgd2($gd2_path);
+                $locmem_cache[$key] = imagecreatefrompng($img_path);
             }
             catch (Exception $e)
             {
@@ -132,7 +132,12 @@ private static function get_image($name, $opacity=1, $brightness=0,
                 # Apply all wanted effects.
 
                 if ($opacity != 1)
-                    self::change_opacity($locmem_cache[$key], $opacity);
+                {
+                    imagealphablending($locmem_cache[$key], false);
+                    imagesavealpha($locmem_cache[$key], true);
+                    imagefilter($locmem_cache[$key], IMG_FILTER_COLORIZE, 0,0,0,127*$opacity);
+                    imagealphablending($locmem_cache[$key], true);
+                }
                 if ($contrast != 0)
                     imagefilter($locmem_cache[$key], IMG_FILTER_CONTRAST, $contrast);
                 if ($brightness != 0)
@@ -146,37 +151,15 @@ private static function get_image($name, $opacity=1, $brightness=0,
                 # Cache the result.
 
                 ob_start();
-                imagegd2($locmem_cache[$key]);
-                $gd2 = ob_get_clean();
-                FileCache::set($cache_key, $gd2);
+                imagesavealpha($locmem_cache[$key], true);
+                imagepng($locmem_cache[$key]);
+                $png_img = ob_get_clean();
+                FileCache::set($cache_key, $png_img);
             }
         }
         return $locmem_cache[$key];
     }
 
-    /**
-     * Extremely slow! Remember to cache the result!
-     */
-    private static function change_opacity($im, $ratio)
-    {
-        imagealphablending($im, false);
-
-        $w = imagesx($im);
-        $h = imagesy($im);
-
-        for($x = 0; $x < $w; $x++)
-        {
-            for($y = 0; $y < $h; $y++)
-            {
-                $color = imagecolorat($im, $x, $y);
-                $new_color = ((max(0, floor(127 - ((127 - (($color >> 24) & 0x7f)) * $ratio))) & 0x7f) << 24) | ($color & 0x80ffffff);
-                imagesetpixel($im, $x, $y, $new_color);
-            }
-        }
-
-        imagealphablending($im, true);
-    }
-
     private function draw_cache(&$cache_struct)
     {
         $capt = ($cache_struct[6] & TileTree::$FLAG_DRAW_CAPTION);
@@ -345,8 +328,8 @@ private function get_caption($cache_id, $name_crc)
         # Check cache.
 
         $cache_key = "tilecaption/".self::$VERSION."/".$cache_id."/".$name_crc;
-        $gd2 = self::$USE_CAPTIONS_CACHE ? Cache::get($cache_key) : null;
-        if ($gd2 === null)
+        $caption_png = self::$USE_CAPTIONS_CACHE ? Cache::get($cache_key) : null;
+        if ($caption_png === null)
         {
             # We'll work with 16x bigger image to get smoother interpolation.
 
@@ -419,12 +402,13 @@ private function get_caption($cache_id, $name_crc)
             # Cache it!
 
             ob_start();
-            imagegd2($small);
-            $gd2 = ob_get_clean();
-            Cache::set_scored($cache_key, $gd2);
+            imagesavealpha($small, true);
+            imagepng($small);
+            $caption_png = ob_get_clean();
+            Cache::set_scored($cache_key, $caption_png);
         }
 
-        return imagecreatefromstring($gd2);
+        return imagecreatefromstring($caption_png);
     }
 
     private function draw_cache_medium(&$cache_struct)
@@ -564,8 +548,7 @@ private function draw_cache_tiny(&$cache_struct)
 
         if (($status != 1) && ($count == 1))
         {
-            $icon = self::get_image(($status == 2) ? "status_unavailable"
-                : "status_archived");
+            $icon = self::get_image(($status == 2) ? "status_unavailable" : "status_archived");
             imagecopy($this->im, $icon, $px - ($center_x - $markercenter_x) - 6,
                 $py - ($center_y - $markercenter_y) - 8, 0, 0, 16, 16);
         }