Added method to get the type of an image

diff --git a/wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php b/wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php
index db1da9c5bebbff1281f5142e30e90c94f3deffd7..c3e0c8c280730bb868dd25ffe27972adb9a518ba 100644 (file)
--- a/wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php
+++ b/wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php
@@ -254,6 +254,13 @@ class GDImageAdapter implements IImageAdapter {
                return $this->height;
        }
        
+       /**
+        * @see \wcf\system\image\adapter\IImageAdapter::getType()
+        */
+       public function getType() {
+               return $this->type;
+       }
+       
        /**
         * @see \wcf\system\image\adapter\IImageAdapter::getImage()
         */

diff --git a/wcfsetup/install/files/lib/system/image/adapter/IImageAdapter.class.php b/wcfsetup/install/files/lib/system/image/adapter/IImageAdapter.class.php
index fb8baacd5ba2e6aa810d968dbc27c81b00a1a707..437f1fc57a01ebf2e2ad01f096370aec7c21aeb4 100644 (file)
--- a/wcfsetup/install/files/lib/system/image/adapter/IImageAdapter.class.php
+++ b/wcfsetup/install/files/lib/system/image/adapter/IImageAdapter.class.php
@@ -146,10 +146,18 @@ interface IImageAdapter {
         */
        public function getHeight();
        
+       /**
+        * Returns the image type (GD only)
+        * 
+        * @return      integer
+        */
+       public function getType();
+       
        /**
         * Rotates an image the specified number of degrees.
         * 
         * @param       float           $degrees        number of degrees to rotate the image clockwise
+        * @return      mixed
         */
        public function rotate($degrees);
        

diff --git a/wcfsetup/install/files/lib/system/image/adapter/ImageAdapter.class.php b/wcfsetup/install/files/lib/system/image/adapter/ImageAdapter.class.php
index 76e7a820d70944d1c8ed22e652988a3bef79363c..cbb85d5cec31b6da3a87e706f774e9a92d7fcc7f 100644 (file)
--- a/wcfsetup/install/files/lib/system/image/adapter/ImageAdapter.class.php
+++ b/wcfsetup/install/files/lib/system/image/adapter/ImageAdapter.class.php
@@ -174,6 +174,13 @@ class ImageAdapter implements IImageAdapter {
                return $this->adapter->getHeight();
        }
        
+       /**
+        * @see \wcf\system\image\adapter\IImageAdapter::getType()
+        */
+       public function getType() {
+               return $this->adapter->getType();
+       }
+       
        /**
         * @see \wcf\system\image\adapter\IImageAdapter::rotate()
         */

diff --git a/wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php b/wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php
index 1b9047ce45910d93adc6e601200b1993a26903fc..bc42ec8623040223989d8274742d7d41babbc06d 100644 (file)
--- a/wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php
+++ b/wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php
@@ -194,6 +194,13 @@ class ImagickImageAdapter implements IImageAdapter {
                return $this->width;
        }
        
+       /**
+        * @see \wcf\system\image\adapter\IImageAdapter::getType()
+        */
+       public function getType() {
+               return 0;
+       }
+       
        /**
         * @see \wcf\system\image\adapter\IImageAdapter::rotate()
         */