diff options
-rw-r--r-- | src/Wallabag/CoreBundle/Helper/DownloadImages.php | 2 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Helper/EntriesExport.php | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/Wallabag/CoreBundle/Helper/DownloadImages.php b/src/Wallabag/CoreBundle/Helper/DownloadImages.php index c83f9618..0d330d2a 100644 --- a/src/Wallabag/CoreBundle/Helper/DownloadImages.php +++ b/src/Wallabag/CoreBundle/Helper/DownloadImages.php | |||
@@ -144,6 +144,8 @@ class DownloadImages | |||
144 | $this->logger->debug('DownloadImages: Re-creating jpg'); | 144 | $this->logger->debug('DownloadImages: Re-creating jpg'); |
145 | break; | 145 | break; |
146 | case 'png': | 146 | case 'png': |
147 | imagealphablending($im, false); | ||
148 | imagesavealpha($im, true); | ||
147 | imagepng($im, $localPath, ceil(self::REGENERATE_PICTURES_QUALITY / 100 * 9)); | 149 | imagepng($im, $localPath, ceil(self::REGENERATE_PICTURES_QUALITY / 100 * 9)); |
148 | $this->logger->debug('DownloadImages: Re-creating png'); | 150 | $this->logger->debug('DownloadImages: Re-creating png'); |
149 | } | 151 | } |
diff --git a/src/Wallabag/CoreBundle/Helper/EntriesExport.php b/src/Wallabag/CoreBundle/Helper/EntriesExport.php index 93c01fcb..3d36a4c8 100644 --- a/src/Wallabag/CoreBundle/Helper/EntriesExport.php +++ b/src/Wallabag/CoreBundle/Helper/EntriesExport.php | |||
@@ -148,8 +148,6 @@ class EntriesExport | |||
148 | $book->setCoverImage('Cover.png', file_get_contents($this->logoPath), 'image/png'); | 148 | $book->setCoverImage('Cover.png', file_get_contents($this->logoPath), 'image/png'); |
149 | } | 149 | } |
150 | 150 | ||
151 | $book->addChapter('Notices', 'Cover2.html', $content_start.$this->getExportInformation('PHPePub').$bookEnd); | ||
152 | |||
153 | $book->buildTOC(); | 151 | $book->buildTOC(); |
154 | 152 | ||
155 | /* | 153 | /* |
@@ -170,6 +168,8 @@ class EntriesExport | |||
170 | $book->addChapter($entry->getTitle(), htmlspecialchars($filename).'.html', $chapter, true, EPub::EXTERNAL_REF_ADD); | 168 | $book->addChapter($entry->getTitle(), htmlspecialchars($filename).'.html', $chapter, true, EPub::EXTERNAL_REF_ADD); |
171 | } | 169 | } |
172 | 170 | ||
171 | $book->addChapter('Notices', 'Cover2.html', $content_start.$this->getExportInformation('PHPePub').$bookEnd); | ||
172 | |||
173 | return Response::create( | 173 | return Response::create( |
174 | $book->getBook(), | 174 | $book->getBook(), |
175 | 200, | 175 | 200, |