r15126 by jghali - remove util_cms.h/cpp, must not be used anymore
scribus-commit
scribus-commit at lists.scribus.net
Fri May 28 18:30:27 CEST 2010
Revision: 15126
Author: jghali
Date: 2010-05-28T16:23:39.762658Z
Commit message: remove util_cms.h/cpp, must not be used anymore
Changeset:
M /trunk/Scribus/scribus/CMakeLists.txt
D /trunk/Scribus/scribus/util_cms.cpp
D /trunk/Scribus/scribus/util_cms.h
Diffs:
Index: scribus/util_cms.h
===================================================================
--- scribus/util_cms.h (revision 15125)
+++ scribus/util_cms.h (revision 15126)
@@ -1,23 +0,0 @@
-/*
-For general Scribus (>=1.3.2) copyright and licensing information please refer
-to the COPYING file provided with the program. Following this notice may exist
-a copyright and/or license notice that predates the release of Scribus 1.3.2
-for which a new license (GPL+exception) is in place.
-*/
-#ifndef CMSUTIL_H
-#define CMSUTIL_H
-
-#include "scconfig.h"
-#include "scribusapi.h"
-#include CMS_INC
-
-cmsHTRANSFORM scCmsCreateTransform(cmsHPROFILE Input, DWORD InputFormat,
- cmsHPROFILE Output,DWORD OutputFormat,
- int Intent, DWORD dwFlags);
-
-cmsHTRANSFORM scCmsCreateProofingTransform(cmsHPROFILE Input, DWORD InputFormat,
- cmsHPROFILE Output,DWORD OutputFormat,
- cmsHPROFILE Proofing,int Intent,
- int ProofingIntent, DWORD dwFlags);
-
-#endif
Index: scribus/util_cms.cpp
===================================================================
--- scribus/util_cms.cpp (revision 15125)
+++ scribus/util_cms.cpp (revision 15126)
@@ -1,55 +0,0 @@
-/*
-For general Scribus (>=1.3.2) copyright and licensing information please refer
-to the COPYING file provided with the program. Following this notice may exist
-a copyright and/or license notice that predates the release of Scribus 1.3.2
-for which a new license (GPL+exception) is in place.
-*/
-#include "util_cms.h"
-#include <QString>
-
-cmsHTRANSFORM scCmsCreateTransform(cmsHPROFILE Input, DWORD InputFormat,
- cmsHPROFILE Output,DWORD OutputFormat,
- int Intent, DWORD dwFlags)
-{
- cmsHTRANSFORM hTransform = NULL;
- if ( Input == NULL || Output == NULL)
- return NULL;
- dwFlags &= (~cmsFLAGS_GAMUTCHECK);
- dwFlags &= (~cmsFLAGS_SOFTPROOFING);
- QString desc1 = cmsTakeProductDesc(Input);
- QString desc2 = cmsTakeProductDesc(Output);
- if ( desc1 == desc2 )
- dwFlags |= cmsFLAGS_NULLTRANSFORM;
- hTransform = cmsCreateTransform(Input, InputFormat, Output, OutputFormat, Intent, dwFlags);
- return hTransform;
-}
-
-cmsHTRANSFORM scCmsCreateProofingTransform(cmsHPROFILE Input, DWORD InputFormat,
- cmsHPROFILE Output,DWORD OutputFormat,
- cmsHPROFILE Proofing, int Intent,
- int ProofingIntent, DWORD dwFlags)
-{
- cmsHTRANSFORM hTransform = NULL;
- if ( Input == NULL || Output == NULL || Proofing == NULL)
- return NULL;
- QString desc1 = cmsTakeProductDesc(Input);
- QString desc2 = cmsTakeProductDesc(Output);
- QString desc3 = cmsTakeProductDesc(Proofing);
- dwFlags &= ~cmsFLAGS_BLACKPOINTCOMPENSATION;
- if ( desc1 != desc3 )
- {
- if( desc2 == desc3 )
- ProofingIntent = INTENT_RELATIVE_COLORIMETRIC;
- hTransform = cmsCreateProofingTransform(Input, InputFormat, Output, OutputFormat, Proofing, Intent,
- ProofingIntent, dwFlags);
- }
- else
- {
- dwFlags &= (~cmsFLAGS_GAMUTCHECK);
- dwFlags &= (~cmsFLAGS_SOFTPROOFING);
- if ( desc1 == desc2 )
- dwFlags |= cmsFLAGS_NULLTRANSFORM;
- hTransform = cmsCreateTransform(Input, InputFormat, Output, OutputFormat, ProofingIntent, dwFlags);
- }
- return hTransform;
-}
Index: scribus/CMakeLists.txt
===================================================================
--- scribus/CMakeLists.txt (revision 15125)
+++ scribus/CMakeLists.txt (revision 15126)
@@ -804,7 +804,6 @@
urllauncher.cpp
ui/useprintermarginsdialog.cpp
util.cpp
- util_cms.cpp
util_color.cpp
util_file.cpp
util_formats.cpp
More information about the scribus-commit
mailing list