WordPress 4.2.4-scripts

[autoinstalls/wordpress.git] / wp-includes / class-wp-image-editor.php

diff --git a/wp-includes/class-wp-image-editor.php b/wp-includes/class-wp-image-editor.php
index 5affba48c7f78ae677d7ce4af9cdc5480b7f0ee9..58643d42e431e51431bb8e916cb82cec837dd75a 100644 (file)
--- a/wp-includes/class-wp-image-editor.php
+++ b/wp-includes/class-wp-image-editor.php
@@ -16,7 +16,8 @@ abstract class WP_Image_Editor {
        protected $size = null;
        protected $mime_type = null;
        protected $default_mime_type = 'image/jpeg';
-       protected $quality = 90;
+       protected $quality = false;
+       protected $default_quality = 90;
 
        /**
         * Each instance handles a single file.
@@ -124,7 +125,6 @@ abstract class WP_Image_Editor {
         * @access public
         * @abstract
         *
-        * @param string|int $src The source file or Attachment ID.
         * @param int $src_x The start x position to crop from.
         * @param int $src_y The start y position to crop from.
         * @param int $src_w The width to crop.
@@ -193,6 +193,7 @@ abstract class WP_Image_Editor {
         *
         * @param int $width
         * @param int $height
+        * @return true
         */
        protected function update_size( $width = null, $height = null ) {
                $this->size = array(
@@ -202,6 +203,22 @@ abstract class WP_Image_Editor {
                return true;
        }
 
+       /**
+        * Gets the Image Compression quality on a 1-100% scale.
+        *
+        * @since 4.0.0
+        * @access public
+        *
+        * @return int $quality Compression Quality. Range: [1,100]
+        */
+       public function get_quality() {
+               if ( ! $this->quality ) {
+                       $this->set_quality();
+               }
+
+               return $this->quality;
+       }
+
        /**
         * Sets Image Compression quality on a 1-100% scale.
         *
@@ -212,41 +229,53 @@ abstract class WP_Image_Editor {
         * @return boolean|WP_Error True if set successfully; WP_Error on failure.
         */
        public function set_quality( $quality = null ) {
-               if ( $quality == null ) {
-                       $quality = $this->quality;
-               }
-
-               /**
-                * Filter the default image compression quality setting.
-                *
-                * @since 3.5.0
-                *
-                * @param int    $quality   Quality level between 1 (low) and 100 (high).
-                * @param string $mime_type Image mime type.
-                */
-               $quality = apply_filters( 'wp_editor_set_quality', $quality, $this->mime_type );
-
-               if ( 'image/jpeg' == $this->mime_type ) {
+               if ( null === $quality ) {
                        /**
-                        * Filter the JPEG compression quality for backward-compatibility.
+                        * Filter the default image compression quality setting.
+                        *
+                        * Applies only during initial editor instantiation, or when set_quality() is run
+                        * manually without the `$quality` argument.
                         *
-                        * The filter is evaluated under two contexts: 'image_resize', and 'edit_image',
-                        * (when a JPEG image is saved to file).
+                        * set_quality() has priority over the filter.
                         *
-                        * @since 2.5.0
+                        * @since 3.5.0
                         *
-                        * @param int    $quality Quality level between 0 (low) and 100 (high) of the JPEG.
-                        * @param string $context Context of the filter.
+                        * @param int    $quality   Quality level between 1 (low) and 100 (high).
+                        * @param string $mime_type Image mime type.
                         */
-                       $quality = apply_filters( 'jpeg_quality', $quality, 'image_resize' );
+                       $quality = apply_filters( 'wp_editor_set_quality', $this->default_quality, $this->mime_type );
+
+                       if ( 'image/jpeg' == $this->mime_type ) {
+                               /**
+                                * Filter the JPEG compression quality for backward-compatibility.
+                                *
+                                * Applies only during initial editor instantiation, or when set_quality() is run
+                                * manually without the `$quality` argument.
+                                *
+                                * set_quality() has priority over the filter.
+                                *
+                                * The filter is evaluated under two contexts: 'image_resize', and 'edit_image',
+                                * (when a JPEG image is saved to file).
+                                *
+                                * @since 2.5.0
+                                *
+                                * @param int    $quality Quality level between 0 (low) and 100 (high) of the JPEG.
+                                * @param string $context Context of the filter.
+                                */
+                               $quality = apply_filters( 'jpeg_quality', $quality, 'image_resize' );
+                       }
 
-                       // Allow 0, but squash to 1 due to identical images in GD, and for backwards compatibility.
-                       if ( $quality == 0 ) {
-                               $quality = 1;
+                       if ( $quality < 0 || $quality > 100 ) {
+                               $quality = $this->default_quality;
                        }
                }
 
-               if ( ( $quality >= 1 ) && ( $quality <= 100 ) ){
+               // Allow 0, but squash to 1 due to identical images in GD, and for backwards compatibility.
+               if ( 0 === $quality ) {
+                       $quality = 1;
+               }
+
+               if ( ( $quality >= 1 ) && ( $quality <= 100 ) ) {
                        $this->quality = $quality;
                        return true;
                } else {
@@ -270,8 +299,7 @@ abstract class WP_Image_Editor {
         * @return array { filename|null, extension, mime-type }
         */
        protected function get_output_format( $filename = null, $mime_type = null ) {
-               $new_ext = $file_ext = null;
-               $file_mime = null;
+               $new_ext = null;
 
                // By default, assume specified type takes priority
                if ( $mime_type ) {
@@ -360,7 +388,7 @@ abstract class WP_Image_Editor {
         * @since 3.5.0
         * @access public
         *
-        * @return string suffix
+        * @return false|string suffix
         */
        public function get_suffix() {
                if ( ! $this->get_size() )