Changeset 22817 for trunk/wp-includes/class-wp-image-editor-imagick.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-imagick.php (modified) (6 diffs)

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

@@ -16 +16 @@
  */
 class WP_Image_Editor_Imagick extends WP_Image_Editor {
+
     protected $image = null; // Imagick Object
 
@@ -37 +38 @@
      * @return boolean
      */
-    public static function test( $args = null ) {
+    public static function test( $args = array() ) {
         if ( ! extension_loaded( 'imagick' ) || ! is_callable( 'Imagick', 'queryFormats' ) )
             return false;
@@ -45 +46 @@
 
     /**
+     * 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 ) {
+        $imagick_extension = strtoupper( self::get_extension( $mime_type ) );
+
+        if ( ! $imagick_extension )
+            return false;
+
+        try {
+            return ( (bool) Imagick::queryFormats( $imagick_extension ) );
+        }
+        catch ( Exception $e ) {
+            return false;
+        }
+    }
+
+    /**
      * Loads image from $this->file into new Imagick Object.
      *
@@ -52 +76 @@
      * @return boolean|WP_Error True if loaded; WP_Error on failure.
      */
-    protected function load() {
+    public function load() {
         if ( $this->image )
             return true;
@@ -136 +160 @@
 
         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 ) {
-        if ( ! $mime_type )
-            return false;
-
-        $imagick_extension = strtoupper( self::get_extension( $mime_type ) );
-
-        try {
-            return ( (bool) Imagick::queryFormats( $imagick_extension ) );
-        }
-        catch ( Exception $e ) {
-            return false;
-        }
     }
 
@@ -313 +314 @@
      * @access public
      *
-     * @param boolean $horz Horizonal Flip
+     * @param boolean $horz Horizontal Flip
      * @param boolean $vert Vertical Flip
      * @returns boolean|WP_Error