some more memory cleanup in OC_Image

remotes/origin/stable4
Robin Appelman 12 years ago
parent 0c19e44a61
commit 0ba9332358

@ -317,10 +317,7 @@ class OC_Image {
*/
public function loadFromFileHandle($handle) {
OC_Log::write('core',__METHOD__.'(): Trying', OC_Log::DEBUG);
$contents = '';
while (!feof($handle)) {
$contents .= fread($handle, 8192);
}
$contents = stream_get_contents($handle);
if($this->loadFromData($contents)) {
return $this->resource;
}
@ -486,6 +483,7 @@ class OC_Image {
imagedestroy($process);
return false;
}
imagedestroy($this->resource);
$this->resource = $process;
return true;
}

Loading…
Cancel
Save