Changeset 452 for trunk/lib/Image.inc.php

Timestamp:

Dec 25, 2013 12:47:12 AM (10 years ago)

Author:

anonymous

Message:

Merged changes to lib/SortOrder.inc.php from eli_branch; other minor changes

File:

• trunk/lib/Image.inc.php (modified) (10 diffs)

trunk/lib/Image.inc.php

@@ -4 +4 @@
  * For details visit the project site: <http://trac.strangecode.com/codebase/>
  * Copyright 2001-2012 Strangecode, LLC
- * 
+ *
  * This file is part of The Strangecode Codebase.
  *
@@ -11 +11 @@
  * Free Software Foundation, either version 3 of the License, or (at your option)
  * any later version.
- * 
+ *
  * The Strangecode Codebase 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 General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along with
  * The Strangecode Codebase. If not, see <http://www.gnu.org/licenses/>.
@@ -49 +49 @@
             // Pattern passed to glob() with $id to match image filenames.
             'filename_pattern' => '%s*',
-            
+
             // The path to the image source directory. (Ex: /var/www/htdocs/images)
             'base_path' => '',
-            
+
             // The URL to the image directory. (Ex: /images)
             'base_url' => '',
-            
+
             // Image to use in the case of a missing image.
             'default_image_file' => '',
@@ -61 +61 @@
         $this->_params = array_merge($defaults, $params);
     }
-    
+
     /**
      * Tests if an image with specified id exists on the file system.
@@ -77 +77 @@
         $filepath = preg_match('!://!', $src) ? $src : getenv('DOCUMENT_ROOT') . $src;
         // Use exif_imagetype to check not only file existence but that of a valid image.
+        // The return value is the same value that getimagesize() returns in index 2 but exif_imagetype() is much faster.
         return false != @exif_imagetype($filepath);
     }
-    
+
     /**
      * Returns the value from getimagesize().
@@ -85 +86 @@
      * @access  public
      * @param   string  $id     Unique image identifier.
-     * @param   int     $key    Which element from the array returned by getimagesize: 
-     *                   - Index 0 contains the width of the image in pixels. 
-     *                   - Index 1 contains the height. 
-     *                   - Index 2 is the type of the image. 
+     * @param   int     $key    Which element from the array returned by getimagesize:
+     *                   - Index 0 contains the width of the image in pixels.
+     *                   - Index 1 contains the height.
+     *                   - Index 2 is the type of the image.
      *                   - Index 3 is height="yyy" width="xxx" string.
      * @return  mixed   return value of getimagesize.
@@ -102 +103 @@
         return isset($img_size[$key]) ? $img_size[$key] : false;
     }
-    
+
     /**
      * Returns the URL to the source of image specified by id.
@@ -126 +127 @@
 
     /**
-     * Returns an HTML <img> tag with the src set to an image specified by id.  
+     * Returns an HTML <img> tag with the src set to an image specified by id.
      * Automatically prints image width and height.
      *
@@ -142 +143 @@
         $src = $this->oSrc($id);
         $filepath = preg_match('!://!', $src) ? $src : getenv('DOCUMENT_ROOT') . $src;
-        
+
         if (false === ($gis = @getimagesize($filepath)) || preg_match('/width|height/', $extra)) {
             $image_size = '';
@@ -148 +149 @@
             $image_size = $gis[3];
         }
-        
+
         return sprintf('<img src="%s" %s alt="%s" %s />',
             $src,