Changeset 26645 for trunk/src/wp-includes/class-wp-image-editor.php

Timestamp:

12/04/2013 10:48:45 PM (11 years ago)

Author:

nacin

Message:

Improvements to image quality handling in the image editor classes.

props markoheijnen, DH-Shredder.
fixes #25721.

File:

• trunk/src/wp-includes/class-wp-image-editor.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp-image-editor.php

@@ -206 +206 @@
      *
      * @param int $quality Compression Quality. Range: [1,100]
-     * @return boolean
-     */
-    public function set_quality( $quality ) {
+     * @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 quality setting.
@@ -214 +218 @@
          * @since 3.5.0
          *
-         * @param int $quality Quality level between 0 (low) and 100 (high).
+         * @param int $quality Quality level between 1 (low) and 100 (high).
          */
-        $this->quality = apply_filters( 'wp_editor_set_quality', $quality );
-
-        return ( (bool) $this->quality );
+        $quality = apply_filters( 'wp_editor_set_quality', $quality, $this->mime_type );
+
+        /**
+         * Filter the JPEG quality for backwards compatibilty.
+         *
+         * @since 2.5.0
+         *
+         * @param int $quality Quality level between 0 (low) and 100 (high) of the JPEG.
+         * @param string The context of the filter.
+         */
+        if ( 'image/jpeg' == $this->mime_type ) {
+            $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 >= 1 ) && ( $quality <= 100 ) ){
+            $this->quality = $quality;
+            return true;
+        } else {
+            return new WP_Error( 'invalid_image_quality', __('Attempted to set image quality outside of the range [1,100].') );
+        }
     }