← Back to branch summary

~ubuntu-branches/debian/sid/scribus/sid

« back to all changes in this revision

Viewing changes to scribus/colormgmt/sccolormgmtengine.cpp

  • Committer: Package Import Robot
  • Author(s): Oleksandr Moskalenko
  • Date: 2012-02-09 21:50:56 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20120209215056-2wrx1ara0jbm7fi5
Tags: 1.4.0.dfsg+r17287-1
http://bugs.debian.org/654703
http://bugs.debian.org/655885
http://bugs.debian.org/630751
* New upstream stable release upload into Debian (Closes: #654703).
* Applied the Ubuntu armel patch.
* Removed non-free color swatches from resources.
* debian/control:
  - Moved icc-profiles from Recommends to Suggests (Closes: #655885).
  - Updated Standards-Version to 3.9.2.
  - Updated extended description per lintian warning.
* debian/rules:
  - Update mailcap (Closes: #630751). A request for mime.types update has
    been sent to the mime-support maintainer.
  - Added build-arch and build-indep targets per lintian warning.
* debian/patches:
  - top_cmakelists.patch - don't copy extra docs and changelogs.
  - scribus_cmakelists.patch - don't copy extra docs and changelogs.
  - scribus_cmakelists.patch - don't install the non-free "doc" dir.
  - profiles_cmakelists.patch - don't install non-free sRGB profile.
* debian/copyright: 
  - Converted to the DEP5 machine readable foramt.
  - Added licenses for free color swatches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scribus/colormgmt/sccolormgmtengine.cpp
6
6
*/
7
7
 
8
8
#include <cassert>
 
9
#include "scconfig.h"
9
10
#include "sccolormgmtengine.h"
 
11
 
 
12
#ifdef HAVE_LCMS21
 
13
#include "sclcms2colormgmtengineimpl.h"
 
14
#else
10
15
#include "sclcmscolormgmtengineimpl.h"
 
16
#endif
11
17
 
12
18
QSharedPointer<ScColorMgmtEngineData> ScColorMgmtEngine::m_data;
13
19
 
14
20
QSharedPointer<ScColorMgmtEngineData> ScColorMgmtEngine::data()
15
21
{
 
22
#ifdef HAVE_LCMS21
 
23
        if (!m_data)
 
24
                m_data = QSharedPointer<ScColorMgmtEngineData>( new ScLcms2ColorMgmtEngineImpl() );
 
25
#else
16
26
        if (!m_data)
17
27
                m_data = QSharedPointer<ScColorMgmtEngineData>( new ScLcmsColorMgmtEngineImpl() );
 
28
#endif
18
29
        assert( !m_data.isNull() );
19
30
        return m_data;
20
31
}