From 064e6b53faec08a67075dd0f97303f5365d4e79b Mon Sep 17 00:00:00 2001
From: scuri <scuri>
Date: Mon, 25 Apr 2011 18:26:50 +0000
Subject: *** empty log message ***

---
 src/cairo/cdcairodbuf.c         | 3 +--
 src/cairo/cdcairoemf.c          | 3 +--
 src/cairo/cdcairoimg.c          | 3 +--
 src/cairo/cdcairoirgb.c         | 3 +--
 src/cairo/cdcaironative_gdk.c   | 3 +--
 src/cairo/cdcaironative_win32.c | 3 +--
 src/cairo/cdcaironative_x11.c   | 3 +--
 src/cairo/cdcairopdf.c          | 3 +--
 src/cairo/cdcairoplus.c         | 2 +-
 src/cairo/cdcairoprn_unix.c     | 3 +--
 src/cairo/cdcairoprn_win32.c    | 3 +--
 src/cairo/cdcairops.c           | 3 +--
 src/cairo/cdcairosvg.c          | 3 +--
 13 files changed, 13 insertions(+), 25 deletions(-)

(limited to 'src/cairo')

diff --git a/src/cairo/cdcairodbuf.c b/src/cairo/cdcairodbuf.c
index 845a24b..0322191 100644
--- a/src/cairo/cdcairodbuf.c
+++ b/src/cairo/cdcairodbuf.c
@@ -137,8 +137,7 @@ static void cdinittable(cdCanvas* canvas)
 static cdContext cdDBufferContext =
 {
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS | CD_CAP_REGION | CD_CAP_WRITEMODE | CD_CAP_PALETTE ),
-  1,
-  CD_CTX_IMAGE,
+  CD_CTX_IMAGE|CD_CTX_PLUS,
   cdcreatecanvas,  
   cdinittable,
   NULL,             
diff --git a/src/cairo/cdcairoemf.c b/src/cairo/cdcairoemf.c
index f83ae11..f2b31b6 100644
--- a/src/cairo/cdcairoemf.c
+++ b/src/cairo/cdcairoemf.c
@@ -108,8 +108,7 @@ static cdContext cdEMFCairoContext =
 {
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS | CD_CAP_REGION | CD_CAP_GETIMAGERGB |
                  CD_CAP_WRITEMODE | CD_CAP_PALETTE | CD_CAP_IMAGESRV),
-  1,
-  CD_CTX_FILE,
+  CD_CTX_FILE|CD_CTX_PLUS,
   cdcreatecanvas,
   cdinittable,
   NULL,
diff --git a/src/cairo/cdcairoimg.c b/src/cairo/cdcairoimg.c
index 3786de1..77bbda8 100644
--- a/src/cairo/cdcairoimg.c
+++ b/src/cairo/cdcairoimg.c
@@ -38,8 +38,7 @@ static void cdinittable(cdCanvas* canvas)
 static cdContext cdImageContext =
 {
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS | CD_CAP_REGION | CD_CAP_WRITEMODE | CD_CAP_PALETTE ),
-  1,
-  CD_CTX_IMAGE,
+  CD_CTX_IMAGE|CD_CTX_PLUS,
   cdcreatecanvas,
   cdinittable,
   NULL,
diff --git a/src/cairo/cdcairoirgb.c b/src/cairo/cdcairoirgb.c
index 21ff6c5..e5f2c2a 100644
--- a/src/cairo/cdcairoirgb.c
+++ b/src/cairo/cdcairoirgb.c
@@ -146,8 +146,7 @@ static void cdinittable(cdCanvas* canvas)
 static cdContext cdCairoImageRGBContext =
 {
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS | CD_CAP_REGION | CD_CAP_WRITEMODE | CD_CAP_PALETTE),
-  0,  /* not a plus driver */
-  CD_CTX_IMAGE,
+  CD_CTX_IMAGE,  /* not a plus driver */
   cdcreatecanvas,  
   cdinittable,
   NULL,                 
diff --git a/src/cairo/cdcaironative_gdk.c b/src/cairo/cdcaironative_gdk.c
index 1e177a4..e2e0bd1 100644
--- a/src/cairo/cdcaironative_gdk.c
+++ b/src/cairo/cdcaironative_gdk.c
@@ -95,8 +95,7 @@ static void cdinittable(cdCanvas* canvas)
 static cdContext cdNativeWindowContext =
 {
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS | CD_CAP_REGION | CD_CAP_WRITEMODE | CD_CAP_PALETTE),
-  1,
-  CD_CTX_WINDOW,
+  CD_CTX_WINDOW|CD_CTX_PLUS,
   cdcreatecanvas,
   cdinittable,
   NULL,
diff --git a/src/cairo/cdcaironative_win32.c b/src/cairo/cdcaironative_win32.c
index 3cc1972..9c097f9 100644
--- a/src/cairo/cdcaironative_win32.c
+++ b/src/cairo/cdcaironative_win32.c
@@ -144,8 +144,7 @@ static void cdinittable(cdCanvas* canvas)
 static cdContext cdNativeWindowContext =
 {
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS | CD_CAP_REGION | CD_CAP_WRITEMODE | CD_CAP_PALETTE),
-  1,
-  CD_CTX_WINDOW,
+  CD_CTX_WINDOW|CD_CTX_PLUS,
   cdcreatecanvas,
   cdinittable,
   NULL,
diff --git a/src/cairo/cdcaironative_x11.c b/src/cairo/cdcaironative_x11.c
index ae08420..c177e82 100644
--- a/src/cairo/cdcaironative_x11.c
+++ b/src/cairo/cdcaironative_x11.c
@@ -84,8 +84,7 @@ static void cdinittable(cdCanvas* canvas)
 static cdContext cdNativeWindowContext =
 {
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS | CD_CAP_REGION | CD_CAP_WRITEMODE | CD_CAP_PALETTE ),
-  1,
-  CD_CTX_WINDOW,
+  CD_CTX_WINDOW|CD_CTX_PLUS,
   cdcreatecanvas,
   cdinittable,
   NULL,
diff --git a/src/cairo/cdcairopdf.c b/src/cairo/cdcairopdf.c
index 980da72..5a8c210 100644
--- a/src/cairo/cdcairopdf.c
+++ b/src/cairo/cdcairopdf.c
@@ -109,8 +109,7 @@ static void cdinittable(cdCanvas* canvas)
 static cdContext cdCairoPDFContext =
 {
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS | CD_CAP_REGION | CD_CAP_WRITEMODE | CD_CAP_PALETTE),
-  0,  /* not a plus driver */
-  CD_CTX_FILE,
+  CD_CTX_FILE,  /* not a plus driver */
   cdcreatecanvas,  
   cdinittable,
   NULL,                 
diff --git a/src/cairo/cdcairoplus.c b/src/cairo/cdcairoplus.c
index d37efa7..9da8b33 100644
--- a/src/cairo/cdcairoplus.c
+++ b/src/cairo/cdcairoplus.c
@@ -13,7 +13,7 @@
 
 void cdInitContextPlus(void)
 {
-  cdContext* ctx_list[NUM_CONTEXTPLUS];
+  cdContext* ctx_list[CD_CTXPLUS_COUNT];
   memset(ctx_list, 0, sizeof(ctx_list));
 
   ctx_list[CD_CTXPLUS_NATIVEWINDOW] = cdContextCairoNativeWindow();
diff --git a/src/cairo/cdcairoprn_unix.c b/src/cairo/cdcairoprn_unix.c
index 0c4544c..ddde827 100644
--- a/src/cairo/cdcairoprn_unix.c
+++ b/src/cairo/cdcairoprn_unix.c
@@ -194,8 +194,7 @@ static cdContext cdPrinterCairoContext =
 {
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS | CD_CAP_REGION | CD_CAP_GETIMAGERGB |
                  CD_CAP_WRITEMODE | CD_CAP_PALETTE | CD_CAP_IMAGESRV),
-  1,
-  CD_CTX_DEVICE,
+  CD_CTX_DEVICE|CD_CTX_PLUS,
   cdcreatecanvas,
   cdinittable,
   NULL,
diff --git a/src/cairo/cdcairoprn_win32.c b/src/cairo/cdcairoprn_win32.c
index a5fadbd..003a8ac 100644
--- a/src/cairo/cdcairoprn_win32.c
+++ b/src/cairo/cdcairoprn_win32.c
@@ -181,8 +181,7 @@ static cdContext cdPrinterCairoContext =
 {
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS | CD_CAP_REGION | CD_CAP_GETIMAGERGB |
                  CD_CAP_WRITEMODE | CD_CAP_PALETTE | CD_CAP_IMAGESRV),
-  1,
-  CD_CTX_DEVICE,
+  CD_CTX_DEVICE|CD_CTX_PLUS,
   cdcreatecanvas,
   cdinittable,
   NULL,
diff --git a/src/cairo/cdcairops.c b/src/cairo/cdcairops.c
index 8880255..0905716 100644
--- a/src/cairo/cdcairops.c
+++ b/src/cairo/cdcairops.c
@@ -158,8 +158,7 @@ static void cdinittable(cdCanvas* canvas)
 static cdContext cdCairoPSContext =
 {
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS | CD_CAP_REGION | CD_CAP_WRITEMODE | CD_CAP_PALETTE),
-  0,  /* not a plus driver */
-  CD_CTX_FILE,
+  CD_CTX_FILE,  /* not a plus driver */
   cdcreatecanvas,  
   cdinittable,
   NULL,                 
diff --git a/src/cairo/cdcairosvg.c b/src/cairo/cdcairosvg.c
index 116d39d..c147a3e 100644
--- a/src/cairo/cdcairosvg.c
+++ b/src/cairo/cdcairosvg.c
@@ -70,8 +70,7 @@ static void cdinittable(cdCanvas* canvas)
 static cdContext cdCairoSVGContext =
 {
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS | CD_CAP_REGION | CD_CAP_WRITEMODE | CD_CAP_PALETTE),
-  0,  /* not a plus driver */
-  CD_CTX_FILE,
+  CD_CTX_FILE,  /* not a plus driver */
   cdcreatecanvas,  
   cdinittable,
   NULL,                 
-- 
cgit v1.2.3