Skip to content

Commit 4e2ea56

Browse files
committed
ImageDestroy()PHP8では、リソースではなくオブジェクトのためPHPバージョンで分岐。
1 parent 85267e2 commit 4e2ea56

File tree

3 files changed

+15
-12
lines changed

3 files changed

+15
-12
lines changed

logconverter/bbsnote2/bbsnote2petit.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ function check_petit ($path) {
351351

352352
//GD版が使えるかチェック
353353
function gd_check(){
354-
$check = array("ImageCreate","ImageCopyResized","ImageCreateFromJPEG","ImageJPEG","ImageDestroy");
354+
$check = array("ImageCreate","ImageCopyResized","ImageCreateFromJPEG","ImageJPEG");
355355

356356
//最低限のGD関数が使えるかチェック
357357
if(get_gd_ver() && (ImageTypes() & IMG_JPG)){
@@ -525,9 +525,10 @@ function thumb($path,$fname,$time,$max_w,$max_h,$options=[]){
525525
ImageJPEG($im_out, $outfile,90);
526526
}
527527
// 作成したイメージを破棄
528-
ImageDestroy($im_in);
529-
ImageDestroy($im_out);
530-
528+
if(PHP_VERSION_ID < 80000) {//PHP8.0未満の時は
529+
ImageDestroy($im_in);
530+
ImageDestroy($im_out);
531+
}
531532
if(!chmod($outfile,PERMISSION_FOR_DEST)){
532533
return;
533534
}

logconverter/poti2/poti2petit.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ function is_neo($src) {//neoのPCHかどうか調べる
329329

330330
//GD版が使えるかチェック
331331
function gd_check(){
332-
$check = array("ImageCreate","ImageCopyResized","ImageCreateFromJPEG","ImageJPEG","ImageDestroy");
332+
$check = array("ImageCreate","ImageCopyResized","ImageCreateFromJPEG","ImageJPEG");
333333

334334
//最低限のGD関数が使えるかチェック
335335
if(get_gd_ver() && (ImageTypes() & IMG_JPG)){
@@ -487,9 +487,10 @@ function thumb($path,$fname,$time,$max_w,$max_h,$options=[]){
487487
ImageJPEG($im_out, $outfile,90);
488488
}
489489
// 作成したイメージを破棄
490-
ImageDestroy($im_in);
491-
ImageDestroy($im_out);
492-
490+
if(PHP_VERSION_ID < 80000) {//PHP8.0未満の時は
491+
ImageDestroy($im_in);
492+
ImageDestroy($im_out);
493+
}
493494
if(!chmod($outfile,PERMISSION_FOR_DEST)){
494495
return;
495496
}

logexporter/petit2poti/petit2poti.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ function check_pch_ext ($filepath) {
297297

298298
//GD版が使えるかチェック
299299
function gd_check(){
300-
$check = array("ImageCreate","ImageCopyResized","ImageCreateFromJPEG","ImageJPEG","ImageDestroy");
300+
$check = array("ImageCreate","ImageCopyResized","ImageCreateFromJPEG","ImageJPEG");
301301

302302
//最低限のGD関数が使えるかチェック
303303
if(get_gd_ver() && (ImageTypes() & IMG_JPG)){
@@ -455,9 +455,10 @@ function thumb($path,$fname,$time,$max_w,$max_h,$options=[]){
455455
ImageJPEG($im_out, $outfile,90);
456456
}
457457
// 作成したイメージを破棄
458-
ImageDestroy($im_in);
459-
ImageDestroy($im_out);
460-
458+
if(PHP_VERSION_ID < 80000) {//PHP8.0未満の時は
459+
ImageDestroy($im_in);
460+
ImageDestroy($im_out);
461+
}
461462
if(!chmod($outfile,PERMISSION_FOR_DEST)){
462463
return;
463464
}

0 commit comments

Comments
 (0)