Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[15621] trunk/lib/images

[Filipus K. <ch...@gm...>]

Hi Nyloth,

> Revision: 15621
>           http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=15621&view=rev
> Author:   nyloth
> Date:     2008-11-12 10:35:52 +0000 (Wed, 12 Nov 2008)
>
> Log Message:
> -----------
> [ENH] filegals: optimize thumbnails generation by using EXIF thumbnail if
> available (thanx sept_7).
>
> Modified Paths:
> --------------
>     trunk/lib/images/abstract.php
>     trunk/lib/images/gd.php
>     trunk/lib/images/imagick_new.php
>     trunk/lib/images/imagick_old.php
>
> Modified: trunk/lib/images/abstract.php
> ===================================================================
> --- trunk/lib/images/abstract.php	2008-11-12 07:35:56 UTC (rev 15620)
> +++ trunk/lib/images/abstract.php	2008-11-12 10:35:52 UTC (rev 15621)
> @@ -7,11 +7,21 @@
>    var $width = NULL;
>    var $classname = 'ImageAbstract';
>    var $thumb_max_size = 120;
> +  var $filename = null;
> +  var $thumb = null;
>
>    function __construct($image, $isfile = false) {
>      if ( ! empty($image) ) {
> +      if ( $this->filename !== null && function_exists('exif_thumbnail') )
> { +        $this->thumb = exif_thumbnail($this->filename, $this->width,
> $this->height); +      }
exif_thumbnail() triggers a PHP warning when run on a file neither JPEG nor TIFF. For example, a PNG with IMG plugin. Could you fix that? There are functions allowing to check image type, like http://www.php.net/manual/en/function.image-type-to-mime-type.php
>        $this->classname = get_class($this);
> -      $this->data = $isfile ? $this->get_from_file($image) : $image;
> +      if ( $isfile ) {
> +        $this->data = $this->get_from_file($image);
> +        $this->filename = $image;
> +      } else {
> +        $this->data = $image;
> +      }
>      }
>    }