mirror/intervention_image
1
0
Fork 0
mirror of https://github.com/Intervention/image.git synced 2025-09-02 02:12:37 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:Intervention/image

Browse Source
This commit is contained in:
Oliver Vogel
2014-04-09 16:47:58 +02:00
parent cedb085cdc 2559487678
commit 517d9ba467
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Intervention/Image/Image.php
View File

@@ -1207,6 +1207,7 @@ class Image
* @param integer $pos_y * @param integer $pos_y
* @param integer $width * @param integer $width
* @param integer $height * @param integer $height
* @param boolean $filled
* @return Image * @return Image
*/ */
public function ellipse($color, $pos_x = 0, $pos_y = 0, $width = 10, $height = 10, $filled = true) public function ellipse($color, $pos_x = 0, $pos_y = 0, $width = 10, $height = 10, $filled = true)
@@ -1238,9 +1239,9 @@ class Image
* @param string $text * @param string $text
* @param integer $posx * @param integer $posx
* @param integer $posy * @param integer $posy
* @param integer $angle * @param mixed $size_or_callback
* @param integer $size
* @param string $color * @param string $color
* @param integer $angle
* @param string $fontfile * @param string $fontfile
* @return Image * @return Image
*/ */