diff options
| author | Albert Astals Cid <aacid@kde.org> | 2013-08-17 01:13:30 +0200 |
|---|---|---|
| committer | Albert Astals Cid <aacid@kde.org> | 2013-08-17 01:13:30 +0200 |
| commit | 7e0d969dc2439637ab16e609df8223504316f87d (patch) | |
| tree | c21b1335e87ea92934094b378b01809a998d6006 /utils | |
| parent | 6efc0c7ad97a82064a1e2c47e0b063b606e56bb7 (diff) | |
| parent | ef6420656c7b88eb22a63ec2cb3e504e0bda0384 (diff) | |
Merge remote-tracking branch 'origin/poppler-0.24'
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/HtmlOutputDev.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/utils/HtmlOutputDev.cc b/utils/HtmlOutputDev.cc index 23d8b6ec..7926674e 100644 --- a/utils/HtmlOutputDev.cc +++ b/utils/HtmlOutputDev.cc @@ -36,6 +36,7 @@ // Copyright (C) 2012 Pino Toscano <pino@kde.org> // Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de> // Copyright (C) 2013 Julien Nabet <serval2412@yahoo.fr> +// Copyright (C) 2013 Johannes Brandstätter <jbrandstaetter@gmail.com> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -1502,7 +1503,8 @@ void HtmlOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, /*if( !globalParams->getErrQuiet() ) printf("image stream of kind %d\n", str->getKind());*/ // dump JPEG file - if (dumpJPEG && str->getKind() == strDCT) { + if (dumpJPEG && str->getKind() == strDCT && (colorMap->getNumPixelComps() == 1 || + colorMap->getNumPixelComps() == 3) && !inlineImg) { drawJpegImage(state, str); } else { |