[Libreoffice-commits] core.git: filter/source
Herbert Dürr
hdu at apache.org
Thu Mar 7 02:09:50 PST 2013
filter/source/msfilter/msdffimp.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 393ca6dde9de8f66ed55dc5d0a7885ad06f22301
Author: Herbert Dürr <hdu at apache.org>
Date: Wed Jun 6 11:58:45 2012 +0000
Resolves: #i119513# fix loading of CMYK JPEG in PPT import
Patch By: Lei Debin
Found By:Â bjdujing at gmail.com
Extended for better Debug Info by: Herbert Duerr
Conflicts:
filter/source/msfilter/msdffimp.cxx
Change-Id: Ibb2e7daae425a711b5b6cadfa81446e9adeb68f1
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index eea3f99..41fe692 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6098,6 +6098,7 @@ sal_Bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData,
break;
case 0x46A : // One byte tag then JPEG (= JFIF) data
case 0x6E0 : // One byte tag then PNG data
+ case 0x6E2 : // One byte tag then JPEG in CMYK color space
case 0x7A8 :
nSkip += 1; // One byte tag then DIB data
break;
@@ -6131,6 +6132,7 @@ sal_Bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData,
case 0x542 : aFileName += ".pct"; break;
case 0x46a : aFileName += ".jpg"; break;
case 0x6e0 : aFileName += ".png"; break;
+ case 0x6e2 : aFileName += ".jpg"; break;
case 0x7a8 : aFileName += ".bmp"; break;
}
More information about the Libreoffice-commits
mailing list