X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/67f24b02807a1ff7e9d1a97453ed84c404c0af0f..refs/tags/wordpress-3.2-scripts:/wp-includes/media.php
diff --git a/wp-includes/media.php b/wp-includes/media.php
index 22e67819..f4e60d00 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -32,7 +32,7 @@
* @return array Width and height of what the result image should resize to.
*/
function image_constrain_size_for_editor($width, $height, $size = 'medium') {
- global $content_width;
+ global $content_width, $_wp_additional_image_sizes;
if ( is_array($size) ) {
$max_width = $size[0];
@@ -61,6 +61,11 @@ function image_constrain_size_for_editor($width, $height, $size = 'medium') {
$max_height = intval(get_option('large_size_h'));
if ( intval($content_width) > 0 )
$max_width = min( intval($content_width), $max_width );
+ } elseif ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) && in_array( $size, array_keys( $_wp_additional_image_sizes ) ) ) {
+ $max_width = intval( $_wp_additional_image_sizes[$size]['width'] );
+ $max_height = intval( $_wp_additional_image_sizes[$size]['height'] );
+ if ( intval($content_width) > 0 && is_admin() ) // Only in admin. Assume that theme authors know what they're doing.
+ $max_width = min( intval($content_width), $max_width );
}
// $size == 'full' has no constraint
else {
@@ -120,7 +125,7 @@ function image_hwstring($width, $height) {
* resize services.
*
* @param int $id Attachment ID for image.
- * @param string $size Optional, default is 'medium'. Size of image, can be 'thumbnail'.
+ * @param array|string $size Optional, default is 'medium'. Size of image, either array or string.
* @return bool|array False on failure, array on success.
*/
function image_downsize($id, $size = 'medium') {
@@ -132,6 +137,7 @@ function image_downsize($id, $size = 'medium') {
$meta = wp_get_attachment_metadata($id);
$width = $height = 0;
$is_intermediate = false;
+ $img_url_basename = wp_basename($img_url);
// plugins can use this to provide resize services
if ( $out = apply_filters('image_downsize', false, $id, $size) )
@@ -139,7 +145,7 @@ function image_downsize($id, $size = 'medium') {
// try for a new style intermediate size
if ( $intermediate = image_get_intermediate_size($id, $size) ) {
- $img_url = str_replace(basename($img_url), $intermediate['file'], $img_url);
+ $img_url = str_replace($img_url_basename, $intermediate['file'], $img_url);
$width = $intermediate['width'];
$height = $intermediate['height'];
$is_intermediate = true;
@@ -147,7 +153,7 @@ function image_downsize($id, $size = 'medium') {
elseif ( $size == 'thumbnail' ) {
// fall back to the old thumbnail
if ( ($thumb_file = wp_get_attachment_thumb_file($id)) && $info = getimagesize($thumb_file) ) {
- $img_url = str_replace(basename($img_url), basename($thumb_file), $img_url);
+ $img_url = str_replace($img_url_basename, wp_basename($thumb_file), $img_url);
$width = $info[0];
$height = $info[1];
$is_intermediate = true;
@@ -169,6 +175,21 @@ function image_downsize($id, $size = 'medium') {
}
+/**
+ * Registers a new image size
+ */
+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 );
+}
+
+/**
+ * Registers an image size for the post thumbnail
+ */
+function set_post_thumbnail_size( $width = 0, $height = 0, $crop = false ) {
+ add_image_size( 'post-thumbnail', $width, $height, $crop );
+}
+
/**
* An tag for an image attachment, scaling it down if requested.
*
@@ -210,11 +231,38 @@ function get_image_tag($id, $alt, $title, $align, $size='medium') {
return $html;
}
+/**
+ * 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 dimentions for a downsampled image.
*
- * Same as {@link wp_shrink_dimensions()}, except the max parameters are
- * optional. If either width or height are empty, no constraint is applied on
+ * If either width or height are empty, no constraint is applied on
* that dimension.
*
* @since 2.5.0
@@ -230,17 +278,41 @@ function wp_constrain_dimensions( $current_width, $current_height, $max_width=0,
return array( $current_width, $current_height );
$width_ratio = $height_ratio = 1.0;
+ $did_width = $did_height = false;
- if ( $max_width > 0 && $current_width > 0 && $current_width > $max_width )
+ if ( $max_width > 0 && $current_width > 0 && $current_width > $max_width ) {
$width_ratio = $max_width / $current_width;
+ $did_width = true;
+ }
- if ( $max_height > 0 && $current_height > 0 && $current_height > $max_height )
+ if ( $max_height > 0 && $current_height > 0 && $current_height > $max_height ) {
$height_ratio = $max_height / $current_height;
+ $did_height = true;
+ }
- // the smaller ratio is the one we need to fit it to the constraining box
- $ratio = min( $width_ratio, $height_ratio );
-
- return array( intval($current_width * $ratio), intval($current_height * $ratio) );
+ // Calculate the larger/smaller ratios
+ $smaller_ratio = min( $width_ratio, $height_ratio );
+ $larger_ratio = max( $width_ratio, $height_ratio );
+
+ if ( intval( $current_width * $larger_ratio ) > $max_width || intval( $current_height * $larger_ratio ) > $max_height )
+ // The larger ratio is too big. It would result in an overflow.
+ $ratio = $smaller_ratio;
+ else
+ // The larger ratio fits, and is likely to be a more "snug" fit.
+ $ratio = $larger_ratio;
+
+ $w = intval( $current_width * $ratio );
+ $h = intval( $current_height * $ratio );
+
+ // Sometimes, due to rounding, we'll end up with a result like this: 465x700 in a 177x177 box is 117x176... a pixel short
+ // We also have issues with recursive calls resulting in an ever-changing result. Contraining to the result of a constraint should yield the original result.
+ // Thus we look for dimensions that are one pixel shy of the max value and bump them up
+ if ( $did_width && $w == $max_width - 1 )
+ $w = $max_width; // Round it up
+ if ( $did_height && $h == $max_height - 1 )
+ $h = $max_height; // Round it up
+
+ return array( $w, $h );
}
/**
@@ -259,7 +331,7 @@ function wp_constrain_dimensions( $current_width, $current_height, $max_width=0,
* @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.
*/
-function image_resize_dimensions($orig_w, $orig_h, $dest_w, $dest_h, $crop=false) {
+function image_resize_dimensions($orig_w, $orig_h, $dest_w, $dest_h, $crop = false) {
if ($orig_w <= 0 || $orig_h <= 0)
return false;
@@ -272,22 +344,23 @@ function image_resize_dimensions($orig_w, $orig_h, $dest_w, $dest_h, $crop=false
$aspect_ratio = $orig_w / $orig_h;
$new_w = min($dest_w, $orig_w);
$new_h = min($dest_h, $orig_h);
- if (!$new_w) {
+
+ if ( !$new_w ) {
$new_w = intval($new_h * $aspect_ratio);
}
- if (!$new_h) {
+
+ if ( !$new_h ) {
$new_h = intval($new_w / $aspect_ratio);
}
$size_ratio = max($new_w / $orig_w, $new_h / $orig_h);
- $crop_w = ceil($new_w / $size_ratio);
- $crop_h = ceil($new_h / $size_ratio);
+ $crop_w = round($new_w / $size_ratio);
+ $crop_h = round($new_h / $size_ratio);
- $s_x = floor(($orig_w - $crop_w)/2);
- $s_y = floor(($orig_h - $crop_h)/2);
- }
- else {
+ $s_x = floor( ($orig_w - $crop_w) / 2 );
+ $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
$crop_w = $orig_w;
$crop_h = $orig_h;
@@ -299,12 +372,12 @@ function image_resize_dimensions($orig_w, $orig_h, $dest_w, $dest_h, $crop=false
}
// if the resulting image would be the same size or larger we don't want to resize it
- if ($new_w >= $orig_w && $new_h >= $orig_h)
+ if ( $new_w >= $orig_w && $new_h >= $orig_h )
return false;
// the return array matches the parameters to imagecopyresampled()
// int dst_x, int dst_y, int src_x, int src_y, int dst_w, int dst_h, int src_w, int src_h
- return array(0, 0, $s_x, $s_y, $new_w, $new_h, $crop_w, $crop_h);
+ return array( 0, 0, (int) $s_x, (int) $s_y, (int) $new_w, (int) $new_h, (int) $crop_w, (int) $crop_h );
}
@@ -328,30 +401,32 @@ function image_resize_dimensions($orig_w, $orig_h, $dest_w, $dest_h, $crop=false
* @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. Array of dimensions from {@link image_resize_dimensions()}
+ * @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) {
+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);
+ 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;
- list($orig_w, $orig_h, $orig_type) = getimagesize( $file );
$dims = image_resize_dimensions($orig_w, $orig_h, $max_w, $max_h, $crop);
- if (!$dims)
- return $dims;
+ 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 = imagecreatetruecolor( $dst_w, $dst_h);
-
- // preserve PNG transparency
- if ( IMAGETYPE_PNG == $orig_type && function_exists( 'imagealphablending' ) && function_exists( 'imagesavealpha' ) ) {
- imagealphablending( $newimage, false);
- imagesavealpha( $newimage, true);
- }
+ $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 );
@@ -362,23 +437,22 @@ function image_resize( $file, $max_w, $max_h, $crop=false, $suffix=null, $dest_p
$info = pathinfo($file);
$dir = $info['dirname'];
$ext = $info['extension'];
- $name = basename($file, ".{$ext}");
+ $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 ( $orig_type == IMAGETYPE_GIF ) {
- if (!imagegif( $newimage, $destfilename ) )
+ if ( IMAGETYPE_GIF == $orig_type ) {
+ if ( !imagegif( $newimage, $destfilename ) )
return new WP_Error('resize_path_invalid', __( 'Resize path invalid' ));
- }
- elseif ( $orig_type == IMAGETYPE_PNG ) {
- if (!imagepng( $newimage, $destfilename ) )
+ } elseif ( IMAGETYPE_PNG == $orig_type ) {
+ if ( !imagepng( $newimage, $destfilename ) )
return new WP_Error('resize_path_invalid', __( 'Resize path invalid' ));
- }
- else {
+ } else {
// all other formats are converted to jpg
$destfilename = "{$dir}/{$name}-{$suffix}.jpg";
- if (!imagejpeg( $newimage, $destfilename, apply_filters( 'jpeg_quality', $jpeg_quality, 'image_resize' ) ) )
+ if ( !imagejpeg( $newimage, $destfilename, apply_filters( 'jpeg_quality', $jpeg_quality, 'image_resize' ) ) )
return new WP_Error('resize_path_invalid', __( 'Resize path invalid' ));
}
@@ -413,7 +487,7 @@ function image_make_intermediate_size($file, $width, $height, $crop=false) {
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' => basename( $resized_file ),
+ 'file' => wp_basename( $resized_file ),
'width' => $info[0],
'height' => $info[1],
);
@@ -436,7 +510,13 @@ function image_make_intermediate_size($file, $width, $height, $crop=false) {
*
* The url path will be given, when the $size parameter is a string.
*
+ * If you are passing an array for the $size, you should consider using
+ * add_image_size() so that a cropped version is generated. It's much more
+ * efficient than having to find the closest-sized image and then having the
+ * browser scale down the image.
+ *
* @since 2.5.0
+ * @see add_image_size()
*
* @param int $post_id Attachment ID for image.
* @param array|string $size Optional, default is 'thumbnail'. Size of image, either array or string.
@@ -464,6 +544,13 @@ function image_get_intermediate_size($post_id, $size='thumbnail') {
foreach ( $areas as $_size ) {
$data = $imagedata['sizes'][$_size];
if ( $data['width'] >= $size[0] || $data['height'] >= $size[1] ) {
+ // Skip images with unexpectedly divergent aspect ratios (crops)
+ // First, we calculate what size the original image would be if constrained to a box the size of the current image in the loop
+ $maybe_cropped = image_resize_dimensions($imagedata['width'], $imagedata['height'], $data['width'], $data['height'], false );
+ // If the size doesn't match within one pixel, then it is of a different aspect ratio, so we skip it, unless it's the thumbnail size
+ if ( 'thumbnail' != $_size && ( !$maybe_cropped || ( $maybe_cropped[4] != $data['width'] && $maybe_cropped[4] + 1 != $data['width'] ) || ( $maybe_cropped[5] != $data['height'] && $maybe_cropped[5] + 1 != $data['height'] ) ) )
+ continue;
+ // If we're still here, then we're going to use this size
$file = $data['file'];
list($width, $height) = image_constrain_size_for_editor( $data['width'], $data['height'], $size );
return compact( 'file', 'width', 'height' );
@@ -485,6 +572,20 @@ function image_get_intermediate_size($post_id, $size='thumbnail') {
return $data;
}
+/**
+ * Get the available image sizes
+ * @since 3.0.0
+ * @return array Returns a filtered array of image size strings
+ */
+function get_intermediate_image_sizes() {
+ global $_wp_additional_image_sizes;
+ $image_sizes = array('thumbnail', 'medium', 'large'); // Standard sizes
+ if ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) )
+ $image_sizes = array_merge( $image_sizes, array_keys( $_wp_additional_image_sizes ) );
+
+ return apply_filters( 'intermediate_image_sizes', $image_sizes );
+}
+
/**
* Retrieve an image to represent an attachment.
*
@@ -507,7 +608,7 @@ function wp_get_attachment_image_src($attachment_id, $size='thumbnail', $icon =
if ( $icon && $src = wp_mime_type_icon($attachment_id) ) {
$icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/crystal' );
- $src_file = $icon_dir . '/' . basename($src);
+ $src_file = $icon_dir . '/' . wp_basename($src);
@list($width, $height) = getimagesize($src_file);
}
if ( $src && $width && $height )
@@ -518,6 +619,12 @@ function wp_get_attachment_image_src($attachment_id, $size='thumbnail', $icon =
/**
* Get an HTML img element representing an image attachment
*
+ * While $size will accept an array, it is better to register a size with
+ * add_image_size() so that a cropped version is generated. It's much more
+ * efficient than having to find the closest-sized image and then having the
+ * browser scale down the image.
+ *
+ * @see add_image_size()
* @uses apply_filters() Calls 'wp_get_attachment_image_attributes' hook on attributes array
* @uses wp_get_attachment_image_src() Gets attachment file URL and dimensions
* @since 2.5.0
@@ -527,7 +634,7 @@ function wp_get_attachment_image_src($attachment_id, $size='thumbnail', $icon =
* @param bool $icon Optional, default is false. Whether it is an icon.
* @return string HTML img element or empty string on failure.
*/
-function wp_get_attachment_image($attachment_id, $size = 'thumbnail', $icon = false) {
+function wp_get_attachment_image($attachment_id, $size = 'thumbnail', $icon = false, $attr = '') {
$html = '';
$image = wp_get_attachment_image_src($attachment_id, $size, $icon);
@@ -537,12 +644,18 @@ function wp_get_attachment_image($attachment_id, $size = 'thumbnail', $icon = fa
if ( is_array($size) )
$size = join('x', $size);
$attachment =& get_post($attachment_id);
- $attr = array(
+ $default_attr = array(
'src' => $src,
'class' => "attachment-$size",
- 'alt' => trim(strip_tags( $attachment->post_excerpt )),
+ 'alt' => trim(strip_tags( get_post_meta($attachment_id, '_wp_attachment_image_alt', true) )), // Use Alt field first
'title' => trim(strip_tags( $attachment->post_title )),
- );
+ );
+ if ( empty($default_attr['alt']) )
+ $default_attr['alt'] = trim(strip_tags( $attachment->post_excerpt )); // If not, Use the Caption
+ if ( empty($default_attr['alt']) )
+ $default_attr['alt'] = trim(strip_tags( $attachment->post_title )); // Finally, use the title
+
+ $attr = wp_parse_args($attr, $default_attr);
$attr = apply_filters( 'wp_get_attachment_image_attributes', $attr, $attachment );
$attr = array_map( 'esc_attr', $attr );
$html = rtrim("
'dt',
'captiontag' => 'dd',
'columns' => 3,
- 'size' => 'thumbnail'
+ 'size' => 'thumbnail',
+ 'include' => '',
+ 'exclude' => ''
), $attr));
$id = intval($id);
- $attachments = get_children( array('post_parent' => $id, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $order, 'orderby' => $orderby) );
+ if ( 'RAND' == $order )
+ $orderby = 'none';
+
+ if ( !empty($include) ) {
+ $include = preg_replace( '/[^0-9,]+/', '', $include );
+ $_attachments = get_posts( array('include' => $include, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $order, 'orderby' => $orderby) );
+
+ $attachments = array();
+ foreach ( $_attachments as $key => $val ) {
+ $attachments[$val->ID] = $_attachments[$key];
+ }
+ } elseif ( !empty($exclude) ) {
+ $exclude = preg_replace( '/[^0-9,]+/', '', $exclude );
+ $attachments = get_children( array('post_parent' => $id, 'exclude' => $exclude, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $order, 'orderby' => $orderby) );
+ } else {
+ $attachments = get_children( array('post_parent' => $id, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $order, 'orderby' => $orderby) );
+ }
if ( empty($attachments) )
return '';
@@ -656,19 +819,23 @@ function gallery_shortcode($attr) {
$captiontag = tag_escape($captiontag);
$columns = intval($columns);
$itemwidth = $columns > 0 ? floor(100/$columns) : 100;
+ $float = is_rtl() ? 'right' : 'left';
$selector = "gallery-{$instance}";
- $output = apply_filters('gallery_style', "
+ $gallery_style = $gallery_div = '';
+ if ( apply_filters( 'use_default_gallery_style', true ) )
+ $gallery_style = "
-
-