X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/1c09677af04c9e37714e09b73eb9dbc5b2e3eb13..ebf9bbbbf2dbd59c653bbec4ed90d2947a95b9e7:/wp-admin/includes/image.php

diff --git a/wp-admin/includes/image.php b/wp-admin/includes/image.php
index 903bd5fe..44329c01 100644
--- a/wp-admin/includes/image.php
+++ b/wp-admin/includes/image.php
@@ -17,9 +17,12 @@
  *
  * @param mixed $file Filename of the original image, Or attachment id.
  * @param int $max_side Maximum length of a single side for the thumbnail.
+ * @param mixed $deprecated Never used.
  * @return string Thumbnail path on success, Error string on failure.
  */
 function wp_create_thumbnail( $file, $max_side, $deprecated = '' ) {
+	if ( !empty( $deprecated ) )
+		_deprecated_argument( __FUNCTION__, '1.2' );
 	$thumbpath = image_resize( $file, $max_side, $max_side );
 	return apply_filters( 'wp_create_thumbnail', $thumbpath );
 }
@@ -38,7 +41,7 @@ function wp_create_thumbnail( $file, $max_side, $deprecated = '' ) {
  * @param int $dst_h The destination height.
  * @param int $src_abs Optional. If the source crop points are absolute.
  * @param string $dst_file Optional. The destination file to write to.
- * @return string New filepath on success, String error message on failure.
+ * @return string|WP_Error|false New filepath on success, WP_Error or false on failure.
  */
 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
@@ -46,8 +49,8 @@ function wp_crop_image( $src_file, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_
 
 	$src = wp_load_image( $src_file );
 
-	if ( !is_resource( $src ))
-		return $src;
+	if ( !is_resource( $src ) )
+		return new WP_Error( 'error_loading_image', $src, $src_file );
 
 	$dst = wp_imagecreatetruecolor( $dst_w, $dst_h );
 
@@ -91,7 +94,7 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) {
 		$imagesize = getimagesize( $file );
 		$metadata['width'] = $imagesize[0];
 		$metadata['height'] = $imagesize[1];
-		list($uwidth, $uheight) = wp_shrink_dimensions($metadata['width'], $metadata['height']);
+		list($uwidth, $uheight) = wp_constrain_dimensions($metadata['width'], $metadata['height'], 128, 96);
 		$metadata['hwstring_small'] = "height='$uheight' width='$uwidth'";
 
 		// Make the file path relative to the upload dir
@@ -99,13 +102,8 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) {
 
 		// make thumbnails and other intermediate sizes
 		global $_wp_additional_image_sizes;
-		$temp_sizes = array('thumbnail', 'medium', 'large'); // Standard sizes
-		if ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) )
-			$temp_sizes = array_merge( $temp_sizes, array_keys( $_wp_additional_image_sizes ) );
 
-		$temp_sizes = apply_filters( 'intermediate_image_sizes', $temp_sizes );
-
-		foreach ( $temp_sizes as $s ) {
+		foreach ( get_intermediate_image_sizes() as $s ) {
 			$sizes[$s] = array( 'width' => '', 'height' => '', 'crop' => FALSE );
 			if ( isset( $_wp_additional_image_sizes[$s]['width'] ) )
 				$sizes[$s]['width'] = intval( $_wp_additional_image_sizes[$s]['width'] ); // For theme-added sizes
@@ -139,62 +137,18 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) {
 	return apply_filters( 'wp_generate_attachment_metadata', $metadata, $attachment_id );
 }
 
-/**
- * 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', '256M');
-	$image = imagecreatefromstring( file_get_contents( $file ) );
-
-	if ( !is_resource( $image ) )
-		return sprintf(__('File “%s” is not an image.'), $file);
-
-	return $image;
-}
-
 /**
  * Calculated the new dimentions for a downsampled image.
  *
  * @since 2.0.0
- * @see wp_shrink_dimensions()
- *
- * @param int $width Current width of the image
- * @param int $height Current height of the image
- * @return mixed Array(height,width) of shrunk dimensions.
- */
-function get_udims( $width, $height) {
-	return wp_shrink_dimensions( $width, $height );
-}
-
-/**
- * Calculates the new dimentions for a downsampled image.
- *
- * @since 2.0.0
  * @see wp_constrain_dimensions()
  *
  * @param int $width Current width of the image
  * @param int $height Current height of the image
- * @param int $wmax Maximum wanted width
- * @param int $hmax Maximum wanted height
  * @return mixed Array(height,width) of shrunk dimensions.
  */
-function wp_shrink_dimensions( $width, $height, $wmax = 128, $hmax = 96 ) {
-	return wp_constrain_dimensions( $width, $height, $wmax, $hmax );
+function get_udims( $width, $height) {
+	return wp_constrain_dimensions( $width, $height, 128, 96 );
 }
 
 /**
@@ -244,10 +198,10 @@ function wp_exif_date2ts($str) {
  * @return bool|array False on failure. Image metadata array on success.
  */
 function wp_read_image_metadata( $file ) {
-	if ( !file_exists( $file ) )
+	if ( ! file_exists( $file ) )
 		return false;
 
-	list(,,$sourceImageType) = getimagesize( $file );
+	list( , , $sourceImageType ) = getimagesize( $file );
 
 	// exif contains a bunch of data we'll probably never need formatted in ways
 	// that are difficult to use. We'll normalize it and just extract the fields
@@ -268,39 +222,83 @@ function wp_read_image_metadata( $file ) {
 
 	// read iptc first, since it might contain data not available in exif such
 	// as caption, description etc
-	if ( is_callable('iptcparse') ) {
-		getimagesize($file, $info);
-		if ( !empty($info['APP13']) ) {
-			$iptc = iptcparse($info['APP13']);
-			if ( !empty($iptc['2#110'][0]) ) // credit
+	if ( is_callable( 'iptcparse' ) ) {
+		getimagesize( $file, $info );
+
+		if ( ! empty( $info['APP13'] ) ) {
+			$iptc = iptcparse( $info['APP13'] );
+
+			// headline, "A brief synopsis of the caption."
+			if ( ! empty( $iptc['2#105'][0] ) )
+				$meta['title'] = utf8_encode( trim( $iptc['2#105'][0] ) );
+			// title, "Many use the Title field to store the filename of the image, though the field may be used in many ways."
+			elseif ( ! empty( $iptc['2#005'][0] ) )
+				$meta['title'] = utf8_encode( trim( $iptc['2#005'][0] ) );
+
+			if ( ! empty( $iptc['2#120'][0] ) ) { // description / legacy caption
+				$caption = utf8_encode( trim( $iptc['2#120'][0] ) );
+				if ( empty( $meta['title'] ) ) {
+					// Assume the title is stored in 2:120 if it's short.
+					if ( strlen( $caption ) < 80 )
+						$meta['title'] = $caption;
+					else
+						$meta['caption'] = $caption;
+				} elseif ( $caption != $meta['title'] ) {
+					$meta['caption'] = $caption;
+				}
+			}
+
+			if ( ! empty( $iptc['2#110'][0] ) ) // credit
 				$meta['credit'] = utf8_encode(trim($iptc['2#110'][0]));
-			elseif ( !empty($iptc['2#080'][0]) ) // byline
+			elseif ( ! empty( $iptc['2#080'][0] ) ) // creator / legacy byline
 				$meta['credit'] = utf8_encode(trim($iptc['2#080'][0]));
-			if ( !empty($iptc['2#055'][0]) and !empty($iptc['2#060'][0]) ) // created date and time
-				$meta['created_timestamp'] = strtotime($iptc['2#055'][0] . ' ' . $iptc['2#060'][0]);
-			if ( !empty($iptc['2#120'][0]) ) // caption
-				$meta['caption'] = utf8_encode(trim($iptc['2#120'][0]));
-			if ( !empty($iptc['2#116'][0]) ) // copyright
-				$meta['copyright'] = utf8_encode(trim($iptc['2#116'][0]));
-			if ( !empty($iptc['2#005'][0]) ) // title
-				$meta['title'] = utf8_encode(trim($iptc['2#005'][0]));
+
+			if ( ! empty( $iptc['2#055'][0] ) and ! empty( $iptc['2#060'][0] ) ) // created date and time
+				$meta['created_timestamp'] = strtotime( $iptc['2#055'][0] . ' ' . $iptc['2#060'][0] );
+
+			if ( ! empty( $iptc['2#116'][0] ) ) // copyright
+				$meta['copyright'] = utf8_encode( trim( $iptc['2#116'][0] ) );
 		 }
 	}
 
 	// fetch additional info from exif if available
-	if ( is_callable('exif_read_data') && in_array($sourceImageType, apply_filters('wp_read_image_metadata_types', array(IMAGETYPE_JPEG, IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM)) ) ) {
+	if ( is_callable( 'exif_read_data' ) && in_array( $sourceImageType, apply_filters( 'wp_read_image_metadata_types', array( IMAGETYPE_JPEG, IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM ) ) ) ) {
 		$exif = @exif_read_data( $file );
-		if (!empty($exif['FNumber']))
+
+		if ( !empty( $exif['Title'] ) )
+			$meta['title'] = utf8_encode( trim( $exif['Title'] ) );
+
+		if ( ! empty( $exif['ImageDescription'] ) ) {
+			if ( empty( $meta['title'] ) && strlen( $exif['ImageDescription'] ) < 80 ) {
+				// Assume the title is stored in ImageDescription
+				$meta['title'] = utf8_encode( trim( $exif['ImageDescription'] ) );
+				if ( ! empty( $exif['COMPUTED']['UserComment'] ) && trim( $exif['COMPUTED']['UserComment'] ) != $meta['title'] )
+					$meta['caption'] = utf8_encode( trim( $exif['COMPUTED']['UserComment'] ) );
+			} elseif ( trim( $exif['ImageDescription'] ) != $meta['title'] ) {
+				$meta['caption'] = utf8_encode( trim( $exif['ImageDescription'] ) );
+			}
+		} elseif ( ! empty( $exif['Comments'] ) && trim( $exif['Comments'] ) != $meta['title'] ) {
+			$meta['caption'] = utf8_encode( trim( $exif['Comments'] ) );
+		}
+
+		if ( ! empty( $exif['Artist'] ) )
+			$meta['credit'] = utf8_encode( trim( $exif['Artist'] ) );
+		elseif ( ! empty($exif['Author'] ) )
+			$meta['credit'] = utf8_encode( trim( $exif['Author'] ) );
+
+		if ( ! empty( $exif['Copyright'] ) )
+			$meta['copyright'] = utf8_encode( trim( $exif['Copyright'] ) );
+		if ( ! empty($exif['FNumber'] ) )
 			$meta['aperture'] = round( wp_exif_frac2dec( $exif['FNumber'] ), 2 );
-		if (!empty($exif['Model']))
-			$meta['camera'] = trim( $exif['Model'] );
-		if (!empty($exif['DateTimeDigitized']))
-			$meta['created_timestamp'] = wp_exif_date2ts($exif['DateTimeDigitized']);
-		if (!empty($exif['FocalLength']))
+		if ( ! empty($exif['Model'] ) )
+			$meta['camera'] = utf8_encode( trim( $exif['Model'] ) );
+		if ( ! empty($exif['DateTimeDigitized'] ) )
+			$meta['created_timestamp'] = wp_exif_date2ts($exif['DateTimeDigitized'] );
+		if ( ! empty($exif['FocalLength'] ) )
 			$meta['focal_length'] = wp_exif_frac2dec( $exif['FocalLength'] );
-		if (!empty($exif['ISOSpeedRatings']))
-			$meta['iso'] = $exif['ISOSpeedRatings'];
-		if (!empty($exif['ExposureTime']))
+		if ( ! empty($exif['ISOSpeedRatings'] ) )
+			$meta['iso'] = utf8_encode( trim( $exif['ISOSpeedRatings'] ) );
+		if ( ! empty($exif['ExposureTime'] ) )
 			$meta['shutter_speed'] = wp_exif_frac2dec( $exif['ExposureTime'] );
 	}