summaryrefslogtreecommitdiffstats
path: root/lib/image.php
diff options
context:
space:
mode:
authorThomas Tanghus <thomas@tanghus.net>2012-01-01 20:06:35 +0100
committerThomas Tanghus <thomas@tanghus.net>2012-01-01 20:06:35 +0100
commit929ce2b56621ceda47b910a0fea5452f01812554 (patch)
tree7e5fbe65fe6f455cc145ddcdd433f4ba200b5dd8 /lib/image.php
parentc500c1e9307fd10f009f19351a101083969bfed2 (diff)
downloadnextcloud-server-929ce2b56621ceda47b910a0fea5452f01812554.tar.gz
nextcloud-server-929ce2b56621ceda47b910a0fea5452f01812554.zip
Small fixes
Diffstat (limited to 'lib/image.php')
-rw-r--r--lib/image.php12
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/image.php b/lib/image.php
index 67290d21f3a..0e1d1ee327f 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -56,6 +56,15 @@ class OC_Image {
}
/**
+ * @brief Determine whether the object contains an image resource.
+ * returns bool
+ */
+ function empty() {
+ if(self::$resource && self::$destroy) {
+ }
+ }
+
+ /**
* @brief Prints the image.
*/
public function show() {
@@ -116,9 +125,6 @@ class OC_Image {
* @returns An image resource or false on error
*/
static public function loadFromFile($imagepath=false) {
- if(!is_string($imagepath)) {
- return false;
- }
if(!is_file($imagepath) || !file_exists($imagepath) || !is_readable($imagepath)) {
OC_Log::write('core','OC_Image::loadFromFile, couldn\'t load'.$imagepath, OC_Log::DEBUG);
return false;