fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-01-04 00:30:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[quartz] rename NQUARTZ -> QUARTZ in defines

Browse source
This commit is contained in:
Vladimir Vukicevic 2007-02-20 12:54:03 -08:00 • committed by Vladimir Vukicevic
parent 4c201723ce
commit be451cd83d
4 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
perf/cairo-perf.c
View file

@ -72,7 +72,6 @@ target_is_measurable (cairo_boilerplate_target_t *target)
case CAIRO_SURFACE_TYPE_BEOS:
case CAIRO_SURFACE_TYPE_DIRECTFB:
#if CAIRO_VERSION_MAJOR > 1 || (CAIRO_VERSION_MAJOR == 1 && CAIRO_VERSION_MINOR > 2)
case CAIRO_SURFACE_TYPE_NQUARTZ:
case CAIRO_SURFACE_TYPE_OS2:
#endif
return TRUE;

4
src/cairo-quartz-private.h
View file

@ -1,6 +1,7 @@
/* cairo - a vector graphics library with display and print output
*
* Copyright © 2004 Calum Robinson
* Copyright (C) 2006,2007 Mozilla Corporation
*
* This library is free software; you can redistribute it and/or
* modify it either under the terms of the GNU Lesser General Public
@ -31,6 +32,7 @@
*
* Contributor(s):
* Calum Robinson <calumr@mac.com>
* Vladimir Vukicevic <vladimir@mozilla.com>
*/
#ifndef CAIRO_QUARTZ_PRIVATE_H
@ -39,7 +41,7 @@
#include <cairoint.h>
#include <cairo-quartz.h>
#ifdef CAIRO_NQUARTZ_SUPPORT_AGL
#ifdef CAIRO_QUARTZ_SUPPORT_AGL
#include <AGL/agl.h>
#include <OpenGL/gl.h>

18
src/cairo-quartz-surface.c
View file

@ -37,7 +37,7 @@
#include <Carbon/Carbon.h>
/* Support rendering to an OpenGL AGL context using CGGLContextCreate;
* Apple has deprecated CGGLContext, so CAIRO_NQUARTZ_SUPPORT_AGL is
* Apple has deprecated CGGLContext, so CAIRO_QUARTZ_SUPPORT_AGL is
* not defined by default.
*/
@ -46,9 +46,9 @@
#include "cairo-quartz-private.h"
#undef NQUARTZ_DEBUG
#undef QUARTZ_DEBUG
#ifdef NQUARTZ_DEBUG
#ifdef QUARTZ_DEBUG
#define ND(_x) fprintf _x
#else
#define ND(_x) do {} while(0)
@ -585,7 +585,7 @@ _cairo_nquartz_cairo_repeating_surface_pattern_to_quartz (cairo_nquartz_surface_
*/
ptransform = CGAffineTransformConcat(stransform, dest->cgContextBaseCTM);
#ifdef NQUARTZ_DEBUG
#ifdef QUARTZ_DEBUG
ND((stderr, " pbounds: %f %f %f %f\n", pbounds.origin.x, pbounds.origin.y, pbounds.size.width, pbounds.size.height));
ND((stderr, " pattern xform: t: %f %f xx: %f xy: %f yx: %f yy: %f\n", ptransform.tx, ptransform.ty, ptransform.a, ptransform.b, ptransform.c, ptransform.d));
CGAffineTransform xform = CGContextGetCTM(dest->cgContext);
@ -766,7 +766,7 @@ _cairo_nquartz_get_image (cairo_nquartz_surface_t *surface,
* or a CCGBitmapContext, then we have no way
* of doing this
*/
#ifdef CAIRO_NQUARTZ_SUPPORT_AGL
#ifdef CAIRO_QUARTZ_SUPPORT_AGL
if (surface->aglContext) {
AGLContext oldContext;
cairo_format_masks_t masks = { 32, 0xff << 24, 0xff << 16, 0xff << 8, 0xff << 0 };
@ -898,7 +898,7 @@ _cairo_nquartz_surface_finish (void *abstract_surface)
ND((stderr, "_cairo_nquartz_surface_finish[%p] cgc: %p\n", surface, surface->cgContext));
#ifdef CAIRO_NQUARTZ_SUPPORT_AGL
#ifdef CAIRO_QUARTZ_SUPPORT_AGL
if (surface->aglContext)
aglSetCurrentContext(surface->aglContext);
#endif
@ -912,7 +912,7 @@ _cairo_nquartz_surface_finish (void *abstract_surface)
surface->cgContext = NULL;
#ifdef CAIRO_NQUARTZ_SUPPORT_AGL
#ifdef CAIRO_QUARTZ_SUPPORT_AGL
if (surface->aglContext)
glFlush();
@ -1571,7 +1571,7 @@ _cairo_nquartz_surface_create_internal (CGContextRef cgContext,
return surface;
}
#ifdef CAIRO_NQUARTZ_SUPPORT_AGL
#ifdef CAIRO_QUARTZ_SUPPORT_AGL
cairo_surface_t *
cairo_quartz_surface_create_for_agl_context (AGLContext aglContext,
unsigned int width,
@ -1768,7 +1768,7 @@ cairo_quartz_surface_get_cg_context (cairo_surface_t *surf)
/* Debug stuff */
#ifdef NQUARTZ_DEBUG
#ifdef QUARTZ_DEBUG
#include <Movies.h>

10
src/cairo-quartz.h
View file

@ -33,8 +33,8 @@
* Vladimir Vukicevic <vladimir@mozilla.com>
*/
#ifndef CAIRO_NQUARTZ_H
#define CAIRO_NQUARTZ_H
#ifndef CAIRO_QUARTZ_H
#define CAIRO_QUARTZ_H
#include <cairo.h>
@ -42,7 +42,7 @@
#include <Carbon/Carbon.h>
#ifdef CAIRO_NQUARTZ_SUPPORT_AGL
#ifdef CAIRO_QUARTZ_SUPPORT_AGL
#include <AGL/agl.h>
#endif
@ -53,7 +53,7 @@ cairo_quartz_surface_create (cairo_format_t format,
unsigned int width,
unsigned int height);
#ifdef CAIRO_NQUARTZ_SUPPORT_AGL
#ifdef CAIRO_QUARTZ_SUPPORT_AGL
cairo_public cairo_surface_t *
cairo_quartz_surface_create_for_agl_context (AGLContext aglContext,
unsigned int width,
@ -74,4 +74,4 @@ CAIRO_END_DECLS
# error Cairo was not compiled with support for the quartz backend
#endif /* CAIRO_HAS_QUARTZ_SURFACE */
#endif /* CAIRO_NQUARTZ_H */
#endif /* CAIRO_QUARTZ_H */