]>
Commit | Line | Data |
---|---|---|
728f6e40 JB |
1 | --- cinepaint/plug-ins/icc_examin/icc_examin/configure.sh.orig 2008-10-24 21:05:23.000000000 +0200 |
2 | +++ cinepaint/plug-ins/icc_examin/icc_examin/configure.sh 2013-03-29 21:35:26.036257910 +0100 | |
3 | @@ -171,7 +171,7 @@ | |
4 | # test -n "$ECHO" && $ECHO "Oyranos `pkg-config --modversion oyranos` detected" | |
5 | echo "#define HAVE_OY 1" >> $CONF_H | |
6 | echo "OY = 1" >> $CONF | |
7 | - echo "OYRANOS_H = `oyranos-config --cflags`" >> $CONF | |
8 | + echo "OYRANOS_H = `oyranos-config --cflags` `oyranos-config --cflags`/alpha" >> $CONF | |
9 | # echo "OYRANOS_H = `pkg-config --cflags oyranos_monitor`" >> $CONF | |
10 | if [ -f /usr/X11R6/include/X11/extensions/xf86vmode.h ]; then | |
11 | pkg-config --exists oyranos_monitor | |
12 | --- cinepaint/plug-ins/icc_examin/icc_examin/icc_oyranos_extern.h.orig 2008-08-22 20:11:18.000000000 +0200 | |
13 | +++ cinepaint/plug-ins/icc_examin/icc_examin/icc_oyranos_extern.h 2013-03-29 21:50:48.619572400 +0100 | |
14 | @@ -39,7 +39,7 @@ | |
15 | #endif | |
16 | #if OYRANOS_VERSION > 107 | |
17 | # include <oyranos/oyranos_icc.h> | |
18 | -# include <oyranos/oyranos_alpha.h> | |
19 | +# include <oyranos/alpha/oyranos_alpha.h> | |
20 | #endif | |
21 | #endif | |
22 | #include "icc_icc.h" | |
23 | --- cinepaint/plug-ins/icc_examin/icc_examin/icc_oyranos.cpp.orig 2008-10-24 22:15:51.000000000 +0200 | |
24 | +++ cinepaint/plug-ins/icc_examin/icc_examin/icc_oyranos.cpp 2013-03-29 21:57:46.776229932 +0100 | |
25 | @@ -161,7 +161,7 @@ | |
26 | Speicher *v_block = &lab_; | |
27 | if( !v_block->size() ) | |
28 | { DBG_PROG_V( v_block->size() ) | |
29 | - char* profil_name = oyGetDefaultProfileName( oyranos::oyASSUMED_LAB, myAllocFunc ); | |
30 | + char* profil_name = oyGetDefaultProfileName( oyASSUMED_LAB, myAllocFunc ); | |
31 | if(profil_name) | |
32 | DBG_PROG_V( (int*)profil_name << profil_name ); | |
33 | if( profil_name && | |
34 | @@ -472,7 +472,7 @@ | |
35 | Speicher *v_block = &rgb_; | |
36 | if( !v_block->size() ) | |
37 | { DBG_PROG_V( v_block->size() ) | |
38 | - const char* profil_name = oyGetDefaultProfileName( oyranos::oyASSUMED_RGB, myAllocFunc ); | |
39 | + const char* profil_name = oyGetDefaultProfileName( oyASSUMED_RGB, myAllocFunc ); | |
40 | if(profil_name) | |
41 | DBG_PROG_V( (intptr_t)profil_name << profil_name ); | |
42 | if( profil_name && | |
43 | @@ -523,7 +523,7 @@ | |
44 | Speicher *v_block = &cmyk_; | |
45 | if( !v_block->size() ) | |
46 | { DBG_PROG_V( v_block->size() ) | |
47 | - char* profil_name = oyGetDefaultProfileName( oyranos::oyASSUMED_CMYK, myAllocFunc ); | |
48 | + char* profil_name = oyGetDefaultProfileName( oyASSUMED_CMYK, myAllocFunc ); | |
49 | if(profil_name) {DBG_PROG_V( profil_name ); | |
50 | } else { DBG_PROG_V( (intptr_t)profil_name );} | |
51 | ||
52 | @@ -565,7 +565,7 @@ | |
53 | Speicher *v_block = &proof_; | |
54 | char* profil_name = NULL; | |
55 | ||
56 | - profil_name = oyGetDefaultProfileName( oyranos::oyPROFILE_PROOF, myAllocFunc); | |
57 | + profil_name = oyGetDefaultProfileName( oyPROFILE_PROOF, myAllocFunc); | |
58 | ||
59 | if( !v_block->size() ) | |
60 | { DBG_PROG_V( v_block->size() ) | |
61 | @@ -717,9 +717,11 @@ | |
62 | ||
63 | int screen = oyGetScreenFromPosition( display_name, x,y ); | |
64 | char *new_display_name = changeScreenName_( display_name, screen ); | |
65 | + char *dummy_geom, *dummy_port; | |
66 | + oyBlob_s *dummy_edit; | |
67 | //int fehler = | |
68 | oyGetMonitorInfo( new_display_name, | |
69 | - &manufacturer, &model, &serial, | |
70 | + &manufacturer, &model, &serial, &dummy_geom, &dummy_port, &dummy_edit, | |
71 | myAllocFunc ); | |
72 | ||
73 | if( manufacturer && strlen( manufacturer ) ) | |
74 | --- cinepaint/plug-ins/pdf/pdf.cpp.orig 2008-10-10 07:44:15.000000000 +0200 | |
75 | +++ cinepaint/plug-ins/pdf/pdf.cpp 2013-03-29 22:08:45.282882724 +0100 | |
76 | @@ -47,10 +47,10 @@ | |
77 | #include "lib/wire/libtile.h" | |
78 | #include "plugin_pdb.h" | |
79 | #include "libgimp/stdplugins-intl.h" | |
80 | +} | |
81 | #ifdef HAVE_OY | |
82 | #include <oyranos/oyranos.h> | |
83 | #endif | |
84 | -} | |
85 | ||
86 | #define WARN_S(text) cout <<__FILE__<<":"<<__LINE__<<" "<< text << endl; | |
87 | ||
88 | @@ -377,7 +377,6 @@ | |
89 | // set a default profile for cmyk | |
90 | #ifdef OYRANOS_H | |
91 | # if OYRANOS_API > 12 | |
92 | - using namespace oyranos; | |
93 | ||
94 | if( vals.colourspace == PDF_CMYK ) | |
95 | profile_name = oyGetDefaultProfileName (oyEDITING_CMYK, myAllocFunc); | |
96 | --- cinepaint/app/cms.c.orig 2009-01-01 00:14:53.000000000 +0100 | |
97 | +++ cinepaint/app/cms.c 2013-03-29 22:37:04.432847455 +0100 | |
98 | @@ -45,7 +45,8 @@ | |
99 | #include <arpa/inet.h> /* ntohl */ | |
100 | #include <oyranos/oyranos_monitor.h> | |
101 | #else | |
102 | -#include <oyranos/oyranos_alpha.h> | |
103 | +#include <oyranos/oyProfiles_s.h> | |
104 | +#include <oyranos/alpha/oyranos_alpha.h> | |
105 | #endif | |
106 | #endif | |
107 |