Changeset 22817 for trunk/wp-includes/class-wp-image-editor-gd.php

Timestamp:

11/22/2012 09:52:16 AM (11 years ago)

Author:

nacin

Message:

WP_Image_Editor: the last stand.

• Have wp_get_image_editor() rather than WP_Image_Editor::get_instance(). Having static factory methods would be less confusing if there weren't also static methods tied to individual editor implementations.
• Lazy-load the WP_Image_Editor base class and editor implementations.
• Have WP_Image_Editor_GD::supports_mime_type() actually check which types it supports.
• Deprecate gd_edit_image_support() in favor of wp_image_editor_supports().

props DH-Shredder, scribu, markoheijnen. fixes #22356. see #6821.

File:

• trunk/wp-includes/class-wp-image-editor-gd.php (modified) (6 diffs)

trunk/wp-includes/class-wp-image-editor-gd.php

@@ -16 +16 @@
  */
 class WP_Image_Editor_GD extends WP_Image_Editor {
+
     protected $image = false; // GD Resource
 
@@ -33 +34 @@
      * @return boolean
      */
-    public static function test( $args = null ) {
+    public static function test( $args = array() ) {
         if ( ! extension_loaded('gd') || ! function_exists('gd_info') )
             return false;
@@ -41 +42 @@
 
     /**
+     * Checks to see if editor supports the mime-type specified.
+     *
+     * @since 3.5.0
+     * @access public
+     *
+     * @param string $mime_type
+     * @return boolean
+     */
+    public static function supports_mime_type( $mime_type ) {
+        $image_types = imagetypes();
+        switch( $mime_type ) {
+            case 'image/jpeg':
+                return ($image_types & IMG_JPG) != 0;
+            case 'image/png':
+                return ($image_types & IMG_PNG) != 0;
+            case 'image/gif':
+                return ($image_types & IMG_GIF) != 0;
+        }
+
+        return false;
+    }
+
+    /**
      * Loads image from $this->file into new GD Resource.
      *
@@ -48 +72 @@
      * @return boolean|\WP_Error
      */
-    protected function load() {
+    public function load() {
         if ( $this->image )
             return true;
@@ -89 +113 @@
 
         return parent::update_size( $width, $height );
-    }
-
-    /**
-     * Checks to see if editor supports the mime-type specified.
-     *
-     * @since 3.5.0
-     * @access public
-     *
-     * @param string $mime_type
-     * @return boolean
-     */
-    public static function supports_mime_type( $mime_type ) {
-        $allowed_mime_types = array( 'image/gif', 'image/png', 'image/jpeg' );
-
-        return in_array( $mime_type, $allowed_mime_types );
     }
 
@@ -262 +271 @@
      * @access public
      *
-     * @param boolean $horz Horizonal Flip
+     * @param boolean $horz Horizontal Flip
      * @param boolean $vert Vertical Flip
      * @returns boolean|WP_Error