質問編集履歴
1
メソッドの処理を変更
test
CHANGED
|
File without changes
|
test
CHANGED
|
@@ -118,30 +118,6 @@
|
|
|
118
118
|
|
|
119
119
|
list($originalWidth, $originalHeight, $type) = getimagesize($srcPath);
|
|
120
120
|
|
|
121
|
-
$diffW = '';
|
|
122
|
-
|
|
123
|
-
$diffH = '';
|
|
124
|
-
|
|
125
|
-
if($originalWidth > $originalHeight){
|
|
126
|
-
|
|
127
|
-
$diffW = $originalHeight;
|
|
128
|
-
|
|
129
|
-
$diffH = $originalHeight;
|
|
130
|
-
|
|
131
|
-
}elseif($originalWidth < $originalHeight){
|
|
132
|
-
|
|
133
|
-
$diffW = $originalWidth;
|
|
134
|
-
|
|
135
|
-
$diffH = $originalWidth;
|
|
136
|
-
|
|
137
|
-
}elseif($originalWidth === $originalHeight){
|
|
138
|
-
|
|
139
|
-
$diffW = $originalWidth;
|
|
140
|
-
|
|
141
|
-
$diffH = $originalHeight;
|
|
142
|
-
|
|
143
|
-
}
|
|
144
|
-
|
|
145
121
|
switch ($type) {
|
|
146
122
|
|
|
147
123
|
case IMAGETYPE_JPEG:
|
|
@@ -174,9 +150,7 @@
|
|
|
174
150
|
|
|
175
151
|
|
|
176
152
|
|
|
177
|
-
|
|
153
|
+
imagecopyresampled($canvas, $source, 0, 0, 0, 0, $width, $height, $originalWidth, $originalHeight);
|
|
178
|
-
|
|
179
|
-
imagecopyresampled($canvas, $source, 0, 0, 0, 0, $width, $height, $diffW, $diffH);
|
|
180
154
|
|
|
181
155
|
imagejpeg($canvas, $dstPath, 100);
|
|
182
156
|
|
|
@@ -188,6 +162,8 @@
|
|
|
188
162
|
|
|
189
163
|
|
|
190
164
|
|
|
165
|
+
|
|
166
|
+
|
|
191
167
|
/* ----------------------------------------------------------
|
|
192
168
|
|
|
193
169
|
* 内接サイズを計算する
|
|
@@ -240,30 +216,26 @@
|
|
|
240
216
|
|
|
241
217
|
list($originalWidth, $originalHeight) = getimagesize($srcPath);
|
|
242
218
|
|
|
219
|
+
if ($maxWidth > $originalWidth && $maxHeight > $originalHeight) {
|
|
220
|
+
|
|
221
|
+
copy($srcPath, $dstPath);
|
|
222
|
+
|
|
223
|
+
return;
|
|
224
|
+
|
|
225
|
+
}
|
|
226
|
+
|
|
227
|
+
|
|
228
|
+
|
|
243
229
|
list($canvasWidth, $canvasHeight) = getContainSize($originalWidth, $originalHeight, $maxWidth, $maxHeight);
|
|
244
230
|
|
|
245
231
|
|
|
246
232
|
|
|
247
|
-
// 元画像がリサイズするサイズより小さいときは元画像を使う
|
|
248
|
-
|
|
249
|
-
if($canvasWidth >= $originalWidth){
|
|
250
|
-
|
|
251
|
-
$canvasWidth = $originalWidth;
|
|
252
|
-
|
|
253
|
-
}
|
|
254
|
-
|
|
255
|
-
if($canvasHeight >= $originalWidth){
|
|
256
|
-
|
|
257
|
-
$canvasHeight = $originalHeight;
|
|
258
|
-
|
|
259
|
-
}
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
233
|
transformImageSize($srcPath, $dstPath, $canvasWidth, $canvasHeight);
|
|
264
234
|
|
|
265
235
|
}
|
|
266
236
|
|
|
267
237
|
|
|
268
238
|
|
|
239
|
+
|
|
240
|
+
|
|
269
241
|
```
|