Changeset 27472

Timestamp:

03/08/2014 06:13:27 AM (11 years ago)

Author:

nacin

Message:

Allow $crop in add_image_size() to receive crop anchors (top, left, right, bottom, center).

This also applies to set_post_thumbnail_size() and image_resize_dimensions().

props bradt, wonderboymusic, DH-Shredder.
fixes #19393.

Location:

trunk

Files:

• src/wp-admin/includes/image.php (modified) (1 diff)
• src/wp-includes/media.php (modified) (4 diffs)
• tests/phpunit/tests/image/dimensions.php (modified) (1 diff)

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

@@ -98 +98 @@
                 $sizes[$s]['height'] = get_option( "{$s}_size_h" ); // For default sizes set in options
             if ( isset( $_wp_additional_image_sizes[$s]['crop'] ) )
-                $sizes[$s]['crop'] = intval( $_wp_additional_image_sizes[$s]['crop'] ); // For theme-added sizes
+                $sizes[$s]['crop'] = $_wp_additional_image_sizes[$s]['crop']; // For theme-added sizes
             else
                 $sizes[$s]['crop'] = get_option( "{$s}_crop" ); // For default sizes set in options

trunk/src/wp-includes/media.php

@@ -184 +184 @@
  * Register a new image size.
  *
+ * Cropping behavior for the image size is dependent on the value of $crop:
+ * 1. If false (default), images will be scaled, not cropped.
+ * 2. If an array in the form of array( x_crop_position, y_crop_position ):
+ *    - x_crop_position accepts 'left' 'center', or 'right'.
+ *    - y_crop_position accepts 'top', 'center', or 'bottom'.
+ *    Images will be cropped to the specified dimensions within the defined crop area.
+ * 3. If true, images will be cropped to the specified dimensions using center positions.
+ *
  * @since 2.9.0
  *
- * @param string $name   The image size name.
- * @param int    $width  The image's width.
- * @param int    $height The image's width.
- * @param bool   $width  Whether to crop the image to fit the dimensions. Default false.
+ * @param string     $name   Image size identifier.
+ * @param int        $width  Image width in pixels.
+ * @param int        $height Image height in pixels.
+ * @param bool|array $crop   Optional. Whether to crop images to specified height and width or resize.
+ *                           An array can specify positioning of the crop area. Default false.
+ * @return bool|array False, if no image was created. Metadata array on success.
  */
 function add_image_size( $name, $width = 0, $height = 0, $crop = false ) {
     global $_wp_additional_image_sizes;
+
     $_wp_additional_image_sizes[ $name ] = array(
         'width'  => absint( $width ),
         'height' => absint( $height ),
-        'crop'   => (bool) $crop,
+        'crop'   => $crop,
     );
 }
@@ -234 +245 @@
 
 /**
- * Registers an image size for the post thumbnail
+ * Registers an image size for the post thumbnail.
  *
  * @since 2.9.0
+ * @see add_image_size() for details on cropping behavior.
+ *
+ * @param int        $width  Image width in pixels.
+ * @param int        $height Image height in pixels.
+ * @param bool|array $crop   Optional. Whether to crop images to specified height and width or resize.
+ *                           An array can specify positioning of the crop area. Default false.
+ * @return bool|array False, if no image was created. Metadata array on success.
  */
 function set_post_thumbnail_size( $width = 0, $height = 0, $crop = false ) {
@@ -343 +361 @@
 
 /**
- * Retrieve calculated resized dimensions for use in WP_Image_Editor.
- *
- * Calculate dimensions and coordinates for a resized image that fits within a
- * specified width and height. If $crop is true, the largest matching central
- * portion of the image will be cropped out and resized to the required size.
+ * Retrieve calculated resize dimensions for use in WP_Image_Editor.
+ *
+ * Calculates dimensions and coordinates for a resized image that fits
+ * within a specified width and height.
+ *
+ * Cropping behavior is dependent on the value of $crop:
+ * 1. If false (default), images will not be cropped.
+ * 2. If an array in the form of array( x_crop_position, y_crop_position ):
+ *    - x_crop_position accepts 'left' 'center', or 'right'.
+ *    - y_crop_position accepts 'top', 'center', or 'bottom'.
+ *    Images will be cropped to the specified dimensions within the defined crop area.
+ * 3. If true, images will be cropped to the specified dimensions using center positions.
  *
  * @since 2.5.0
- * @uses apply_filters() Calls 'image_resize_dimensions' on $orig_w, $orig_h, $dest_w, $dest_h and
- *      $crop to provide custom resize dimensions.
- *
- * @param int $orig_w Original width.
- * @param int $orig_h Original height.
- * @param int $dest_w New width.
- * @param int $dest_h New height.
- * @param bool $crop Optional, default is false. Whether to crop image or resize.
- * @return bool|array False on failure. Returned array matches parameters for imagecopyresampled() PHP function.
+ * @uses apply_filters() Calls 'image_resize_dimensions' on $orig_w, $orig_h, $dest_w,
+ *                       $dest_h and $crop to provide custom resize dimensions.
+ *
+ * @param int        $orig_w Original width in pixels.
+ * @param int        $orig_h Original height in pixels.
+ * @param int        $dest_w New width in pixels.
+ * @param int        $dest_h New height in pixels.
+ * @param bool|array $crop   Optional. Whether to crop image to specified height and width or resize.
+ *                           An array can specify positioning of the crop area. Default false.
+ * @return bool|array False on failure. Returned array matches parameters for `imagecopyresampled()`.
  */
 function image_resize_dimensions($orig_w, $orig_h, $dest_w, $dest_h, $crop = false) {
@@ -392 +418 @@
         $crop_h = round($new_h / $size_ratio);
 
-        $s_x = floor( ($orig_w - $crop_w) / 2 );
-        $s_y = floor( ($orig_h - $crop_h) / 2 );
+        if ( ! is_array( $crop ) || count( $crop ) !== 2 ) {
+            $crop = array( 'center', 'center' );
+        }
+
+        list( $x, $y ) = $crop;
+
+        if ( 'left' === $x ) {
+            $s_x = 0;
+        } elseif ( 'right' === $x ) {
+            $s_x = $orig_w - $crop_w;
+        } else {
+            $s_x = floor( ( $orig_w - $crop_w ) / 2 );
+        }
+
+        if ( 'top' === $y ) {
+            $s_y = 0;
+        } elseif ( 'bottom' === $y ) {
+            $s_y = $orig_h - $crop_h;
+        } else {
+            $s_y = floor( ( $orig_h - $crop_h ) / 2 );
+        }
     } else {
         // don't crop, just resize using $dest_w x $dest_h as a maximum bounding box

trunk/tests/phpunit/tests/image/dimensions.php

@@ -129 +129 @@
     }
 
+    /**
+     * @ticket 19393
+     */
+    function test_crop_anchors() {
+        // landscape: crop 640x480 to fit 400x500: 400x400 taken from a 480x480 crop
+        // src_x = 0 (left), src_y = 0 (top)
+        $out = image_resize_dimensions(640, 480, 400, 500, array( 'left', 'top' ) );
+        // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h
+        $this->assertEquals( array(0, 0, 0, 0, 400, 480, 400, 480), $out );
+
+        // portrait: resize 480x640 to fit 400x400: 400x400 taken from a 480x480 crop
+        // src_x = 0 (left), src_y = 0 (top)
+        $out = image_resize_dimensions(480, 640, 400, 500, array( 'left', 'top' ) );
+        // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h
+        $this->assertEquals( array(0, 0, 0, 0, 400, 500, 480, 600), $out );
+
+        // landscape: crop 640x480 to fit 400x500: 400x400 taken from a 480x480 crop
+        // src_x = 240 (left), src_y = 0 (due to landscape crop)
+        $out = image_resize_dimensions(640, 480, 400, 500, array( 'right', 'bottom' ) );
+        // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h
+        $this->assertEquals( array(0, 0, 240, 0, 400, 480, 400, 480), $out );
+
+        // portrait: resize 480x640 to fit 400x400: 400x400 taken from a 480x480 crop
+        // src_x = 0 (due to portrait crop), src_y = 40 (bottom)
+        $out = image_resize_dimensions(480, 640, 400, 500, array( 'right', 'bottom' ) );
+        // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h
+        $this->assertEquals( array(0, 0, 0, 40, 400, 500, 480, 600), $out );
+    }
+
 }