commit db509018b1b7cf507cdd0e0d56219c536a64b316
parent 5ddf5f6419fe940648002c55c54b66ff0a9a8ea6
Author: Christian Grothoff <christian@grothoff.org>
Date: Tue, 26 Oct 2010 21:36:52 +0000
stuff
Diffstat:
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/plugins/thumbnailqt_extractor.cc b/src/plugins/thumbnailqt_extractor.cc
@@ -66,6 +66,7 @@ EXTRACTOR_thumbnailqt_extract (const char *data,
char format[64];
QImage::Format colors;
QtMsgHandler oh;
+ int ret;
oh = qInstallMsgHandler (&mh);
/* Determine image format to use */
@@ -165,15 +166,21 @@ EXTRACTOR_thumbnailqt_extract (const char *data,
}
buffer.setBuffer(&bytes);
buffer.open(QIODevice::WriteOnly);
- thumb.save(&buffer, "PNG");
+ if (TRUE != thumb.save(&buffer, "PNG"))
+ {
+ qInstallMsgHandler (oh);
+ return 0;
+ }
+ buffer.close ();
+ ret = proc (proc_cls,
+ "thumbnailqt",
+ EXTRACTOR_METATYPE_THUMBNAIL,
+ EXTRACTOR_METAFORMAT_BINARY,
+ "image/png",
+ bytes.data(),
+ bytes.size());
qInstallMsgHandler (oh);
- return proc (proc_cls,
- "thumbnailqt",
- EXTRACTOR_METATYPE_THUMBNAIL,
- EXTRACTOR_METAFORMAT_BINARY,
- "image/png",
- bytes.data(),
- bytes.length());
+ return ret;
}