Changeset 15346 for extensions/Histogram/hgram_histogram.class.inc.php

Timestamp:

May 27, 2012, 2:06:02 PM (12 years ago)

Author:

grum

Message:

feature:2640 - Compatibility with Piwigo 2.4

File:

• extensions/Histogram/hgram_histogram.class.inc.php (modified) (3 diffs)

extensions/Histogram/hgram_histogram.class.inc.php

@@ -18 +18 @@
 if(!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
+define('MAX_PIXELS_ANALYZED', 1000000);
 
 
@@ -92 +93 @@
         $imageHeight=imagesy($image);
 
+
+        $ratio=1;
+        $nbPixels=$imageWidth*$imageHeight;
+        if($nbPixels>MAX_PIXELS_ANALYZED) $ratio=$nbPixels/MAX_PIXELS_ANALYZED;
+
+        $imageWorkWidth=round($imageWidth/$ratio,0);
+        $imageWorkHeight=round($imageHeight/$ratio,0);
+        $imageWork=imagecreatetruecolor($imageWorkWidth,$imageWorkHeight);
+        imagecopyresampled($imageWork, $image, 0, 0, 0, 0, $imageWorkWidth, $imageWorkHeight, $imageWidth, $imageHeight);
+        //imagecopyresized($imageWork, $image, 0, 0, 0, 0, $imageWorkWidth, $imageWorkHeight, $imageWidth, $imageHeight);
+        imagedestroy($image);
+
         $i=0;
-        for($px=0;$px<$imageWidth;$px++)
-        {
-          for($py=0;$py<$imageHeight;$py++)
+        for($px=0;$px<$imageWorkWidth;$px++)
+        {
+          for($py=0;$py<$imageWorkHeight;$py++)
           {
             $i++;
-            $value=imagecolorat($image, $px, $py);
+            $value=imagecolorat($imageWork, $px, $py);
 
             $rgb=self::IntToRGB($value);
@@ -116 +129 @@
         }
 
-        imagedestroy($image);
+        imagedestroy($imageWork);
 
         self::$fileHistogram=Array(
-          'pixels'   => $imageWidth*$imageHeight,
+          'pixels'   => $imageWorkWidth*$imageWorkHeight,
           'analyzed' => $i,
           'time'     => microtime(true)-$time,