Changeset 15687 for trunk/inc

Timestamp:

11/21/11 18:35:22 (6 months ago)

Author:

Alexander Trofimov

Message:

Images Transcoder - 'force_jpeg' parameter was changed to 'force_type'

Location:

trunk/inc/classes

Files:

• BxDolImageResize.php (modified) (5 diffs)
• BxDolImageTranscoder.php (modified) (6 diffs)

trunk/inc/classes/BxDolImageResize.php

@@ -35 +35 @@
     var $_isCrop = false;
     var $_cropX, $_cropY, $_cropW, $_cropH;
-    var $_isForceJPGOutput = false; ///< force  jpeg output
+    var $_iForceOutputType = false; ///< force IMAGE_TYPE_PNG, IMAGE_TYPE_PNG, IMAGE_TYPE_GIF or false to keep the original format // TODO: check if this setting works when ImageMagick is used
     var $_iJpegQuality = 75; ///< jpeg quality
     var $_isSquareResize = false; ///< use smart resize, destination image will be exact Width x Height size
@@ -133 +133 @@
     }
 
+
     function setJpegOutput ($b) {
-        $this->_isForceJPGOutput = ($b ? true : false);
+        $this->setOutputType($b ? IMAGE_TYPE_JPG : false);
+    }
+
+    function setOutputType ($iType) {
+        $this->_iForceOutputType = $iType;;
     }
 
@@ -184 +189 @@
             return IMAGE_ERROR_GD_FILTER_ERROR;
 
-        // if output always in JPG
-        if ( $this->_isForceJPGOutput )
-        {
-            $writeResult = imagejpeg( $src_im, $sDstImage, $this->_iJpegQuality);
-        }
-        else // otherwise
-        {
-            switch ( $size[2] )
-            {
-                case IMAGE_TYPE_GIF:
-                    $writeResult = imagegif( $src_im, $sDstImage );
-                    break;
-                case IMAGE_TYPE_JPG:
-                    $writeResult = imagejpeg( $src_im, $sDstImage, $this->_iJpegQuality);
-                    break;
-                case IMAGE_TYPE_PNG:
-                    $writeResult = imagepng( $src_im, $sDstImage );
-                    break;
-            }
-        }
+        $writeResult = $this->_writeImageGD ($src_im, $sDstImage);
 
         // free memory
@@ -347 +333 @@
             return IMAGE_ERROR_GD_RESIZE_ERROR;
 
-        // if output always in JPG
-        if ( $this->_isForceJPGOutput )
-        {
-            $writeResult = imagejpeg( $dst_im, $sDstImage, $this->_iJpegQuality);
-        }
-        else // otherwise
-        {
-            switch ( $size[2] )
-            {
-                case IMAGE_TYPE_GIF:
-                    $writeResult = imagegif( $dst_im, $sDstImage );
-                    break;
-                case IMAGE_TYPE_JPG:
-                    $writeResult = imagejpeg( $dst_im, $sDstImage, $this->_iJpegQuality);
-                    break;
-                case IMAGE_TYPE_PNG:
-                    $writeResult = imagepng( $dst_im, $sDstImage );
-                    break;
-            }
-        }
+        $writeResult = $this->_writeImageGD ($dst_im, $sDstImage);
 
         // free memory
@@ -545 +512 @@
         }
     }
+
+    function _writeImageGD ($src_im, $sDstImage) {
+
+        $writeResult = false;
+
+        switch ($this->_iForceOutputType){
+
+            case IMAGE_TYPE_JPG:
+                $writeResult = imagejpeg( $src_im, $sDstImage, $this->_iJpegQuality);
+                break;
+
+            case IMAGE_TYPE_PNG:
+                $writeResult = imagepng( $src_im, $sDstImage);
+                break;
+
+            case IMAGE_TYPE_GIF:
+                $writeResult = imagegif( $src_im, $sDstImage );
+                break;
+
+            default:
+                switch ( $size[2] ) {
+                    case IMAGE_TYPE_GIF:
+                        $writeResult = imagegif( $src_im, $sDstImage );
+                        break;
+                    case IMAGE_TYPE_PNG:
+                        $writeResult = imagepng( $src_im, $sDstImage );
+                        break;
+                    case IMAGE_TYPE_JPG:
+                    default:
+                        $writeResult = imagejpeg( $src_im, $sDstImage, $this->_iJpegQuality);
+                        break;
+                }
+        }
+
+        return $writeResult;
+    }
 }
 

trunk/inc/classes/BxDolImageTranscoder.php

@@ -62 +62 @@
  *     - h - height of resulted image.
  *     - square_resize - make resulted image square, even of original image is not square, 'w' and 'h' parameters must be the same.
- *     - force_jpeg - always change type of the image to jpeg.
+ *     - force_type - always change type of the image to the specified type: jpg, png, gif.
  * - Grayscale - make image grayscale, there is no parameters for this filter
  *
@@ -267 +267 @@
      */
     public function transcode ($mixedHandler, $iProfileId = 0) {
+
+        $sExtChange = false;
 
         // create tmp file locally 
@@ -284 +286 @@
                 return false;
             }
+
+            if (!empty($aParams['filter_params']['force_type'])) {
+                switch ($aParams['filter_params']['force_type']) {
+                    case 'jpeg':
+                    case 'jpg':
+                        $sExtChange = 'jpg';
+                        break;
+                    case 'png':
+                        $sExtChange = 'png';
+                        break;
+                    case 'gif':
+                        $sExtChange = 'gif';
+                        break;
+                }
+            }
+        }
+
+        if ($sExtChange && false !== ($iDotPos = strrpos($sTmpFile, '.'))) {            
+            $sExtOld = substr($sTmpFile, $iDotPos+1);
+            if ($sExtOld != $sExtChange) {
+                $sTmpFileOld = $sTmpFile;
+                $sTmpFile = substr_replace ($sTmpFile, $sExtChange, $iDotPos+1, strlen($sExtOld));
+                if (!rename($sTmpFileOld, $sTmpFile)) {
+                    unlink($sTmpFileOld);
+                    return false;
+                }
+            }
+
         }
 
@@ -453 +483 @@
         $o->removeCropOptions ();
 
+        $this->_checkForceType ($o, $aParams);
+
         if (IMAGE_ERROR_SUCCESS == $o->grayscale($sFile))
             return true;
@@ -465 +497 @@
 
         if (isset($aParams['w']) && isset($aParams['h']))
-            $o->setSize ($aParams['w'], $aParams['h']);        
-
-        if (isset($aParams['force_jpeg']) && $aParams['force_jpeg'])
-            $o->setJpegOutput (true); 
-        else
-            $o->setJpegOutput (false);         
+            $o->setSize ($aParams['w'], $aParams['h']);                
 
         if (isset($aParams['square_resize']) && $aParams['square_resize'])
@@ -477 +504 @@
             $o->setSquareResize (false);
 
+        $this->_checkForceType ($o, $aParams);
+
         if (IMAGE_ERROR_SUCCESS == $o->resize($sFile))
             return true;
 
         return false;
+    }
+
+    protected function _checkForceType ($oImageProcessor, $aParams) { 
+        if (empty($aParams['force_type']))
+            $aParams['force_type'] = false;
+
+        switch ($aParams['force_type']) {
+            case 'jpeg':
+            case 'jpg':
+                $oImageProcessor->setOutputType(IMAGE_TYPE_JPG);
+                break;
+            case 'png':
+                $oImageProcessor->setOutputType(IMAGE_TYPE_PNG);
+                break;
+            case 'gif':
+                $oImageProcessor->setOutputType(IMAGE_TYPE_GIF);
+                break;
+            default:
+                $oImageProcessor->setOutputType(false);
+                break;
+        }
     }