Changeset 22094

Timestamp:

10/01/2012 08:59:06 PM (14 years ago)

Author:

ryan

Message:

Introduce WP_Image_Editor, WP_Image_Editor_Imagick, and WP_Image_Editor_GD. Abstracts image editing API and adds support for ImageMagick.

Props DH-Shredder, kurtpayne, markoheijnen
see #6821

Location:

trunk

Files:

• wp-admin/includes/image-edit.php (modified) (13 diffs)
• wp-admin/includes/image.php (modified) (3 diffs)
• wp-includes/class-wp-image-editor-gd.php (added)
• wp-includes/class-wp-image-editor-imagick.php (added)
• wp-includes/class-wp-image-editor.php (added)
• wp-includes/deprecated.php (modified) (1 diff)
• wp-includes/functions.php (modified) (2 diffs)
• wp-includes/media.php (modified) (4 diffs)
• wp-settings.php (modified) (1 diff)

trunk/wp-admin/includes/image-edit.php

@@ -198 +198 @@
 }
 
-function wp_stream_image($image, $mime_type, $post_id) {
-        $image = apply_filters('image_save_pre', $image, $post_id);
-
-        switch ( $mime_type ) {
-                case 'image/jpeg':
-                        header('Content-Type: image/jpeg');
-                        return imagejpeg($image, null, 90);
-                case 'image/png':
-                        header('Content-Type: image/png');
-                        return imagepng($image);
-                case 'image/gif':
-                        header('Content-Type: image/gif');
-                        return imagegif($image);
-                default:
+/**
+ * Streams image in WP_Image_Editor to browser.
+ * Provided for backcompat reasons
+ *
+ * @param WP_Image_Editor $image
+ * @param string $mime_type
+ * @param int $post_id
+ * @return boolean
+ */
+function wp_stream_image( $image, $mime_type, $post_id ) {
+        if ( $image instanceof WP_Image_Editor ) {
+                $image = apply_filters('image_editor_save_pre', $image, $post_id);
+
+                if ( is_wp_error( $image->stream( $mime_type ) ) )
                         return false;
-        }
-}
-
-function wp_save_image_file($filename, $image, $mime_type, $post_id) {
-        $image = apply_filters('image_save_pre', $image, $post_id);
-        $saved = apply_filters('wp_save_image_file', null, $filename, $image, $mime_type, $post_id);
-        if ( null !== $saved )
-                return $saved;
-
-        switch ( $mime_type ) {
-                case 'image/jpeg':
-                        return imagejpeg( $image, $filename, apply_filters( 'jpeg_quality', 90, 'edit_image' ) );
-                case 'image/png':
-                        return imagepng($image, $filename);
-                case 'image/gif':
-                        return imagegif($image, $filename);
-                default:
-                        return false;
+
+                return true;
+        } else {
+                _deprecated_argument( __FUNCTION__, '3.5', __( '$image needs to be an WP_Image_Editor object' ) );
+
+                $image = apply_filters('image_save_pre', $image, $post_id);
+
+                switch ( $mime_type ) {
+                        case 'image/jpeg':
+                                header( 'Content-Type: image/jpeg' );
+                                return imagejpeg( $image, null, 90 );
+                        case 'image/png':
+                                header( 'Content-Type: image/png' );
+                                return imagepng( $image );
+                        case 'image/gif':
+                                header( 'Content-Type: image/gif' );
+                                return imagegif( $image );
+                        default:
+                                return false;
+                }
+        }
+}
+
+/**
+ * Saves Image to File
+ * @TODO: Add mime_type support to WP_Image_Editor
+ *
+ * @param string $filename
+ * @param WP_Image_Editor $image
+ * @param string $mime_type
+ * @param int $post_id
+ * @return boolean
+ */
+function wp_save_image_file( $filename, $image, $mime_type, $post_id ) {
+        if ( $image instanceof WP_Image_Editor ) {
+                $image = apply_filters('image_editor_save_pre', $image, $post_id);
+                $saved = apply_filters('wp_save_image_editor_file', null, $filename, $image, $mime_type, $post_id);
+
+                if ( null !== $saved )
+                        return $saved;
+
+                return $image->save( $filename, $mime_type );
+        } else {
+                _deprecated_argument( __FUNCTION__, '3.5', __( '$image needs to be an WP_Image_Editor object' ) );
+
+                $image = apply_filters('image_save_pre', $image, $post_id);
+                $saved = apply_filters('wp_save_image_file', null, $filename, $image, $mime_type, $post_id);
+
+                if ( null !== $saved )
+                        return $saved;
+
+                switch ( $mime_type ) {
+                        case 'image/jpeg':
+                                return imagejpeg( $image, $filename, apply_filters( 'jpeg_quality', 90, 'edit_image' ) );
+                        case 'image/png':
+                                return imagepng( $image, $filename );
+                        case 'image/gif':
+                                return imagegif( $image, $filename );
+                        default:
+                                return false;
+                }
         }
 }
@@ -239 +282 @@
 }
 
+// @TODO: Returns GD resource, but is NOT public
 function _rotate_image_resource($img, $angle) {
+        _deprecated_function( __FUNCTION__, '3.5', __( 'Use WP_Image_Editor::rotate' ) );
         if ( function_exists('imagerotate') ) {
                 $rotated = imagerotate($img, $angle, 0);
@@ -250 +295 @@
 }
 
+/**
+ * @TODO: Only used within image_edit_apply_changes
+ *                and receives/returns GD Resource.
+ *                Consider removal.
+ *
+ * @param GD_Resource $img
+ * @param boolean $horz
+ * @param boolean $vert
+ * @return GD_Resource
+ */
 function _flip_image_resource($img, $horz, $vert) {
+        _deprecated_function( __FUNCTION__, '3.5', __( 'Use WP_Image_Editor::flip' ) );
         $w = imagesx($img);
         $h = imagesy($img);
@@ -268 +324 @@
 }
 
+/**
+ * @TODO: Only used within image_edit_apply_changes
+ *                and receives/returns GD Resource.
+ *                Consider removal.
+ *
+ * @param GD_Resource $img
+ * @param float $x
+ * @param float $y
+ * @param float $w
+ * @param float $h
+ * @return GD_Resource
+ */
 function _crop_image_resource($img, $x, $y, $w, $h) {
         $dst = wp_imagecreatetruecolor($w, $h);
@@ -279 +347 @@
 }
 
-function image_edit_apply_changes($img, $changes) {
+/**
+ * Performs group of changes on Editor specified.
+ *
+ * @param WP_Image_Editor $image
+ * @param type $changes
+ * @return WP_Image_Editor
+ */
+function image_edit_apply_changes( $image, $changes ) {
+        if ( is_resource( $image ) )
+                _deprecated_argument( __FUNCTION__, '3.5', __( '$image needs to be an WP_Image_Editor object' ) );
 
         if ( !is_array($changes) )
-                return $img;
+                return $image;
 
         // expand change operations
@@ -327 +404 @@
 
         // image resource before applying the changes
-        $img = apply_filters('image_edit_before_change', $img, $changes);
+        if ( $image instanceof WP_Image_Editor )
+                $image = apply_filters('wp_image_editor_before_change', $image, $changes);
+        elseif ( is_resource( $image ) )
+                $image = apply_filters('image_edit_before_change', $image, $changes);
 
         foreach ( $changes as $operation ) {
                 switch ( $operation->type ) {
                         case 'rotate':
-                                if ( $operation->angle != 0 )
-                                        $img = _rotate_image_resource($img, $operation->angle);
+                                if ( $operation->angle != 0 ) {
+                                        if ( $image instanceof WP_Image_Editor )
+                                                $image->rotate( $operation->angle );
+                                        else
+                                                $image = _rotate_image_resource( $image, $operation->angle );
+                                }
                                 break;
                         case 'flip':
                                 if ( $operation->axis != 0 )
-                                        $img = _flip_image_resource($img, ($operation->axis & 1) != 0, ($operation->axis & 2) != 0);
+                                        if ( $image instanceof WP_Image_Editor )
+                                                $image->flip( ($operation->axis & 1) != 0, ($operation->axis & 2) != 0 );
+                                        else
+                                                $image = _flip_image_resource( $image, ( $operation->axis & 1 ) != 0, ( $operation->axis & 2 ) != 0 );
                                 break;
                         case 'crop':
                                 $sel = $operation->sel;
-                                $scale = 1 / _image_get_preview_ratio( imagesx($img), imagesy($img) ); // discard preview scaling
-                                $img = _crop_image_resource($img, $sel->x * $scale, $sel->y * $scale, $sel->w * $scale, $sel->h * $scale);
+
+                                if ( $image instanceof WP_Image_Editor ) {
+                                        $size = $image->get_size();
+                                        $w = $size['width'];
+                                        $h = $size['height'];
+
+                                        $scale = 1 / _image_get_preview_ratio( $w, $h ); // discard preview scaling
+                                        $image->crop( $sel->x * $scale, $sel->y * $scale, $sel->w * $scale, $sel->h * $scale );
+                                } else {
+                                        $scale = 1 / _image_get_preview_ratio( imagesx( $image ), imagesy( $image ) ); // discard preview scaling
+                                        $image = _crop_image_resource( $image, $sel->x * $scale, $sel->y * $scale, $sel->w * $scale, $sel->h * $scale );
+                                }
                                 break;
                 }
         }
 
-        return $img;
-}
-
-function stream_preview_image($post_id) {
-        $post = get_post($post_id);
+        return $image;
+}
+
+
+/**
+ * Streams image in post to browser, along with enqueued changes
+ * in $_REQUEST['history']
+ *
+ * @param int $post_id
+ * @return boolean
+ */
+function stream_preview_image( $post_id ) {
+        $post = get_post( $post_id );
         @ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', WP_MAX_MEMORY_LIMIT ) );
-        $img = load_image_to_edit( $post_id, $post->post_mime_type, array(400, 400) );
-
-        if ( !is_resource($img) )
-                return false;
+
+        $img = WP_Image_Editor::get_instance( _load_image_to_edit_path( $post_id ) );
+
+    if ( is_wp_error( $img ) )
+        return false;
 
         $changes = !empty($_REQUEST['history']) ? json_decode( stripslashes($_REQUEST['history']) ) : null;
         if ( $changes )
-                $img = image_edit_apply_changes($img, $changes);
+                $img = image_edit_apply_changes( $img, $changes );
 
         // scale the image
-        $w = imagesx($img);
-        $h = imagesy($img);
-        $ratio = _image_get_preview_ratio($w, $h);
+        $size = $img->get_size();
+        $w = $size['width'];
+        $h = $size['height'];
+
+        $ratio = _image_get_preview_ratio( $w, $h );
         $w2 = $w * $ratio;
         $h2 = $h * $ratio;
 
-        $preview = wp_imagecreatetruecolor($w2, $h2);
-        imagecopyresampled( $preview, $img, 0, 0, 0, 0, $w2, $h2, $w, $h );
-        wp_stream_image($preview, $post->post_mime_type, $post_id);
-
-        imagedestroy($preview);
-        imagedestroy($img);
-        return true;
+        if ( is_wp_error( $img->resize( $w2, $h2 ) ) )
+                return false;
+
+        return wp_stream_image( $img, $post->post_mime_type, $post_id );
 }
 
@@ -451 +556 @@
 }
 
-function wp_save_image($post_id) {
+/**
+ * Saves image to post along with enqueued changes
+ * in $_REQUEST['history']
+ *
+ * @param int $post_id
+ * @return \stdClass
+ */
+function wp_save_image( $post_id ) {
         $return = new stdClass;
         $success = $delete = $scaled = $nocrop = false;
-        $post = get_post($post_id);
-        @ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', WP_MAX_MEMORY_LIMIT ) );
-        $img = load_image_to_edit($post_id, $post->post_mime_type);
-
-        if ( !is_resource($img) ) {
+        $post = get_post( $post_id );
+
+        $img = WP_Image_Editor::get_instance( _load_image_to_edit_path( $post_id, 'full' ) );
+        if ( !$img ) {
                 $return->error = esc_js( __('Unable to create new image.') );
                 return $return;
@@ -469 +580 @@
 
         if ( $scale && $fwidth > 0 && $fheight > 0 ) {
-                $sX = imagesx($img);
-                $sY = imagesy($img);
+                $size = $img->get_size();
+                $sX = $size['width'];
+                $sY = $size['height'];
 
                 // check if it has roughly the same w / h ratio
@@ -476 +588 @@
                 if ( -0.1 < $diff && $diff < 0.1 ) {
                         // scale the full size image
-                        $dst = wp_imagecreatetruecolor($fwidth, $fheight);
-                        if ( imagecopyresampled( $dst, $img, 0, 0, 0, 0, $fwidth, $fheight, $sX, $sY ) ) {
-                                imagedestroy($img);
-                                $img = $dst;
+                        if ( $img->resize( $fwidth, $fheight ) )
                                 $scaled = true;
-                        }
                 }
 
@@ -552 +660 @@
                         $backup_sizes[$tag] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $path_parts['basename']);
 
-                $success = update_attached_file($post_id, $new_path);
-
-                $meta['file'] = _wp_relative_upload_path($new_path);
-                $meta['width'] = imagesx($img);
-                $meta['height'] = imagesy($img);
+                $success = update_attached_file( $post_id, $new_path );
+
+                $meta['file'] = _wp_relative_upload_path( $new_path );
+
+                $size = $img->get_size();
+                $meta['width'] = $size['width'];
+                $meta['height'] = $size['height'];
 
                 if ( $success && ('nothumb' == $target || 'all' == $target) ) {
@@ -571 +681 @@
         }
 
-        if ( isset($sizes) ) {
+        if ( isset( $sizes ) ) {
+                $_sizes = array();
+
                 foreach ( $sizes as $size ) {
                         $tag = false;
-                        if ( isset($meta['sizes'][$size]) ) {
+                        if ( isset( $meta['sizes'][$size] ) ) {
                                 if ( isset($backup_sizes["$size-orig"]) ) {
                                         if ( ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) && $backup_sizes["$size-orig"]['file'] != $meta['sizes'][$size]['file'] )
@@ -587 +699 @@
 
                         $crop = $nocrop ? false : get_option("{$size}_crop");
-                        $resized = image_make_intermediate_size($new_path, get_option("{$size}_size_w"), get_option("{$size}_size_h"), $crop );
-
-                        if ( $resized )
-                                $meta['sizes'][$size] = $resized;
-                        else
-                                unset($meta['sizes'][$size]);
-                }
-        }
+                        $_sizes[ $size ] = array( 'width' => get_option("{$size}_size_w"), 'height' => get_option("{$size}_size_h"), 'crop' => $crop );
+                }
+
+                $meta['sizes'] = $img->multi_resize( $_sizes );
+        }
+
+        unset( $img );
 
         if ( $success ) {
-                wp_update_attachment_metadata($post_id, $meta);
+                wp_update_attachment_metadata( $post_id, $meta );
                 update_post_meta( $post_id, '_wp_attachment_backup_sizes', $backup_sizes);
 
@@ -613 +724 @@
         if ( $delete ) {
                 $delpath = apply_filters('wp_delete_file', $new_path);
-                @unlink($delpath);
-        }
-
-        imagedestroy($img);
+                @unlink( $delpath );
+        }
 
         $return->msg = esc_js( __('Image saved') );

trunk/wp-admin/includes/image.php

@@ -23 +23 @@
  * @return string|WP_Error|false New filepath on success, WP_Error or false on failure.
  */
-function wp_crop_image( $src, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs = false, $dst_file = false ) {
-        if ( is_numeric( $src ) ) { // Handle int as attachment ID
-                $src_file = get_attached_file( $src );
+function wp_crop_image( $src_file, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs = false, $dst_file = false ) {
+        if ( is_numeric( $src_file ) ) { // Handle int as attachment ID
+                $src_file = get_attached_file( $src_file );
                 if ( ! file_exists( $src_file ) ) {
                         // If the file doesn't exist, attempt a url fopen on the src link.
                         // This can occur with certain file replication plugins.
-                        $post = get_post( $src );
-                        $image_type = $post->post_mime_type;
-                        $src = load_image_to_edit( $src, $post->post_mime_type, 'full' );
-                } else {
-                        $size = @getimagesize( $src_file );
-                        $image_type = ( $size ) ? $size['mime'] : '';
-                        $src = wp_load_image( $src_file );
-                }
-        } else {
-                $size = @getimagesize( $src );
-                $image_type = ( $size ) ? $size['mime'] : '';
-                $src = wp_load_image( $src );
-        }
-
-        if ( ! is_resource( $src ) )
-                return new WP_Error( 'error_loading_image', $src, $src_file );
-
-        $dst = wp_imagecreatetruecolor( $dst_w, $dst_h );
-
-        if ( $src_abs ) {
-                $src_w -= $src_x;
-                $src_h -= $src_y;
-        }
-
-        if ( function_exists( 'imageantialias' ) )
-                imageantialias( $dst, true );
-
-        imagecopyresampled( $dst, $src, 0, 0, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h );
-
-        imagedestroy( $src ); // Free up memory
+                        $src_file = _load_image_to_edit_path( $src_file, 'full' );
+                }
+        }
+
+        $editor = WP_Image_Editor::get_instance( $src_file );
+        $src = $editor->crop( $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs );
+
+        if ( is_wp_error( $src ) )
+                return $src;
 
         if ( ! $dst_file )
                 $dst_file = str_replace( basename( $src_file ), 'cropped-' . basename( $src_file ), $src_file );
-
-        if ( 'image/png' != $image_type )
-                $dst_file = preg_replace( '/\\.[^\\.]+$/', '.jpg', $dst_file );
 
         // The directory containing the original file may no longer exist when
@@ -72 +48 @@
         $dst_file = dirname( $dst_file ) . '/' . wp_unique_filename( dirname( $dst_file ), basename( $dst_file ) );
 
-        if ( 'image/png' == $image_type && imagepng( $dst, $dst_file ) )
-                return $dst_file;
-        elseif ( imagejpeg( $dst, $dst_file, apply_filters( 'jpeg_quality', 90, 'wp_crop_image' ) ) )
-                return $dst_file;
-        else
-                return false;
+        $result = $editor->save( $dst_file );
+        return $dst_file;
 }
 
@@ -122 +94 @@
                 $sizes = apply_filters( 'intermediate_image_sizes_advanced', $sizes );
 
-                foreach ($sizes as $size => $size_data ) {
-                        $resized = image_make_intermediate_size( $file, $size_data['width'], $size_data['height'], $size_data['crop'] );
-                        if ( $resized )
-                                $metadata['sizes'][$size] = $resized;
-                }
+                $editor = WP_Image_Editor::get_instance( $file );
+                $metadata['sizes'] = $editor->multi_resize( $sizes );
 
                 // fetch additional metadata from exif/iptc

trunk/wp-includes/deprecated.php

@@ -3207 +3207 @@
 
 /**
+ * Load an image from a string, if PHP supports it.
+ *
+ * @since 2.1.0
+ * @deprecated 3.5.0
+ * @see WP_Image_Editor
+ *
+ * @param string $file Filename of the image to load.
+ * @return resource The resulting image resource on success, Error string on failure.
+ */
+function wp_load_image( $file ) {
+        _deprecated_function( __FUNCTION__, '3.5', 'WP_Image_Editor' );
+
+        if ( is_numeric( $file ) )
+                $file = get_attached_file( $file );
+
+        if ( ! file_exists( $file ) )
+                return sprintf(__('File “%s” doesn’t exist?'), $file);
+
+        if ( ! function_exists('imagecreatefromstring') )
+                return __('The GD image library is not installed.');
+
+        // Set artificially high because GD uses uncompressed images in memory
+        @ini_set( 'memory_limit', apply_filters( 'image_memory_limit', WP_MAX_MEMORY_LIMIT ) );
+        $image = imagecreatefromstring( file_get_contents( $file ) );
+
+        if ( !is_resource( $image ) )
+                return sprintf(__('File “%s” is not an image.'), $file);
+
+        return $image;
+}
+
+/**
+ * Scale down an image to fit a particular size and save a new copy of the image.
+ *
+ * The PNG transparency will be preserved using the function, as well as the
+ * image type. If the file going in is PNG, then the resized image is going to
+ * be PNG. The only supported image types are PNG, GIF, and JPEG.
+ *
+ * Some functionality requires API to exist, so some PHP version may lose out
+ * support. This is not the fault of WordPress (where functionality is
+ * downgraded, not actual defects), but of your PHP version.
+ *
+ * @since 2.5.0
+ * @deprecated 3.5.0
+ * @see WP_Image_Editor
+ *
+ * @param string $file Image file path.
+ * @param int $max_w Maximum width to resize to.
+ * @param int $max_h Maximum height to resize to.
+ * @param bool $crop Optional. Whether to crop image or resize.
+ * @param string $suffix Optional. File suffix.
+ * @param string $dest_path Optional. New image file path.
+ * @param int $jpeg_quality Optional, default is 90. Image quality percentage.
+ * @return mixed WP_Error on failure. String with new destination path.
+ */
+function image_resize( $file, $max_w, $max_h, $crop = false, $suffix = null, $dest_path = null, $jpeg_quality = 90 ) {
+        _deprecated_function( __FUNCTION__, '3.5', 'WP_Image_Editor' );
+
+        $editor = WP_Image_Editor::get_instance( $file );
+        if ( is_wp_error( $editor ) )
+                return $editor;
+        $editor->set_quality( $jpeg_quality );
+
+        $resized = $editor->resize( $max_w, $max_h, $crop );
+        if ( is_wp_error( $resized ) )
+                return $resized;
+
+        $dest_file = $editor->generate_filename( $suffix, $dest_path );
+        $saved = $editor->save( $dest_file );
+
+        if ( is_wp_error( $saved ) )
+                return $saved;
+
+        return $dest_file;
+}
+
+/**
  * Retrieve a single post, based on post ID.
  *

trunk/wp-includes/functions.php

@@ -1296 +1296 @@
  */
 function wp_mkdir_p( $target ) {
+        $wrapper = null;
+
+        // strip the protocol
+        if( wp_is_stream( $target ) ) {
+                list( $wrapper, $target ) = explode( '://', $target, 2 );
+        }
+
         // from php.net/mkdir user contributed notes
         $target = str_replace( '//', '/', $target );
+
+        // put the wrapper back on the target
+        if( $wrapper !== null ) {
+                $target = $wrapper . '://' . $target;
+        }
 
         // safe mode fails with a trailing slash under certain PHP versions.
@@ -3751 +3763 @@
 
 /**
+ * Test if a given path is a stream URL
+ *
+ * @param string $path The resource path or URL
+ * @return bool True if the path is a stream URL
+ */
+function wp_is_stream( $path ) {
+        $wrappers = stream_get_wrappers();
+        $wrappers_re = '(' . join('|', $wrappers) . ')';
+
+        return preg_match( "!^$wrappers_re://!", $path ) === 1;
+}
+
+/**
  * Test if the supplied date is valid for the Gregorian calendar
  *

trunk/wp-includes/media.php

@@ -237 +237 @@
 
 /**
- * Load an image from a string, if PHP supports it.
- *
- * @since 2.1.0
- *
- * @param string $file Filename of the image to load.
- * @return resource The resulting image resource on success, Error string on failure.
- */
-function wp_load_image( $file ) {
-        if ( is_numeric( $file ) )
-                $file = get_attached_file( $file );
-
-        if ( ! file_exists( $file ) )
-                return sprintf(__('File “%s” doesn’t exist?'), $file);
-
-        if ( ! function_exists('imagecreatefromstring') )
-                return __('The GD image library is not installed.');
-
-        // Set artificially high because GD uses uncompressed images in memory
-        @ini_set( 'memory_limit', apply_filters( 'image_memory_limit', WP_MAX_MEMORY_LIMIT ) );
-        $image = imagecreatefromstring( file_get_contents( $file ) );
-
-        if ( !is_resource( $image ) )
-                return sprintf(__('File “%s” is not an image.'), $file);
-
-        return $image;
-}
-
-/**
  * Calculates the new dimensions for a downsampled image.
  *
@@ -394 +366 @@
 
 /**
- * Scale down an image to fit a particular size and save a new copy of the image.
- *
- * The PNG transparency will be preserved using the function, as well as the
- * image type. If the file going in is PNG, then the resized image is going to
- * be PNG. The only supported image types are PNG, GIF, and JPEG.
- *
- * Some functionality requires API to exist, so some PHP version may lose out
- * support. This is not the fault of WordPress (where functionality is
- * downgraded, not actual defects), but of your PHP version.
- *
- * @since 2.5.0
- *
- * @param string $file Image file path.
- * @param int $max_w Maximum width to resize to.
- * @param int $max_h Maximum height to resize to.
- * @param bool $crop Optional. Whether to crop image or resize.
- * @param string $suffix Optional. File suffix.
- * @param string $dest_path Optional. New image file path.
- * @param int $jpeg_quality Optional, default is 90. Image quality percentage.
- * @return mixed WP_Error on failure. String with new destination path.
- */
-function image_resize( $file, $max_w, $max_h, $crop = false, $suffix = null, $dest_path = null, $jpeg_quality = 90 ) {
-
-        $image = wp_load_image( $file );
-        if ( !is_resource( $image ) )
-                return new WP_Error( 'error_loading_image', $image, $file );
-
-        $size = @getimagesize( $file );
-        if ( !$size )
-                return new WP_Error('invalid_image', __('Could not read image size'), $file);
-        list($orig_w, $orig_h, $orig_type) = $size;
-
-        $dims = image_resize_dimensions($orig_w, $orig_h, $max_w, $max_h, $crop);
-        if ( !$dims )
-                return new WP_Error( 'error_getting_dimensions', __('Could not calculate resized image dimensions') );
-        list($dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h) = $dims;
-
-        $newimage = wp_imagecreatetruecolor( $dst_w, $dst_h );
-
-        imagecopyresampled( $newimage, $image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
-
-        // convert from full colors to index colors, like original PNG.
-        if ( IMAGETYPE_PNG == $orig_type && function_exists('imageistruecolor') && !imageistruecolor( $image ) )
-                imagetruecolortopalette( $newimage, false, imagecolorstotal( $image ) );
-
-        // we don't need the original in memory anymore
-        imagedestroy( $image );
-
-        // $suffix will be appended to the destination filename, just before the extension
-        if ( !$suffix )
-                $suffix = "{$dst_w}x{$dst_h}";
-
-        $info = pathinfo($file);
-        $dir = $info['dirname'];
-        $ext = $info['extension'];
-        $name = wp_basename($file, ".$ext");
-
-        if ( !is_null($dest_path) and $_dest_path = realpath($dest_path) )
-                $dir = $_dest_path;
-        $destfilename = "{$dir}/{$name}-{$suffix}.{$ext}";
-
-        if ( IMAGETYPE_GIF == $orig_type ) {
-                if ( !imagegif( $newimage, $destfilename ) )
-                        return new WP_Error('resize_path_invalid', __( 'Resize path invalid' ));
-        } elseif ( IMAGETYPE_PNG == $orig_type ) {
-                if ( !imagepng( $newimage, $destfilename ) )
-                        return new WP_Error('resize_path_invalid', __( 'Resize path invalid' ));
-        } else {
-                // all other formats are converted to jpg
-                if ( 'jpg' != $ext && 'jpeg' != $ext )
-                        $destfilename = "{$dir}/{$name}-{$suffix}.jpg";
-                if ( !imagejpeg( $newimage, $destfilename, apply_filters( 'jpeg_quality', $jpeg_quality, 'image_resize' ) ) )
-                        return new WP_Error('resize_path_invalid', __( 'Resize path invalid' ));
-        }
-
-        imagedestroy( $newimage );
-
-        // Set correct file permissions
-        $stat = stat( dirname( $destfilename ));
-        $perms = $stat['mode'] & 0000666; //same permissions as parent folder, strip off the executable bits
-        @ chmod( $destfilename, $perms );
-
-        return $destfilename;
-}
-
-/**
  * Resize an image to make a thumbnail or intermediate size.
  *
@@ -494 +380 @@
  * @return bool|array False, if no image was created. Metadata array on success.
  */
-function image_make_intermediate_size($file, $width, $height, $crop=false) {
+function image_make_intermediate_size( $file, $width, $height, $crop = false ) {
         if ( $width || $height ) {
-                $resized_file = image_resize($file, $width, $height, $crop);
-                if ( !is_wp_error($resized_file) && $resized_file && $info = getimagesize($resized_file) ) {
-                        $resized_file = apply_filters('image_make_intermediate_size', $resized_file);
-                        return array(
-                                'file' => wp_basename( $resized_file ),
-                                'width' => $info[0],
-                                'height' => $info[1],
-                        );
+                $editor = WP_Image_Editor::get_instance( $file );
+
+                if ( is_wp_error( $editor->resize( $width, $height, $crop ) ) );
+                        return false;
+
+                $resized_file = $editor->save();
+
+                if ( ! is_wp_error( $resized_file ) && $resized_file ) {
+                        unset( $resized_file['path'] );
+                        return $resized_file;
                 }
         }
@@ -1048 +936 @@
 /**
  * Create new GD image resource with transparency support
+ * @TODO: Deprecate if possible.
  *
  * @since 2.9.0

trunk/wp-settings.php

@@ -144 +144 @@
 require( ABSPATH . WPINC . '/admin-bar.php' );
 
+require( ABSPATH . WPINC . '/class-wp-image-editor.php' );
+require( ABSPATH . WPINC . '/class-wp-image-editor-gd.php' );
+require( ABSPATH . WPINC . '/class-wp-image-editor-imagick.php' );
+
 // Load multisite-specific files.
 if ( is_multisite() ) {