Changeset 22817 for trunk/wp-includes/media.php

Timestamp:

11/22/2012 09:52:16 AM (12 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/media.php (modified) (3 diffs)

trunk/wp-includes/media.php

@@ -384 +384 @@
 function image_make_intermediate_size( $file, $width, $height, $crop = false ) {
     if ( $width || $height ) {
-        $editor = WP_Image_Editor::get_instance( $file );
+        $editor = wp_get_image_editor( $file );
 
         if ( is_wp_error( $editor ) || is_wp_error( $editor->resize( $width, $height, $crop ) ) )
@@ -905 +905 @@
 
 /**
- * Check if the installed version of GD supports particular image type
- *
- * @since 2.9.0
- *
- * @param string $mime_type
- * @return bool
- */
-function gd_edit_image_support($mime_type) {
-    if ( function_exists('imagetypes') ) {
-        switch( $mime_type ) {
-            case 'image/jpeg':
-                return (imagetypes() & IMG_JPG) != 0;
-            case 'image/png':
-                return (imagetypes() & IMG_PNG) != 0;
-            case 'image/gif':
-                return (imagetypes() & IMG_GIF) != 0;
-        }
-    } else {
-        switch( $mime_type ) {
-            case 'image/jpeg':
-                return function_exists('imagecreatefromjpeg');
-            case 'image/png':
-                return function_exists('imagecreatefrompng');
-            case 'image/gif':
-                return function_exists('imagecreatefromgif');
-        }
-    }
-    return false;
-}
-
-/**
  * Create new GD image resource with transparency support
  * @TODO: Deprecate if possible.
@@ -1169 +1138 @@
     $bytes   = apply_filters( 'upload_size_limit', min( $u_bytes, $p_bytes ), $u_bytes, $p_bytes );
     return $bytes;
+}
+
+/**
+ * Returns a WP_Image_Editor instance and loads file into it.
+ *
+ * @since 3.5.0
+ * @access public
+ *
+ * @param string $path Path to file to load
+ * @param array $args Additional data. Accepts { 'mime_type'=>string, 'methods'=>{string, string, ...} }
+ * @return WP_Image_Editor|WP_Error
+ */
+function wp_get_image_editor( $path, $args = array() ) {
+    $args['path'] = $path;
+
+    if ( ! isset( $args['mime_type'] ) ) {
+        $file_info  = wp_check_filetype( $args['path'] );
+
+        // If $file_info['type'] is false, then we let the editor attempt to
+        // figure out the file type, rather than forcing a failure based on extension.
+        if ( isset( $file_info ) && $file_info['type'] )
+            $args['mime_type'] = $file_info['type'];
+    }
+
+    $implementation = apply_filters( 'wp_image_editor_class', _wp_image_editor_choose( $args ) );
+
+    if ( $implementation ) {
+        $editor = new $implementation( $path );
+        $loaded = $editor->load();
+
+        if ( is_wp_error( $loaded ) )
+            return $loaded;
+
+        return $editor;
+    }
+
+    return new WP_Error( 'image_no_editor', __('No editor could be selected.') );
+}
+
+/**
+ * Tests whether there is an editor that supports a given mime type or methods.
+ *
+ * @since 3.5.0
+ * @access public
+ *
+ * @param string|array $args Array of requirements.  Accepts { 'mime_type'=>string, 'methods'=>{string, string, ...} }
+ * @return boolean true if an eligible editor is found; false otherwise
+ */
+function wp_image_editor_supports( $args = array() ) {
+    return (bool) _wp_image_editor_choose( $args );
+}
+
+/**
+ * Tests which editors are capable of supporting the request.
+ *
+ * @since 3.5.0
+ * @access private
+ *
+ * @param array $args Additional data. Accepts { 'mime_type'=>string, 'methods'=>{string, string, ...} }
+ * @return string|bool Class name for the first editor that claims to support the request. False if no editor claims to support the request.
+ */
+function _wp_image_editor_choose( $args = array() ) {
+    require_once ABSPATH . WPINC . '/class-wp-image-editor.php';
+    require_once ABSPATH . WPINC . '/class-wp-image-editor-gd.php';
+    require_once ABSPATH . WPINC . '/class-wp-image-editor-imagick.php';
+
+    $implementations = apply_filters( 'wp_image_editors',
+        array( 'WP_Image_Editor_Imagick', 'WP_Image_Editor_GD' ) );
+
+    foreach ( $implementations as $implementation ) {
+        if ( ! call_user_func( array( $implementation, 'test' ), $args ) )
+            continue;
+
+        if ( isset( $args['mime_type'] ) &&
+            ! call_user_func(
+                array( $implementation, 'supports_mime_type' ),
+                $args['mime_type'] ) ) {
+            continue;
+        }
+
+        if ( isset( $args['methods'] ) &&
+             array_diff( $args['methods'], get_class_methods( $implementation ) ) ) {
+            continue;
+        }
+
+        return $implementation;
+    }
+
+    return false;
 }