WordPress 4.3

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

diff --git a/wp-includes/class-wp-image-editor-gd.php b/wp-includes/class-wp-image-editor-gd.php
index 371552c28c14b468b2475af0be8f19477e6a33dc..53f083782acb216efc67388db7726db26aa667ab 100644 (file)
--- a/wp-includes/class-wp-image-editor-gd.php
+++ b/wp-includes/class-wp-image-editor-gd.php
@@ -16,9 +16,12 @@
  */
 class WP_Image_Editor_GD extends WP_Image_Editor {
        /**
  */
 class WP_Image_Editor_GD extends WP_Image_Editor {
        /**

+        * GD Resource.
+        *
+        * @access protected

         * @var resource
         */
         * @var resource
         */

-       protected $image; // GD Resource
+       protected $image;

 
        public function __destruct() {
                if ( $this->image ) {
 
        public function __destruct() {
                if ( $this->image ) {


@@ -31,9 +34,12 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
         * Checks to see if current environment supports GD.
         *
         * @since 3.5.0
         * Checks to see if current environment supports GD.
         *
         * @since 3.5.0

+        *
+        * @static

         * @access public
         *
         * @access public
         *

-        * @return boolean
+        * @param array $args
+        * @return bool

         */
        public static function test( $args = array() ) {
                if ( ! extension_loaded('gd') || ! function_exists('gd_info') )
         */
        public static function test( $args = array() ) {
                if ( ! extension_loaded('gd') || ! function_exists('gd_info') )


@@ -54,10 +60,12 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
         * Checks to see if editor supports the mime-type specified.
         *
         * @since 3.5.0
         * Checks to see if editor supports the mime-type specified.
         *
         * @since 3.5.0

+        *
+        * @static

         * @access public
         *
         * @param string $mime_type
         * @access public
         *
         * @param string $mime_type

-        * @return boolean
+        * @return bool

         */
        public static function supports_mime_type( $mime_type ) {
                $image_types = imagetypes();
         */
        public static function supports_mime_type( $mime_type ) {
                $image_types = imagetypes();


@@ -79,7 +87,7 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
         * @since 3.5.0
         * @access protected
         *
         * @since 3.5.0
         * @access protected
         *

-        * @return boolean|WP_Error True if loaded successfully; WP_Error on failure.
+        * @return bool|WP_Error True if loaded successfully; WP_Error on failure.

         */
        public function load() {
                if ( $this->image )
         */
        public function load() {
                if ( $this->image )


@@ -127,6 +135,7 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
         *
         * @param int $width
         * @param int $height
         *
         * @param int $width
         * @param int $height

+        * @return true

         */
        protected function update_size( $width = false, $height = false ) {
                if ( ! $width )
         */
        protected function update_size( $width = false, $height = false ) {
                if ( ! $width )


@@ -151,8 +160,8 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
         *
         * @param  int|null $max_w Image width.
         * @param  int|null $max_h Image height.
         *
         * @param  int|null $max_w Image width.
         * @param  int|null $max_h Image height.

-        * @param  boolean  $crop
-        * @return boolean|WP_Error
+        * @param  bool     $crop
+        * @return true|WP_Error

         */
        public function resize( $max_w, $max_h, $crop = false ) {
                if ( ( $this->size['width'] == $max_w ) && ( $this->size['height'] == $max_h ) )
         */
        public function resize( $max_w, $max_h, $crop = false ) {
                if ( ( $this->size['width'] == $max_w ) && ( $this->size['height'] == $max_h ) )


@@ -171,6 +180,13 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
                return new WP_Error( 'image_resize_error', __('Image resize failed.'), $this->file );
        }
 
                return new WP_Error( 'image_resize_error', __('Image resize failed.'), $this->file );
        }
 

+       /**
+        *
+        * @param int $max_w
+        * @param int $max_h
+        * @param bool|array $crop
+        * @return resource|WP_Error
+        */

        protected function _resize( $max_w, $max_h, $crop = false ) {
                $dims = image_resize_dimensions( $this->size['width'], $this->size['height'], $max_w, $max_h, $crop );
                if ( ! $dims ) {
        protected function _resize( $max_w, $max_h, $crop = false ) {
                $dims = image_resize_dimensions( $this->size['width'], $this->size['height'], $max_w, $max_h, $crop );
                if ( ! $dims ) {


@@ -256,14 +272,14 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
         * @since 3.5.0
         * @access public
         *
         * @since 3.5.0
         * @access public
         *

-        * @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.
-        * @param int $src_h The height to crop.
-        * @param int $dst_w Optional. The destination width.
-        * @param int $dst_h Optional. The destination height.
-        * @param boolean $src_abs Optional. If the source crop points are absolute.
-        * @return boolean|WP_Error
+        * @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.
+        * @param int  $src_h   The height to crop.
+        * @param int  $dst_w   Optional. The destination width.
+        * @param int  $dst_h   Optional. The destination height.
+        * @param bool $src_abs Optional. If the source crop points are absolute.
+        * @return bool|WP_Error

         */
        public function crop( $src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false ) {
                // If destination width/height isn't specified, use same as
         */
        public function crop( $src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false ) {
                // If destination width/height isn't specified, use same as


@@ -303,7 +319,7 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
         * @access public
         *
         * @param float $angle
         * @access public
         *
         * @param float $angle

-        * @return boolean|WP_Error
+        * @return true|WP_Error

         */
        public function rotate( $angle ) {
                if ( function_exists('imagerotate') ) {
         */
        public function rotate( $angle ) {
                if ( function_exists('imagerotate') ) {


@@ -328,9 +344,9 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
         * @since 3.5.0
         * @access public
         *
         * @since 3.5.0
         * @access public
         *

-        * @param boolean $horz Flip along Horizontal Axis
-        * @param boolean $vert Flip along Vertical Axis
-        * @returns boolean|WP_Error
+        * @param bool $horz Flip along Horizontal Axis
+        * @param bool $vert Flip along Vertical Axis
+        * @return true|WP_Error

         */
        public function flip( $horz, $vert ) {
                $w = $this->size['width'];
         */
        public function flip( $horz, $vert ) {
                $w = $this->size['width'];


@@ -433,6 +449,7 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
         * @access public
         *
         * @param string $mime_type
         * @access public
         *
         * @param string $mime_type

+        * @return bool

         */
        public function stream( $mime_type = null ) {
                list( $filename, $extension, $mime_type ) = $this->get_output_format( null, $mime_type );
         */
        public function stream( $mime_type = null ) {
                list( $filename, $extension, $mime_type ) = $this->get_output_format( null, $mime_type );


@@ -459,7 +476,7 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
         * @param string|stream $filename
         * @param callable $function
         * @param array $arguments
         * @param string|stream $filename
         * @param callable $function
         * @param array $arguments

-        * @return boolean
+        * @return bool

         */
        protected function make_image( $filename, $function, $arguments ) {
                if ( wp_is_stream( $filename ) )
         */
        protected function make_image( $filename, $function, $arguments ) {
                if ( wp_is_stream( $filename ) )