|
|
@@ -109,11 +109,18 @@ class Image
|
|
|
public function waterMark($filePath, $waterText, $alpha = 30, $type = 0, $waterText2 = '', $width = 0, $height = 0)
|
|
|
{
|
|
|
// 创建图片资源
|
|
|
- $image = imagecreatefromjpeg($filePath);
|
|
|
+ $image_info = getimagesize($filePath);
|
|
|
+ $image_type = $image_info[2];
|
|
|
+ if ($image_type == IMAGETYPE_JPEG) {
|
|
|
+ $image = imagecreatefromjpeg($filePath);
|
|
|
+ // 处理JPEG图片的逻辑
|
|
|
+ } elseif ($image_type == IMAGETYPE_PNG) {
|
|
|
+ $image = imagecreatefrompng($filePath);
|
|
|
+ // 处理PNG图片的逻辑
|
|
|
+ }
|
|
|
if (!$image) {
|
|
|
return false;
|
|
|
}
|
|
|
-
|
|
|
// 获取图片尺寸
|
|
|
$width = imagesx($image);
|
|
|
$height = imagesy($image);
|
