diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-01 17:30:40 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-01 17:30:40 +0200 |
| commit | 17578305174cfc484071553c6fafe79099b73d4d (patch) | |
| tree | 1f0fc3e06d6801267eeff02cc67335a2385e80d7 /pixman/demos | |
| parent | d60233950866066e23e8a46ac230aae9f296031e (diff) | |
| parent | 4d7ec99788d8a1d56ff4bccea279ae8186b18cdc (diff) | |
| download | vcxsrv-17578305174cfc484071553c6fafe79099b73d4d.tar.gz vcxsrv-17578305174cfc484071553c6fafe79099b73d4d.tar.bz2 vcxsrv-17578305174cfc484071553c6fafe79099b73d4d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/xkeyboard-config/NEWS
xorg-server/xkeyboard-config/configure.in
xorg-server/xkeyboard-config/po/ca.po
xorg-server/xkeyboard-config/po/da.po
xorg-server/xkeyboard-config/po/de.po
xorg-server/xkeyboard-config/po/fr.po
xorg-server/xkeyboard-config/po/it.po
xorg-server/xkeyboard-config/po/ko.po
xorg-server/xkeyboard-config/po/nl.po
xorg-server/xkeyboard-config/po/pl.po
xorg-server/xkeyboard-config/po/ru.po
xorg-server/xkeyboard-config/po/sv.po
xorg-server/xkeyboard-config/po/uk.po
Diffstat (limited to 'pixman/demos')
| -rw-r--r-- | pixman/demos/alpha-test.c | 4 | ||||
| -rw-r--r-- | pixman/demos/gradient-test.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/pixman/demos/alpha-test.c b/pixman/demos/alpha-test.c index 92c208142..54e30fad5 100644 --- a/pixman/demos/alpha-test.c +++ b/pixman/demos/alpha-test.c @@ -40,10 +40,12 @@ main (int argc, char **argv) }; #endif +#if 0 pixman_point_fixed_t c_inner; pixman_point_fixed_t c_outer; pixman_fixed_t r_inner; pixman_fixed_t r_outer; +#endif for (i = 0; i < WIDTH * HEIGHT; ++i) alpha[i] = 0x4f00004f; /* pale blue */ @@ -69,6 +71,7 @@ main (int argc, char **argv) src, WIDTH * 4); +#if 0 c_inner.x = pixman_double_to_fixed (50.0); c_inner.y = pixman_double_to_fixed (50.0); c_outer.x = pixman_double_to_fixed (50.0); @@ -76,7 +79,6 @@ main (int argc, char **argv) r_inner = 0; r_outer = pixman_double_to_fixed (50.0); -#if 0 grad_img = pixman_image_create_conical_gradient (&c_inner, r_inner, stops, 2); #endif diff --git a/pixman/demos/gradient-test.c b/pixman/demos/gradient-test.c index fc84844b0..20f78a6aa 100644 --- a/pixman/demos/gradient-test.c +++ b/pixman/demos/gradient-test.c @@ -36,10 +36,12 @@ main (int argc, char **argv) }; #endif +#if 0 pixman_point_fixed_t c_inner; pixman_point_fixed_t c_outer; pixman_fixed_t r_inner; pixman_fixed_t r_outer; +#endif for (i = 0; i < WIDTH * HEIGHT; ++i) dest[i] = 0x4f00004f; /* pale blue */ @@ -49,6 +51,7 @@ main (int argc, char **argv) dest, WIDTH * 4); +#if 0 c_inner.x = pixman_double_to_fixed (50.0); c_inner.y = pixman_double_to_fixed (50.0); c_outer.x = pixman_double_to_fixed (50.0); @@ -58,6 +61,7 @@ main (int argc, char **argv) src_img = pixman_image_create_conical_gradient (&c_inner, r_inner, stops, 2); +#endif #if 0 src_img = pixman_image_create_conical_gradient (&c_inner, r_inner, stops, 2); |