[PATCH libreoffice-4-0] Resolves: #i119513# fix loading of CMYK JPEG in PPT import

[Caolán McNamara (via_Code_Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2584

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/84/2584/1

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

(cherry picked from commit 393ca6dde9de8f66ed55dc5d0a7885ad06f22301)

Conflicts:
	filter/source/msfilter/msdffimp.cxx

Change-Id: Ibb2e7daae425a711b5b6cadfa81446e9adeb68f1
---
M filter/source/msfilter/msdffimp.cxx
1 file changed, 2 insertions(+), 0 deletions(-)



diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 204ff4e..3813112 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6113,6 +6113,7 @@
             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;
@@ -6147,6 +6148,7 @@
             case 0x542 : aFileName.Append( String( RTL_CONSTASCII_USTRINGPARAM( ".pct" ) ) ); break;
             case 0x46a : aFileName.Append( String( RTL_CONSTASCII_USTRINGPARAM( ".jpg" ) ) ); break;
             case 0x6e0 : aFileName.Append( String( RTL_CONSTASCII_USTRINGPARAM( ".png" ) ) ); break;
+            case 0x6e2 : aFileName.Append( String( RTL_CONSTASCII_USTRINGPARAM( ".jpg" ) ) ); break;
             case 0x7a8 : aFileName.Append( String( RTL_CONSTASCII_USTRINGPARAM( ".bmp" ) ) ); break;
         }
 

-- 
To view, visit https://gerrit.libreoffice.org/2584
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb2e7daae425a711b5b6cadfa81446e9adeb68f1
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Caolán McNamara <caolanm at redhat.com>