← All changes
|
modules/optimization/components/avif-compatibility.php
+4
-24
1.5.1
→
1.7.7
View file →
| @@ -1,10 +1,9 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | namespace ImageOptimization\Modules\Optimization\Components; |
| 4 | 4 | |
| 5 | -use ImageOptimization\Classes\Logger; | |
| 6 | -use Throwable; | |
| 5 | +use ImageOptimization\Classes\Image\Image_Dimensions; | |
| 7 | 6 | |
| 8 | 7 | if ( ! defined( 'ABSPATH' ) ) { |
| 9 | 8 | exit; // Exit if accessed directly. |
| 10 | 9 | } |
| @@ -51,15 +50,12 @@ | ||
| 51 | 50 | if ( ! $file ) { |
| 52 | 51 | return $metadata; |
| 53 | 52 | } |
| 54 | 53 | |
| 55 | - if ( empty( $metadata['width'] ) ) { | |
| 56 | - $metadata['width'] = 0; | |
| 57 | - } | |
| 54 | + $dimensions = Image_Dimensions::get_by_path( $file ); | |
| 58 | 55 | |
| 59 | - if ( empty( $metadata['height'] ) ) { | |
| 60 | - $metadata['height'] = 0; | |
| 61 | - } | |
| 56 | + $metadata['width'] = $dimensions->width; | |
| 57 | + $metadata['height'] = $dimensions->height; | |
| 62 | 58 | |
| 63 | 59 | if ( empty( $metadata['file'] ) ) { |
| 64 | 60 | $metadata['file'] = _wp_relative_upload_path( $file ); |
| 65 | 61 | } |
| @@ -65,24 +61,8 @@ | ||
| 65 | 61 | } |
| 66 | 62 | |
| 67 | 63 | if ( empty( $metadata['sizes'] ) ) { |
| 68 | 64 | $metadata['sizes'] = []; |
| 69 | - } | |
| 70 | - | |
| 71 | - if ( class_exists( 'Imagick' ) ) { | |
| 72 | - try { | |
| 73 | - $im = new \Imagick( $file ); | |
| 74 | - $image_geometry = $im->getImageGeometry(); | |
| 75 | - $im->clear(); | |
| 76 | - | |
| 77 | - $metadata['width'] = $image_geometry['width']; | |
| 78 | - $metadata['height'] = $image_geometry['height']; | |
| 79 | - } catch ( Throwable $t ) { | |
| 80 | - Logger::log( | |
| 81 | - Logger::LEVEL_ERROR, | |
| 82 | - 'AVIF image dimensions calculation error: ' . $t->getMessage() | |
| 83 | - ); | |
| 84 | - } | |
| 85 | 65 | } |
| 86 | 66 | |
| 87 | 67 | return $metadata; |
| 88 | 68 | } |