File 0002-use-convenient-oyICCProfileSelectionFlagsFromOptions.patch of Package kolor-manager4
From 0ad3dee96a0b315c24572615f943673e9006a55f Mon Sep 17 00:00:00 2001
From: Kai-Uwe Behrmann <ku.b@gmx.de>
Date: Fri, 1 Aug 2014 17:25:08 +0200
Subject: [PATCH] use convenient oyICCProfileSelectionFlagsFromOptions()
---
devices/kmdevices.cpp | 7 +------
information/kminfo.cpp | 7 +------
kolor-server/color-context.cpp | 8 +-------
kolor-server/output.cpp | 7 +------
kolor-server/screen.cpp | 7 +------
settings/kmsettings.cpp | 7 +------
6 files changed, 6 insertions(+), 37 deletions(-)
diff --git a/devices/kmdevices.cpp b/devices/kmdevices.cpp
index b296633..01c7dea 100644
--- a/devices/kmdevices.cpp
+++ b/devices/kmdevices.cpp
@@ -98,12 +98,7 @@ kmdevices::kmdevices(QWidget *parent, const QVariantList &) :
listModified = false; // avoid action on signals
/* select profiles matching actual capabilities */
- char * pattern = oyGetCMMPattern( oyCMM_CONTEXT, 0, malloc );
- oyFilterNode_s * node = oyFilterNode_NewWith( pattern, NULL, 0 );
- const char * reg = oyFilterNode_GetRegistration( node );
- icc_profile_flags = oyICCProfileSelectionFlagsFromRegistration( reg );
- oyFilterNode_Release( &node );
- free( pattern );
+ icc_profile_flags = oyICCProfileSelectionFlagsFromOptions( OY_CMM_STD, "//" OY_TYPE_STD "/icc_color", NULL, 0 );
setupUi(this); // Load Gui.
diff --git a/information/kminfo.cpp b/information/kminfo.cpp
index 7ba50c5..9652cae 100644
--- a/information/kminfo.cpp
+++ b/information/kminfo.cpp
@@ -138,12 +138,7 @@ kminfo::kminfo(QWidget *parent, const QVariantList &) :
current_profile = 0;
/* select profiles matching actual capabilities */
- char * pattern = oyGetCMMPattern( oyCMM_CONTEXT, 0, malloc );
- oyFilterNode_s * node = oyFilterNode_NewWith( pattern, NULL, 0 );
- const char * reg = oyFilterNode_GetRegistration( node );
- icc_profile_flags = oyICCProfileSelectionFlagsFromRegistration( reg );
- oyFilterNode_Release( &node );
- free( pattern );
+ icc_profile_flags = oyICCProfileSelectionFlagsFromOptions( OY_CMM_STD, "//" OY_TYPE_STD "/icc_color", NULL, 0 );
setupUi(this); // Load Gui.
diff --git a/kolor-server/color-context.cpp b/kolor-server/color-context.cpp
index 9e858dc..03ac9b7 100644
--- a/kolor-server/color-context.cpp
+++ b/kolor-server/color-context.cpp
@@ -48,13 +48,7 @@ ColorContext::ColorContext()
{
buildDummyClut(m_clut);
/* select profiles matching actual capabilities */
- char * pattern = oyGetCMMPattern( oyCMM_CONTEXT, 0, malloc );
- oyFilterNode_s * node = oyFilterNode_NewWith( pattern, NULL, 0 );
- const char * reg = oyFilterNode_GetRegistration( node );
- icc_profile_flags = oyICCProfileSelectionFlagsFromRegistration( reg );
- oyFilterNode_Release( &node );
- free( pattern );
-
+ icc_profile_flags = oyICCProfileSelectionFlagsFromOptions( OY_CMM_STD, "//" OY_TYPE_STD "/icc_color", NULL, 0 );
}
ColorContext::~ColorContext()
diff --git a/kolor-server/output.cpp b/kolor-server/output.cpp
index b0bf4eb..e80d234 100644
--- a/kolor-server/output.cpp
+++ b/kolor-server/output.cpp
@@ -49,12 +49,7 @@ ColorOutput::ColorOutput(Screen *parent, int index)
, m_index(index)
{
/* select profiles matching actual capabilities */
- char * pattern = oyGetCMMPattern( oyCMM_CONTEXT, 0, malloc );
- oyFilterNode_s * node = oyFilterNode_NewWith( pattern, NULL, 0 );
- const char * reg = oyFilterNode_GetRegistration( node );
- icc_profile_flags = oyICCProfileSelectionFlagsFromRegistration( reg );
- oyFilterNode_Release( &node );
- free( pattern );
+ icc_profile_flags = oyICCProfileSelectionFlagsFromOptions( OY_CMM_STD, "//" OY_TYPE_STD "/icc_color", NULL, 0 );
}
ColorOutput::~ColorOutput()
diff --git a/kolor-server/screen.cpp b/kolor-server/screen.cpp
index 1f0f0fb..86fe20e 100644
--- a/kolor-server/screen.cpp
+++ b/kolor-server/screen.cpp
@@ -68,12 +68,7 @@ Screen::Screen(X11::Display *display, int number, Display *parent)
X11::setupXRandR(display, number);
/* select profiles matching actual capabilities */
- char * pattern = oyGetCMMPattern( oyCMM_CONTEXT, 0, malloc );
- oyFilterNode_s * node = oyFilterNode_NewWith( pattern, NULL, 0 );
- const char * reg = oyFilterNode_GetRegistration( node );
- icc_profile_flags = oyICCProfileSelectionFlagsFromRegistration( reg );
- oyFilterNode_Release( &node );
- free( pattern );
+ icc_profile_flags = oyICCProfileSelectionFlagsFromOptions( OY_CMM_STD, "//" OY_TYPE_STD "/icc_color", NULL, 0 );
}
Screen::~Screen()
diff --git a/settings/kmsettings.cpp b/settings/kmsettings.cpp
index 21d20fd..4b77d38 100644
--- a/settings/kmsettings.cpp
+++ b/settings/kmsettings.cpp
@@ -94,12 +94,7 @@ kmsettings::kmsettings(QWidget *parent, const QVariantList &) :
setAboutData( about );
/* select profiles matching actual capabilities */
- char * pattern = oyGetCMMPattern( oyCMM_CONTEXT, 0, malloc );
- oyFilterNode_s * node = oyFilterNode_NewWith( pattern, NULL, 0 );
- const char * reg = oyFilterNode_GetRegistration( node );
- icc_profile_flags = oyICCProfileSelectionFlagsFromRegistration( reg );
- oyFilterNode_Release( &node );
- free( pattern );
+ icc_profile_flags = oyICCProfileSelectionFlagsFromOptions( OY_CMM_STD, "//" OY_TYPE_STD "/icc_color", NULL, 0 );
setupUi(this); // Load Gui.
--
GitLab