Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Edit Book: Fix GIF images being corrupted when using the builtin image editor to make changes to them. Fixes #1440398 [Editor: Rotating a gif destroys it](https://bugs.launchpad.net/calibre/+bug/1440398)

Browse Source
This commit is contained in:
Kovid Goyal 2015-04-05 08:02:23 +05:30
parent ba1812c173
commit 147d11f1ea
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/gui2/tweak_book/editor/canvas.py
View File

@ -11,7 +11,8 @@ from functools import wraps
from PyQt5.Qt import ( from PyQt5.Qt import (
QWidget, QPainter, QColor, QApplication, Qt, QPixmap, QRectF, QTransform, QWidget, QPainter, QColor, QApplication, Qt, QPixmap, QRectF, QTransform,
QPointF, QPen, pyqtSignal, QUndoCommand, QUndoStack, QIcon, QImage, QByteArray) QPointF, QPen, pyqtSignal, QUndoCommand, QUndoStack, QIcon, QImage,
QByteArray, QImageWriter)
from calibre import fit_image from calibre import fit_image
from calibre.gui2 import error_dialog, pixmap_to_data from calibre.gui2 import error_dialog, pixmap_to_data
@ -336,7 +337,10 @@ class Canvas(QWidget):
def get_image_data(self, quality=90): def get_image_data(self, quality=90):
if not self.is_modified: if not self.is_modified:
return self.original_image_data return self.original_image_data
return pixmap_to_data(self.current_image, format=self.original_image_format or 'JPEG', quality=90) fmt = self.original_image_format or 'JPEG'
if fmt.lower() not in set(map(lambda x:bytes(x).decode('ascii'), QImageWriter.supportedImageFormats())):
return qimage_to_magick(self.current_image).export(fmt)
return pixmap_to_data(self.current_image, format=fmt, quality=90)
def copy(self): def copy(self):
if not self.is_valid: if not self.is_valid: