Move PSD reader from filter module into VCL

Change-Id: I53b11be6e9eb0013f017b2da5745ff525ca79c54
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111017
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

13 files changed, 11 insertions, 890 deletions

diff --git a/filter/CppunitTest_filter_psd_test.mk b/filter/CppunitTest_filter_psd_test.mk
deleted file mode 100644
index 22a2531eb43f..000000000000
--- a/filter/CppunitTest_filter_psd_test.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CppunitTest_CppunitTest,filter_psd_test))
-
-$(eval $(call gb_CppunitTest_use_external,filter_psd_test,boost_headers))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,filter_psd_test, \
-    filter/qa/cppunit/filters-psd-test \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,filter_psd_test, \
-    gie \
-	sal \
-	test \
-	tl \
-	unotest \
-	vcl \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,filter_psd_test))
-
-$(eval $(call gb_CppunitTest_use_ure,filter_psd_test))
-$(eval $(call gb_CppunitTest_use_vcl,filter_psd_test))
-
-$(eval $(call gb_CppunitTest_use_components,filter_psd_test,\
-    configmgr/source/configmgr \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,filter_psd_test))
-
-# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_gie.mk b/filter/Library_gie.mk
index d013b58ee489..29e7b131fae4 100644
--- a/filter/Library_gie.mk
+++ b/filter/Library_gie.mk
@@ -51,7 +51,6 @@ $(eval $(call gb_Library_use_libraries,gie,\
 $(eval $(call gb_Library_add_exception_objects,gie,\
     filter/source/graphicfilter/egif/egif \
     filter/source/graphicfilter/egif/giflzwc \
-    filter/source/graphicfilter/ipsd/ipsd \
     filter/source/graphicfilter/ipbm/ipbm \
     filter/source/graphicfilter/idxf/dxf2mtf \
     filter/source/graphicfilter/idxf/dxfblkrd \
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index dd81f672df66..82eade49ffa1 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -58,7 +58,6 @@ $(eval $(call gb_Module_add_check_targets,filter,\
     CppunitTest_filter_dxf_test \
     CppunitTest_filter_pcd_test \
     CppunitTest_filter_ppm_test \
-    CppunitTest_filter_psd_test \
     CppunitTest_filter_svg \
 ))
 endif
diff --git a/filter/qa/cppunit/data/psd/fail/.gitignore b/filter/qa/cppunit/data/psd/fail/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/filter/qa/cppunit/data/psd/fail/.gitignore
+++ /dev/null
diff --git a/filter/qa/cppunit/data/psd/fail/CVE-2007-3741-1.psd b/filter/qa/cppunit/data/psd/fail/CVE-2007-3741-1.psd
deleted file mode 100644
index 59b690063b7b..000000000000
--- a/filter/qa/cppunit/data/psd/fail/CVE-2007-3741-1.psd
+++ /dev/null
diff --git a/filter/qa/cppunit/data/psd/indeterminate/.gitignore b/filter/qa/cppunit/data/psd/indeterminate/.gitignore
deleted file mode 100644
index 49b8ba044fa1..000000000000
--- a/filter/qa/cppunit/data/psd/indeterminate/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.psd-*
diff --git a/filter/qa/cppunit/data/psd/pass/.gitignore b/filter/qa/cppunit/data/psd/pass/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/filter/qa/cppunit/data/psd/pass/.gitignore
+++ /dev/null
diff --git a/filter/qa/cppunit/data/psd/pass/blank-square.psd b/filter/qa/cppunit/data/psd/pass/blank-square.psd
deleted file mode 100644
index fc811da006e7..000000000000
--- a/filter/qa/cppunit/data/psd/pass/blank-square.psd
+++ /dev/null
diff --git a/filter/qa/cppunit/data/psd/pass/hang-1.psd b/filter/qa/cppunit/data/psd/pass/hang-1.psd
deleted file mode 100644
index 8f557dd80d55..000000000000
--- a/filter/qa/cppunit/data/psd/pass/hang-1.psd
+++ /dev/null
diff --git a/filter/qa/cppunit/data/psd/pass/rhbz899670-1.psd b/filter/qa/cppunit/data/psd/pass/rhbz899670-1.psd
deleted file mode 100644
index ce8de8493ebe..000000000000
--- a/filter/qa/cppunit/data/psd/pass/rhbz899670-1.psd
+++ /dev/null
diff --git a/filter/qa/cppunit/filters-psd-test.cxx b/filter/qa/cppunit/filters-psd-test.cxx
deleted file mode 100644
index 7a3447a1b1ec..000000000000
--- a/filter/qa/cppunit/filters-psd-test.cxx
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include <unotest/filters-test.hxx>
-#include <test/bootstrapfixture.hxx>
-#include <vcl/FilterConfigItem.hxx>
-#include <tools/stream.hxx>
-#include <vcl/graph.hxx>
-
-extern "C"
-{
-    SAL_DLLPUBLIC_EXPORT bool SAL_CALL
-        ipdGraphicImport(SvStream & rStream, Graphic & rGraphic,
-        FilterConfigItem*);
-}
-
-using namespace ::com::sun::star;
-
-/* Implementation of Filters test */
-
-class PsdFilterTest
-    : public test::FiltersTest
-    , public test::BootstrapFixture
-{
-public:
-    PsdFilterTest() : BootstrapFixture(true, false) {}
-
-    virtual bool load(const OUString &,
-        const OUString &rURL, const OUString &,
-        SfxFilterFlags, SotClipboardFormatId, unsigned int) override;
-
-    /**
-     * Ensure CVEs remain unbroken
-     */
-    void testCVEs();
-
-    CPPUNIT_TEST_SUITE(PsdFilterTest);
-    CPPUNIT_TEST(testCVEs);
-    CPPUNIT_TEST_SUITE_END();
-};
-
-bool PsdFilterTest::load(const OUString &,
-    const OUString &rURL, const OUString &,
-    SfxFilterFlags, SotClipboardFormatId, unsigned int)
-{
-    SvFileStream aFileStream(rURL, StreamMode::READ);
-    Graphic aGraphic;
-    return ipdGraphicImport(aFileStream, aGraphic, nullptr);
-}
-
-void PsdFilterTest::testCVEs()
-{
-    testDir(OUString(),
-        m_directories.getURLFromSrc(u"/filter/qa/cppunit/data/psd/"));
-}
-
-CPPUNIT_TEST_SUITE_REGISTRATION(PsdFilterTest);
-
-CPPUNIT_PLUGIN_IMPLEMENT();
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/fragments/internalgraphicfilters/psd_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/psd_Import.xcu
index ce2c3066b8da..f51b0fa59d48 100644
--- a/filter/source/config/fragments/internalgraphicfilters/psd_Import.xcu
+++ b/filter/source/config/fragments/internalgraphicfilters/psd_Import.xcu
@@ -15,13 +15,14 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
-    <node oor:name="psd_Import" oor:op="replace"  >
-        <prop oor:name="Type"><value>psd_Adobe_Photoshop</value></prop>
-        <prop oor:name="FormatName"><value>ipd</value></prop>
-        <prop oor:name="RealFilterName"><value>PSD - Adobe Photoshop</value></prop>
-        <prop oor:name="UIComponent"/>
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">PSD - Adobe Photoshop</value>
-        </prop>
-        <prop oor:name="Flags"><value>IMPORT</value></prop>
-    </node>
+
+<node oor:name="psd_Import" oor:op="replace"  >
+    <prop oor:name="Type"><value>psd_Adobe_Photoshop</value></prop>
+    <prop oor:name="FormatName"><value>SVPSD</value></prop>
+    <prop oor:name="RealFilterName"><value>PSD - Adobe Photoshop</value></prop>
+    <prop oor:name="UIComponent"/>
+    <prop oor:name="UIName">
+        <value xml:lang="en-US">PSD - Adobe Photoshop</value>
+    </prop>
+    <prop oor:name="Flags"><value>IMPORT</value></prop>
+</node>
diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx
deleted file mode 100644
index 91599bf3352b..000000000000
--- a/filter/source/graphicfilter/ipsd/ipsd.cxx
+++ /dev/null
@@ -1,772 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#include <vcl/graph.hxx>
-#include <vcl/BitmapTools.hxx>
-#include <vcl/outdev.hxx>
-#include <sal/log.hxx>
-#include <tools/fract.hxx>
-#include <tools/helpers.hxx>
-#include <tools/stream.hxx>
-#include <memory>
-
-class FilterConfigItem;
-
-//============================ PSDReader ==================================
-
-#define PSD_BITMAP          0
-#define PSD_GRAYSCALE       1
-#define PSD_INDEXED         2
-#define PSD_RGB             3
-#define PSD_CMYK            4
-#define PSD_MULTICHANNEL    7
-#define PSD_DUOTONE         8
-#define PSD_LAB             9
-
-namespace {
-
-struct PSDFileHeader
-{
-    sal_uInt32  nSignature;
-    sal_uInt16  nVersion;
-    sal_uInt32  nPad1;
-    sal_uInt16  nPad2;
-    sal_uInt16  nChannels;
-    sal_uInt32  nRows;
-    sal_uInt32  nColumns;
-    sal_uInt16  nDepth;
-    sal_uInt16  nMode;
-};
-
-class PSDReader {
-
-private:
-
-    SvStream& m_rPSD;           // the PSD file to be read in
-    std::unique_ptr<PSDFileHeader>
-                        mpFileHeader;
-
-    sal_uInt32          mnXResFixed;
-    sal_uInt32          mnYResFixed;
-
-    bool            mbStatus;
-    bool            mbTransparent;
-
-    std::unique_ptr<vcl::bitmap::RawBitmap> mpBitmap;
-    std::vector<Color>  mvPalette;
-    sal_uInt16          mnDestBitDepth;
-    bool                mbCompression;  // RLE decoding
-    std::unique_ptr<sal_uInt8[]>
-                        mpPalette;
-
-    bool                ImplReadBody();
-    bool                ImplReadHeader();
-
-public:
-    explicit PSDReader(SvStream &rStream);
-    bool ReadPSD(Graphic & rGraphic);
-};
-
-}
-
-//=================== Methods of PSDReader ==============================
-
-PSDReader::PSDReader(SvStream &rStream)
-    : m_rPSD(rStream)
-    , mnXResFixed(0)
-    , mnYResFixed(0)
-    , mbStatus(true)
-    , mbTransparent(false)
-    , mnDestBitDepth(0)
-    , mbCompression(false)
-{
-}
-
-bool PSDReader::ReadPSD(Graphic & rGraphic )
-{
-    if (m_rPSD.GetError())
-        return false;
-
-    m_rPSD.SetEndian( SvStreamEndian::BIG );
-
-    // read header:
-
-    if ( !ImplReadHeader() )
-        return false;
-
-    if (mbStatus)
-    {
-        sal_uInt32 nResult;
-        if (o3tl::checked_multiply(mpFileHeader->nColumns, mpFileHeader->nRows, nResult) || nResult > SAL_MAX_INT32/2/3)
-            return false;
-    }
-
-    Size aBitmapSize( mpFileHeader->nColumns, mpFileHeader->nRows );
-    mpBitmap.reset( new vcl::bitmap::RawBitmap( aBitmapSize, 24 ) );
-    if ( mpPalette && mbStatus )
-    {
-        mvPalette.resize( 256 );
-        for ( sal_uInt16 i = 0; i < 256; i++ )
-        {
-            mvPalette[i] = Color( mpPalette[ i ], mpPalette[ i + 256 ], mpPalette[ i + 512 ] );
-        }
-    }
-
-    if ((mnDestBitDepth == 1 || mnDestBitDepth == 8 || mbTransparent) && mvPalette.empty())
-    {
-        mbStatus = false;
-        return mbStatus;
-    }
-
-    // read bitmap data
-    if ( mbStatus && ImplReadBody() )
-    {
-        rGraphic = Graphic( vcl::bitmap::CreateFromData( std::move(*mpBitmap) ) );
-
-        if ( mnXResFixed && mnYResFixed )
-        {
-            Fraction    aFractX( 1, mnXResFixed >> 16 );
-            Fraction    aFractY( 1, mnYResFixed >> 16 );
-            MapMode     aMapMode( MapUnit::MapInch, Point(), aFractX, aFractY );
-            Size        aPrefSize = OutputDevice::LogicToLogic(aBitmapSize, aMapMode, MapMode(MapUnit::Map100thMM));
-            rGraphic.SetPrefSize( aPrefSize );
-            rGraphic.SetPrefMapMode( MapMode( MapUnit::Map100thMM ) );
-        }
-    }
-    else
-        mbStatus = false;
-    return mbStatus;
-}
-
-
-bool PSDReader::ImplReadHeader()
-{
-    mpFileHeader.reset( new PSDFileHeader );
-
-    m_rPSD.ReadUInt32( mpFileHeader->nSignature ).ReadUInt16( mpFileHeader->nVersion ).ReadUInt32( mpFileHeader->nPad1 ).        ReadUInt16( mpFileHeader->nPad2 ).ReadUInt16( mpFileHeader->nChannels ).ReadUInt32( mpFileHeader->nRows ).            ReadUInt32( mpFileHeader->nColumns ).ReadUInt16( mpFileHeader->nDepth ).ReadUInt16( mpFileHeader->nMode );
-
-    if ( ( mpFileHeader->nSignature != 0x38425053 ) || ( mpFileHeader->nVersion != 1 ) )
-        return false;
-
-    if ( mpFileHeader->nRows == 0 || mpFileHeader->nColumns == 0 )
-        return false;
-
-    if ( ( mpFileHeader->nRows > 30000 ) || ( mpFileHeader->nColumns > 30000 ) )
-        return false;
-
-    sal_uInt16 nDepth = mpFileHeader->nDepth;
-    if (!( ( nDepth == 1 ) || ( nDepth == 8 ) || ( nDepth == 16 ) ) )
-        return false;
-
-    mnDestBitDepth = ( nDepth == 16 ) ? 8 : nDepth;
-
-    sal_uInt32 nColorLength(0);
-    m_rPSD.ReadUInt32( nColorLength );
-    if ( mpFileHeader->nMode == PSD_CMYK )
-    {
-        switch ( mpFileHeader->nChannels )
-        {
-            case 5 :
-                mbTransparent = true;
-                [[fallthrough]];
-            case 4 :
-                mnDestBitDepth = 24;
-            break;
-            default :
-                return false;
-        }
-    }
-    else switch ( mpFileHeader->nChannels )
-    {
-        case 2 :
-            mbTransparent = true;
-            break;
-        case 1 :
-            break;
-        case 4 :
-            mbTransparent = true;
-            [[fallthrough]];
-        case 3 :
-            mnDestBitDepth = 24;
-            break;
-        default:
-            return false;
-    }
-
-    switch ( mpFileHeader->nMode )
-    {
-        case PSD_BITMAP :
-        {
-            if ( nColorLength || ( nDepth != 1 ) )
-                return false;
-        }
-        break;
-
-        case PSD_INDEXED :
-        {
-            if ( nColorLength != 768 )      // we need the color map
-                return false;
-            mpPalette.reset( new sal_uInt8[ 768 ] );
-            m_rPSD.ReadBytes(mpPalette.get(), 768);
-        }
-        break;
-
-        case PSD_DUOTONE :                  // we'll handle the duotone color like a normal grayscale picture
-            m_rPSD.SeekRel( nColorLength );
-            nColorLength = 0;
-            [[fallthrough]];
-        case PSD_GRAYSCALE :
-        {
-            if ( nColorLength )
-                return false;
-            mpPalette.reset( new sal_uInt8[ 768 ] );
-            for ( sal_uInt16 i = 0; i < 256; i++ )
-            {
-                mpPalette[ i ] = mpPalette[ i + 256 ] = mpPalette[ i + 512 ] = static_cast<sal_uInt8>(i);
-            }
-        }
-        break;
-
-        case PSD_CMYK :
-        case PSD_RGB :
-        case PSD_MULTICHANNEL :
-        case PSD_LAB :
-        {
-            if ( nColorLength )     // color table is not supported by the other graphic modes
-                return false;
-        }
-        break;
-
-        default:
-            return false;
-    }
-    sal_uInt32 nResourceLength(0);
-    m_rPSD.ReadUInt32(nResourceLength);
-    if (nResourceLength > m_rPSD.remainingSize())
-        return false;
-    sal_uInt32 nLayerPos = m_rPSD.Tell() + nResourceLength;
-
-    // this is a loop over the resource entries to get the resolution info
-    while( m_rPSD.Tell() < nLayerPos )
-    {
-        sal_uInt32 nType(0);
-        sal_uInt16 nUniqueID(0);
-        sal_uInt8 n8(0);
-        m_rPSD.ReadUInt32(nType).ReadUInt16(nUniqueID).ReadUChar(n8);
-        if (nType != 0x3842494d)
-            break;
-        sal_uInt32 nPStringLen = n8;
-        if ( ! ( nPStringLen & 1 ) )
-            nPStringLen++;
-        m_rPSD.SeekRel( nPStringLen );  // skipping the pstring
-        sal_uInt32 nResEntryLen(0);
-        m_rPSD.ReadUInt32( nResEntryLen );
-        if ( nResEntryLen & 1 )
-            nResEntryLen++;             // the resource entries are padded
-        sal_uInt32 nCurrentPos = m_rPSD.Tell();
-        if (nCurrentPos > nLayerPos || nResEntryLen > (nLayerPos - nCurrentPos))   // check if size
-            break;                                                                 // is possible
-        switch( nUniqueID )
-        {
-            case 0x3ed :    // UID for the resolution info
-            {
-                sal_Int16   nUnit;
-
-                m_rPSD.ReadUInt32( mnXResFixed ).ReadInt16( nUnit ).ReadInt16( nUnit )
-                      .ReadUInt32( mnYResFixed ).ReadInt16( nUnit ).ReadInt16( nUnit );
-            }
-            break;
-        }
-        m_rPSD.Seek( nCurrentPos + nResEntryLen );          // set the stream to the next
-    }                                                       // resource entry
-    m_rPSD.Seek( nLayerPos );
-    sal_uInt32 nLayerMaskLength(0);
-    m_rPSD.ReadUInt32( nLayerMaskLength );
-    m_rPSD.SeekRel( nLayerMaskLength );
-
-    sal_uInt16 nCompression(0);
-    m_rPSD.ReadUInt16(nCompression);
-    if ( nCompression == 0 )
-    {
-        mbCompression = false;
-    }
-    else if ( nCompression == 1 )
-    {
-        m_rPSD.SeekRel( ( mpFileHeader->nRows * mpFileHeader->nChannels ) << 1 );
-        mbCompression = true;
-    }
-    else
-        return false;
-
-    return true;
-}
-
-namespace
-{
-    const Color& SanitizePaletteIndex(std::vector<Color> const & rvPalette, sal_uInt8 nIndex)
-    {
-        if (nIndex >= rvPalette.size())
-        {
-            auto nSanitizedIndex = nIndex % rvPalette.size();
-            SAL_WARN_IF(nIndex != nSanitizedIndex, "filter.psd", "invalid colormap index: "
-                        << static_cast<unsigned int>(nIndex) << ", colormap len is: "
-                        << rvPalette.size());
-            nIndex = nSanitizedIndex;
-        }
-        return rvPalette[nIndex];
-    }
-}
-
-bool PSDReader::ImplReadBody()
-{
-    sal_uInt32       nX, nY;
-    signed char nRunCount = 0;
-    sal_uInt8       nDat = 0, nDummy, nRed, nGreen, nBlue;
-    BitmapColor aBitmapColor;
-    nX = nY = 0;
-
-    switch ( mnDestBitDepth )
-    {
-        case 1 :
-        {
-            signed char nBitCount = -1;
-            while (nY < mpFileHeader->nRows && m_rPSD.good())
-            {
-                if ( nBitCount == -1 )
-                {
-                    if ( mbCompression )    // else nRunCount = 0 -> so we use only single raw packets
-                    {
-                        char nTmp(0);
-                        m_rPSD.ReadChar(nTmp);
-                        nRunCount = nTmp;
-                    }
-                }
-                if ( nRunCount & 0x80 )     // a run length packet
-                {
-                    const sal_uInt16 nCount = -nRunCount + 1;
-                    for (sal_uInt16 i = 0; i < nCount && m_rPSD.good(); ++i)
-                    {
-                        if ( nBitCount == -1 )  // bits left in nDat?
-                        {
-                            m_rPSD.ReadUChar( nDat );
-                            nDat ^= 0xff;
-                            nBitCount = 7;
-                        }
-                        mpBitmap->SetPixel(nY, nX, SanitizePaletteIndex(mvPalette, nDat >> nBitCount--));
-                        if ( ++nX == mpFileHeader->nColumns )
-                        {
-                            nX = 0;
-                            nY++;
-                            nBitCount = -1;
-                            if ( nY == mpFileHeader->nRows )
-                                break;
-                        }
-                    }
-                }
-                else                        // a raw packet
-                {
-                    const sal_uInt16 nCount = (nRunCount & 0x7f) + 1;
-                    for (sal_uInt16 i = 0; i < nCount && m_rPSD.good(); ++i)
-                    {
-                        if ( nBitCount == -1 )  // bits left in nDat ?
-                        {
-                            m_rPSD.ReadUChar( nDat );
-                            nDat ^= 0xff;
-                            nBitCount = 7;
-                        }
-                        mpBitmap->SetPixel(nY, nX, SanitizePaletteIndex(mvPalette, nDat >> nBitCount--));
-                        if ( ++nX == mpFileHeader->nColumns )
-                        {
-                            nX = 0;
-                            nY++;
-                            nBitCount = -1;
-                            if ( nY == mpFileHeader->nRows )
-                                break;
-                        }
-                    }
-                }
-            }
-        }
-        break;
-
-        case 8 :
-        {
-            while (nY < mpFileHeader->nRows && m_rPSD.good())
-            {
-                if ( mbCompression )        // else nRunCount = 0 -> so we use only single raw packets
-                {
-                    char nTmp(0);
-                    m_rPSD.ReadChar(nTmp);
-                    nRunCount = nTmp;
-                }
-
-                if ( nRunCount & 0x80 )     // a run length packet
-                {
-                    m_rPSD.ReadUChar( nDat );
-                    if ( mpFileHeader->nDepth == 16 )   // 16 bit depth is to be skipped
-                        m_rPSD.ReadUChar( nDummy );
-                    const sal_uInt16 nCount = -nRunCount + 1;
-                    for (sal_uInt16 i = 0; i < nCount && m_rPSD.good(); ++i)
-                    {
-                        mpBitmap->SetPixel(nY, nX, SanitizePaletteIndex(mvPalette, nDat));
-                        if ( ++nX == mpFileHeader->nColumns )
-                        {
-                            nX = 0;
-                            nY++;
-                            if ( nY == mpFileHeader->nRows )
-                                break;
-                        }
-                    }
-                }
-                else                        // a raw packet
-                {
-                    const sal_uInt16 nCount = (nRunCount & 0x7f) + 1;
-                    for (sal_uInt16 i = 0; i < nCount && m_rPSD.good(); ++i)
-                    {
-                        m_rPSD.ReadUChar( nDat );
-                        if ( mpFileHeader->nDepth == 16 )   // 16 bit depth is to be skipped
-                            m_rPSD.ReadUChar( nDummy );
-                        mpBitmap->SetPixel(nY, nX, SanitizePaletteIndex(mvPalette, nDat));
-                        if ( ++nX == mpFileHeader->nColumns )
-                        {
-                            nX = 0;
-                            nY++;
-                            if ( nY == mpFileHeader->nRows )
-                                break;
-                        }
-                    }
-                }
-            }
-        }
-        break;
-
-        case 24 :
-        {
-
-            // the psd format is in plain order (RRRR GGGG BBBB) so we have to set each pixel three times
-            // maybe the format is CCCC MMMM YYYY KKKK
-
-            while (nY < mpFileHeader->nRows && m_rPSD.good())
-            {
-                if ( mbCompression )        // else nRunCount = 0 -> so we use only single raw packets
-                {
-                    char nTmp(0);
-                    m_rPSD.ReadChar(nTmp);
-                    nRunCount = nTmp;
-                }
-
-                if ( nRunCount & 0x80 )     // a run length packet
-                {
-                    m_rPSD.ReadUChar( nRed );
-                    if ( mpFileHeader->nDepth == 16 )   // 16 bit depth is to be skipped
-                        m_rPSD.ReadUChar( nDummy );
-                    const sal_uInt16 nCount = -nRunCount + 1;
-                    for (sal_uInt16 i = 0; i < nCount && m_rPSD.good(); ++i)
-                    {
-                        mpBitmap->SetPixel( nY, nX, Color( nRed, sal_uInt8(0), sal_uInt8(0) ) );
-                        if ( ++nX == mpFileHeader->nColumns )
-                        {
-                            nX = 0;
-                            nY++;
-                            if ( nY == mpFileHeader->nRows )
-                                break;
-                        }
-                    }
-                }
-                else                        // a raw packet
-                {
-                    const sal_uInt16 nCount = (nRunCount & 0x7f) + 1;
-                    for (sal_uInt16 i = 0; i < nCount && m_rPSD.good(); ++i)
-                    {
-                        m_rPSD.ReadUChar( nRed );
-                        if ( mpFileHeader->nDepth == 16 )   // 16 bit depth is to be skipped
-                            m_rPSD.ReadUChar( nDummy );
-                        mpBitmap->SetPixel( nY, nX, Color( nRed, sal_uInt8(0), sal_uInt8(0) ) );
-                        if ( ++nX == mpFileHeader->nColumns )
-                        {
-                            nX = 0;
-                            nY++;
-                            if ( nY == mpFileHeader->nRows )
-                                break;
-                        }
-                    }
-                }
-            }
-            nY = 0;
-            while (nY < mpFileHeader->nRows && m_rPSD.good())
-            {
-                if ( mbCompression )
-                {
-                    char nTmp(0);
-                    m_rPSD.ReadChar(nTmp);
-                    nRunCount = nTmp;
-                }
-
-                if ( nRunCount & 0x80 )     // a run length packet
-                {
-                    m_rPSD.ReadUChar( nGreen );
-                    if ( mpFileHeader->nDepth == 16 )   // 16 bit depth is to be skipped
-                        m_rPSD.ReadUChar( nDummy );
-                    const sal_uInt16 nCount = -nRunCount + 1;
-                    for (sal_uInt16 i = 0; i < nCount && m_rPSD.good(); ++i)
-                    {
-                        aBitmapColor = mpBitmap->GetPixel( nY, nX );
-                        mpBitmap->SetPixel( nY, nX, Color( aBitmapColor.GetRed(), nGreen, aBitmapColor.GetBlue() ) );
-                        if ( ++nX == mpFileHeader->nColumns )
-                        {
-                            nX = 0;
-                            nY++;
-                            if ( nY == mpFileHeader->nRows )
-                                break;
-                        }
-                    }
-                }
-                else                        // a raw packet
-                {
-                    const sal_uInt16 nCount = (nRunCount & 0x7f) + 1;
-                    for (sal_uInt16 i = 0; i < nCount && m_rPSD.good(); ++i)
-                    {
-                        m_rPSD.ReadUChar( nGreen );
-                        if ( mpFileHeader->nDepth == 16 )   // 16 bit depth is to be skipped
-                            m_rPSD.ReadUChar( nDummy );
-                        aBitmapColor = mpBitmap->GetPixel( nY, nX );
-                        mpBitmap->SetPixel( nY, nX, Color( aBitmapColor.GetRed(), nGreen, aBitmapColor.GetBlue() ) );
-                        if ( ++nX == mpFileHeader->nColumns )
-                        {
-                            nX = 0;
-                            nY++;
-                            if ( nY == mpFileHeader->nRows )
-                                break;
-                        }
-                    }
-                }
-            }
-            nY = 0;
-            while (nY < mpFileHeader->nRows && m_rPSD.good())
-            {
-                if ( mbCompression )
-                {
-                    char nTmp(0);
-                    m_rPSD.ReadChar(nTmp);
-                    nRunCount = nTmp;
-                }
-
-                if ( nRunCount & 0x80 )     // a run length packet
-                {
-                    m_rPSD.ReadUChar( nBlue );
-                    if ( mpFileHeader->nDepth == 16 )   // 16 bit depth is to be skipped
-                        m_rPSD.ReadUChar( nDummy );
-                    const sal_uInt16 nCount = -nRunCount + 1;
-                    for (sal_uInt16 i = 0; i < nCount && m_rPSD.good(); ++i)
-                    {
-                        aBitmapColor = mpBitmap->GetPixel( nY, nX );
-                        mpBitmap->SetPixel( nY, nX, Color( aBitmapColor.GetRed(), aBitmapColor.GetGreen(), nBlue ) );
-                        if ( ++nX == mpFileHeader->nColumns )
-                        {
-                            nX = 0;
-                            nY++;
-                            if ( nY == mpFileHeader->nRows )
-                                break;
-                        }
-                    }
-                }
-                else                        // a raw packet
-                {
-                    const sal_uInt16 nCount = (nRunCount & 0x7f) + 1;
-                    for (sal_uInt16 i = 0; i < nCount && m_rPSD.good(); ++i)
-                    {
-                        m_rPSD.ReadUChar( nBlue );
-                        if ( mpFileHeader->nDepth == 16 )   // 16 bit depth is to be skipped
-                            m_rPSD.ReadUChar( nDummy );
-                        aBitmapColor = mpBitmap->GetPixel( nY, nX );
-                        mpBitmap->SetPixel( nY, nX, Color( aBitmapColor.GetRed(), aBitmapColor.GetGreen(), nBlue ) );
-                        if ( ++nX == mpFileHeader->nColumns )
-                        {
-                            nX = 0;
-                            nY++;
-                            if ( nY == mpFileHeader->nRows )
-                                break;
-                        }
-                    }
-                }
-            }
-            if (mpFileHeader->nMode == PSD_CMYK && m_rPSD.good())
-            {
-                sal_uInt32  nBlack, nBlackMax = 0;
-                std::unique_ptr<sal_uInt8[]> pBlack(new sal_uInt8[ mpFileHeader->nRows * mpFileHeader->nColumns ]);
-                nY = 0;
-                while (nY < mpFileHeader->nRows && m_rPSD.good())
-                {
-                    if ( mbCompression )        // else nRunCount = 0 -> so we use only single raw packets
-                    {
-                        char nTmp(0);
-                        m_rPSD.ReadChar(nTmp);
-                        nRunCount = nTmp;
-                    }
-
-                    if ( nRunCount & 0x80 )     // a run length packet
-                    {
-                        m_rPSD.ReadUChar( nDat );
-
-                        if ( mpFileHeader->nDepth == 16 )   // 16 bit depth is to be skipped
-                            m_rPSD.ReadUChar( nDummy );
-
-                        for ( sal_uInt16 i = 0; i < ( -nRunCount + 1 ); i++ )
-                        {
-                            nBlack = mpBitmap->GetPixel( nY, nX ).GetRed() + nDat;
-                            if ( nBlack > nBlackMax )
-                                nBlackMax = nBlack;
-                            nBlack = mpBitmap->GetPixel( nY, nX ).GetGreen() + nDat;
-                            if ( nBlack > nBlackMax )
-                                nBlackMax = nBlack;
-                            nBlack = mpBitmap->GetPixel( nY, nX ).GetBlue() + nDat;
-                            if ( nBlack > nBlackMax )
-                                nBlackMax = nBlack;
-                            pBlack[ nX + nY * mpFileHeader->nColumns ] = nDat ^ 0xff;
-                            if ( ++nX == mpFileHeader->nColumns )
-                            {
-                                nX = 0;
-                                nY++;
-                                if ( nY == mpFileHeader->nRows )
-                                    break;
-                            }
-                        }
-                    }
-                    else                        // a raw packet
-                    {
-                        for ( sal_uInt16 i = 0; i < ( ( nRunCount & 0x7f ) + 1 ); i++ )
-                        {
-                            m_rPSD.ReadUChar( nDat );
-
-                            if ( mpFileHeader->nDepth == 16 )   // 16 bit depth is to be skipped
-                                m_rPSD.ReadUChar( nDummy );
-                            nBlack = mpBitmap->GetPixel( nY, nX ).GetRed() + nDat;
-                            if ( nBlack > nBlackMax )
-                                nBlackMax = nBlack;
-                            nBlack = mpBitmap->GetPixel( nY, nX ).GetGreen() + nDat;
-                            if ( nBlack > nBlackMax )
-                                nBlackMax = nBlack;
-                            nBlack = mpBitmap->GetPixel( nY, nX ).GetBlue() + nDat;
-                            if ( nBlack > nBlackMax )
-                                nBlackMax = nBlack;
-                            pBlack[ nX + nY * mpFileHeader->nColumns ] = nDat ^ 0xff;
-                            if ( ++nX == mpFileHeader->nColumns )
-                            {
-                                nX = 0;
-                                nY++;
-                                if ( nY == mpFileHeader->nRows )
-                                    break;
-                            }
-                        }
-                    }
-                }
-
-                for ( nY = 0; nY < mpFileHeader->nRows; nY++ )
-                {
-                    for ( nX = 0; nX < mpFileHeader->nColumns; nX++ )
-                    {
-                        sal_Int32 nDAT = pBlack[ nX + nY * mpFileHeader->nColumns ] * ( nBlackMax - 256 ) / 0x1ff;
-
-                        aBitmapColor = mpBitmap->GetPixel( nY, nX );
-                        sal_uInt8 cR = static_cast<sal_uInt8>(MinMax( aBitmapColor.GetRed() - nDAT, 0, 255L ));
-                        sal_uInt8 cG = static_cast<sal_uInt8>(MinMax( aBitmapColor.GetGreen() - nDAT, 0, 255L ));
-                        sal_uInt8 cB = static_cast<sal_uInt8>(MinMax( aBitmapColor.GetBlue() - nDAT, 0, 255L ));
-                        mpBitmap->SetPixel( nY, nX, Color( cR, cG, cB ) );
-                    }
-                }
-            }
-        }
-        break;
-    }
-
-    if (mbTransparent && m_rPSD.good())
-    {
-        // the psd is 24 or 8 bit grafix + alphachannel
-
-        nY = nX = 0;
-        while ( nY < mpFileHeader->nRows )
-        {
-            if ( mbCompression )        // else nRunCount = 0 -> so we use only single raw packets
-            {
-                char nTmp(0);
-                m_rPSD.ReadChar(nTmp);
-                nRunCount = nTmp;
-            }
-
-            if ( nRunCount & 0x80 )     // a run length packet
-            {
-                m_rPSD.ReadUChar( nDat );
-                if ( nDat )
-                    nDat = 0;
-                else
-                    nDat = 1;
-                if ( mpFileHeader->nDepth == 16 )   // 16 bit depth is to be skipped
-                    m_rPSD.ReadUChar( nDummy );
-                for ( sal_uInt16 i = 0; i < ( -nRunCount + 1 ); i++ )
-                {
-                    mpBitmap->SetPixel(nY, nX, SanitizePaletteIndex(mvPalette, nDat));
-                    if ( ++nX == mpFileHeader->nColumns )
-                    {
-                        nX = 0;
-                        nY++;
-                        if ( nY == mpFileHeader->nRows )
-                            break;
-                    }
-                }
-            }
-            else                        // a raw packet
-            {
-                for ( sal_uInt16 i = 0; i < ( ( nRunCount & 0x7f ) + 1 ); i++ )
-                {
-                    m_rPSD.ReadUChar( nDat );
-                    if ( nDat )
-                        nDat = 0;
-                    else
-                        nDat = 1;
-                    if ( mpFileHeader->nDepth == 16 )   // 16 bit depth is to be skipped
-                        m_rPSD.ReadUChar( nDummy );
-                    mpBitmap->SetPixel(nY, nX, SanitizePaletteIndex(mvPalette, nDat));
-                    if ( ++nX == mpFileHeader->nColumns )
-                    {
-                        nX = 0;
-                        nY++;
-                        if ( nY == mpFileHeader->nRows )
-                            break;
-                    }
-                }
-            }
-        }
-    }
-
-    return m_rPSD.good();
-}
-
-//================== GraphicImport - the exported function ================
-
-extern "C" SAL_DLLPUBLIC_EXPORT bool
-ipdGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
-{
-    PSDReader aPSDReader(rStream);
-
-    return aPSDReader.ReadPSD(rGraphic);
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */