Ticket #597: Image.diff

(a) Image.php vs. (b) (clipboard)

@@ -308 +308 @@
 
                 return $status;
         }
+        
+        /**
+         * Output the image to the browser.
+         *
+         * @throws  Kohana_Exception
+         * @return  object
+         */
+        public function output()
+        {
+                $new_image = $this->image['file'];
+
+                // Separate the directory and filename
+                $dir  = pathinfo($new_image, PATHINFO_DIRNAME);
+                $file = pathinfo($new_image, PATHINFO_BASENAME);
+
+                // Normalize the path
+                $dir = str_replace('\\', '/', realpath($dir)).'/';
+
+                // Process the image with the driver
+                $status = $this->driver->process($this->image, $this->actions, $dir, $file, $output = TRUE);
+
+                // Reset the actions
+                $this->actions = array();
+
+                return $status;
+        }
 
         /**
          * Sanitize a given value type.