diff options
| author | rvelices <rv-github@modusoptimus.com> | 2012-01-08 19:25:52 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2012-01-08 19:25:52 +0000 |
| commit | 225b45f2b88d3193ec4012a589749c5814c42205 (patch) | |
| tree | ebd032867780475a5e41df5a4e0301d3518393e4 /admin/include | |
| parent | 028729f0690f3ffd4e116eecc49d58db08625d63 (diff) | |
feature 2548 multisize - added a page to build missing derivatives
- browser driven, chained ws calls to retrieve urls, visual feedback of progress through slideshow
git-svn-id: http://piwigo.org/svn/trunk@12865 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/include')
| -rw-r--r-- | admin/include/functions.php | 3 | ||||
| -rw-r--r-- | admin/include/image.class.php | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/admin/include/functions.php b/admin/include/functions.php index 59e59e5c2..84bae9154 100644 --- a/admin/include/functions.php +++ b/admin/include/functions.php @@ -200,11 +200,8 @@ SELECT $files = array(); $files[] = get_element_path($row); - if (!empty($row['representative_ext'])) { - $pi = pathinfo($row['path']); - $file_wo_ext = get_filename_wo_extension($pi['basename']); $files[] = original_to_representative( $files[0], $row['representative_ext']); } diff --git a/admin/include/image.class.php b/admin/include/image.class.php index 03cf419a4..c8e61a829 100644 --- a/admin/include/image.class.php +++ b/admin/include/image.class.php @@ -704,6 +704,7 @@ class image_gd implements imageInterface // Place the source image in the destination image imagecopy($cut, $ioverlay, 0, 0, 0, 0, $ow, $oh); imagecopymerge($this->image, $cut, $x, $y, 0, 0, $ow, $oh, $opacity); + imagedestroy($cut); return true; } |