The "thread" table isn't used anymore

[friendica.git] / src / Object / Image.php

diff --git a/src/Object/Image.php b/src/Object/Image.php
index fd4713b3395feea2c98fe46d0fa61c0c46a26c35..d69b01ad4d9e016180cca7916f2d4178116b2565 100644 (file)
--- a/src/Object/Image.php
+++ b/src/Object/Image.php
@@ -1,13 +1,27 @@
 <?php
 /**
- * @file src/Object/Image.php
- * This file contains the Image class for image processing
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica\Object;
 
 use Exception;
-use Friendica\Core\Config;
-use Friendica\Core\System;
 use Friendica\DI;
 use Friendica\Util\Images;
 use Imagick;
@@ -58,6 +72,7 @@ class Image
 
        /**
         * Destructor
+        *
         * @return void
         */
        public function __destruct()
@@ -107,14 +122,18 @@ class Image
                        $this->image->setFormat($format);
 
                        // Always coalesce, if it is not a multi-frame image it won't hurt anyway
-                       $this->image = $this->image->coalesceImages();
+                       try {
+                               $this->image = $this->image->coalesceImages();
+                       } catch (Exception $e) {
+                               return false;
+                       }
 
                        /*
                         * setup the compression here, so we'll do it only once
                         */
                        switch ($this->getType()) {
                                case "image/png":
-                                       $quality = Config::get('system', 'png_quality');
+                                       $quality = DI::config()->get('system', 'png_quality');
                                        if ((! $quality) || ($quality > 9)) {
                                                $quality = PNG_QUALITY;
                                        }
@@ -130,7 +149,7 @@ class Image
                                        $this->image->setCompressionQuality($quality);
                                        break;
                                case "image/jpeg":
-                                       $quality = Config::get('system', 'jpeg_quality');
+                                       $quality = DI::config()->get('system', 'jpeg_quality');
                                        if ((! $quality) || ($quality > 100)) {
                                                $quality = JPEG_QUALITY;
                                        }
@@ -440,7 +459,6 @@ class Image
                                break;
                }
 
-               //      Logger::log('exif: ' . print_r($exif,true));
                return $exif;
        }
 
@@ -610,7 +628,7 @@ class Image
 
                $stamp1 = microtime(true);
                file_put_contents($path, $string);
-               DI::profiler()->saveTimestamp($stamp1, "file", System::callstack());
+               DI::profiler()->saveTimestamp($stamp1, "file");
        }
 
        /**
@@ -651,14 +669,14 @@ class Image
 
                switch ($this->getType()) {
                        case "image/png":
-                               $quality = Config::get('system', 'png_quality');
+                               $quality = DI::config()->get('system', 'png_quality');
                                if ((!$quality) || ($quality > 9)) {
                                        $quality = PNG_QUALITY;
                                }
                                imagepng($this->image, null, $quality);
                                break;
                        case "image/jpeg":
-                               $quality = Config::get('system', 'jpeg_quality');
+                               $quality = DI::config()->get('system', 'jpeg_quality');
                                if ((!$quality) || ($quality > 100)) {
                                        $quality = JPEG_QUALITY;
                                }
@@ -672,6 +690,7 @@ class Image
 
        /**
         * supported mimetypes and corresponding file extensions
+        *
         * @return array
         * @deprecated in version 2019.12 please use Util\Images::supportedTypes() instead.
         */
@@ -682,6 +701,7 @@ class Image
 
        /**
         * Maps Mime types to Imagick formats
+        *
         * @return array With with image formats (mime type as key)
         * @deprecated in version 2019.12 please use Util\Images::getFormatsMap() instead.
         */
@@ -690,22 +710,6 @@ class Image
                return Images::getFormatsMap();
        }
 
-       /**
-        * Guess image mimetype from filename or from Content-Type header
-        *
-        * @param string  $filename Image filename
-        * @param boolean $fromcurl Check Content-Type header from curl request
-        * @param string  $header   passed headers to take into account
-        *
-        * @return string|null
-        * @throws Exception
-        * @deprecated in version 2019.12 please use Util\Images::guessType() instead.
-        */
-       public static function guessType($filename, $fromcurl = false, $header = '')
-       {
-               return Images::guessType($filename, $fromcurl, $header);
-       }
-
        /**
         * @param string $url url
         * @return array