mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-05 14:52:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

PSR规范调整

Browse Source
This commit is contained in:
thinkphp
2015-10-04 13:05:15 +08:00
parent 1cfb3704c6
commit 27e724bb3c
135 changed files with 9426 additions and 11556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
library/org/image.php
View File

@@ -12,22 +12,22 @@
namespace think;
/* 缩略图相关常量定义 */
define('THINKIMAGE_THUMB_SCALING', 1); //常量，标识缩略图等比例缩放类型
define('THINKIMAGE_THUMB_FILLED', 2); //常量，标识缩略图缩放后填充类型
define('THINKIMAGE_THUMB_CENTER', 3); //常量，标识缩略图居中裁剪类型
define('THINKIMAGE_THUMB_SCALING', 1); //常量，标识缩略图等比例缩放类型
define('THINKIMAGE_THUMB_FILLED', 2); //常量，标识缩略图缩放后填充类型
define('THINKIMAGE_THUMB_CENTER', 3); //常量，标识缩略图居中裁剪类型
define('THINKIMAGE_THUMB_NORTHWEST', 4); //常量，标识缩略图左上角裁剪类型
define('THINKIMAGE_THUMB_SOUTHEAST', 5); //常量，标识缩略图右下角裁剪类型
define('THINKIMAGE_THUMB_FIXED', 6); //常量，标识缩略图固定尺寸缩放类型
define('THINKIMAGE_THUMB_FIXED', 6); //常量，标识缩略图固定尺寸缩放类型
/* 水印相关常量定义 */
define('THINKIMAGE_WATER_NORTHWEST', 1); //常量，标识左上角水印
define('THINKIMAGE_WATER_NORTH', 2); //常量，标识上居中水印
define('THINKIMAGE_WATER_NORTH', 2); //常量，标识上居中水印
define('THINKIMAGE_WATER_NORTHEAST', 3); //常量，标识右上角水印
define('THINKIMAGE_WATER_WEST', 4); //常量，标识左居中水印
define('THINKIMAGE_WATER_CENTER', 5); //常量，标识居中水印
define('THINKIMAGE_WATER_EAST', 6); //常量，标识右居中水印
define('THINKIMAGE_WATER_WEST', 4); //常量，标识左居中水印
define('THINKIMAGE_WATER_CENTER', 5); //常量，标识居中水印
define('THINKIMAGE_WATER_EAST', 6); //常量，标识右居中水印
define('THINKIMAGE_WATER_SOUTHWEST', 7); //常量，标识左下角水印
define('THINKIMAGE_WATER_SOUTH', 8); //常量，标识下居中水印
define('THINKIMAGE_WATER_SOUTH', 8); //常量，标识下居中水印
define('THINKIMAGE_WATER_SOUTHEAST', 9); //常量，标识右下角水印
/**
@@ -35,7 +35,8 @@ define('THINKIMAGE_WATER_SOUTHEAST', 9); //常量，标识右下角水印
* 目前支持GD库和imagick
* @author 麦当苗儿 <zuojiazi.cn@gmail.com>
*/
class Image {
class Image
{
/**
* 图片资源
* @var resource
@@ -46,15 +47,17 @@ class Image {
* 初始化方法，用于实例化一个图片处理对象
* @param string $type 要使用的类库，默认使用GD库
*/
static public function init($type = 'Gd', $imgname = null){
public static function init($type = 'Gd', $imgname = null)
{
/* 引入处理库，实例化图片处理对象 */
$class = '\\think\\image\\driver\\'.strtolower($type);
$class = '\\think\\image\\driver\\' . strtolower($type);
self::$im = new $class($imgname);
return self::$im;
}
// 调用驱动类的方法
static public function __callStatic($method, $params){
public static function __callStatic($method, $params)
{
self::$im || self::init();
return call_user_func_array([self::$im, $method], $params);
}