Author: toshok
Date: 2008-02-05 10:35:53 -0500 (Tue, 05 Feb 2008)
New Revision: 94895
Modified:
trunk/moon/src/moon-path.c
Log:
move the g_return_if_fails to before the derefs
Modified: trunk/moon/src/moon-path.c
===================================================================
--- trunk/moon/src/moon-path.c 2008-02-05 15:35:29 UTC (rev 94894)
+++ trunk/moon/src/moon-path.c 2008-02-05 15:35:53 UTC (rev 94895)
@@ -137,12 +137,12 @@
void
moon_move_to (moon_path *path, double x, double y)
{
+ g_return_if_fail (path != NULL);
+
cairo_path_data_t *data = path->cairo.data;
int pos = path->cairo.num_data;
int n = 1;
- g_return_if_fail (path != NULL);
-
if (!CHECK_SPACE (path, MOON_PATH_MOVE_TO_LENGTH)) {
while (n < pos + MOON_PATH_MOVE_TO_LENGTH)
n <<= 1;
@@ -171,12 +171,12 @@
void
moon_line_to (moon_path *path, double x, double y)
{
+ g_return_if_fail (path != NULL);
+
cairo_path_data_t *data = path->cairo.data;
int pos = path->cairo.num_data;
int n = 1;
- g_return_if_fail (path != NULL);
-
if (!CHECK_SPACE (path, MOON_PATH_LINE_TO_LENGTH)) {
while (n < pos + MOON_PATH_LINE_TO_LENGTH)
n <<= 1;
@@ -206,12 +206,12 @@
void
moon_curve_to (moon_path *path, double x1, double y1, double x2, double y2,
double x3, double y3)
{
+ g_return_if_fail (path != NULL);
+
cairo_path_data_t *data = path->cairo.data;
int pos = path->cairo.num_data;
int n = 1;
- g_return_if_fail (path != NULL);
-
if (!CHECK_SPACE (path, MOON_PATH_CURVE_TO_LENGTH)) {
while (n < pos + MOON_PATH_CURVE_TO_LENGTH)
n <<= 1;
@@ -249,6 +249,8 @@
void
moon_ellipse (moon_path *path, double x, double y, double w, double h)
{
+ g_return_if_fail (path != NULL);
+
cairo_path_data_t *data = path->cairo.data;
int pos = path->cairo.num_data;
double rx = w / 2.0;
@@ -259,8 +261,6 @@
double bry = ARC_TO_BEZIER * ry;
int n = 1;
- g_return_if_fail (path != NULL);
-
if (!CHECK_SPACE (path, MOON_PATH_ELLIPSE_LENGTH)) {
while (n < pos + MOON_PATH_ELLIPSE_LENGTH)
n <<= 1;
@@ -343,12 +343,12 @@
void
moon_rectangle (moon_path *path, double x, double y, double w, double h)
{
+ g_return_if_fail (path != NULL);
+
cairo_path_data_t *data = path->cairo.data;
int pos = path->cairo.num_data;
int n = 1;
- g_return_if_fail (path != NULL);
-
if (!CHECK_SPACE (path, MOON_PATH_RECTANGLE_LENGTH)) {
while (n < pos + MOON_PATH_RECTANGLE_LENGTH)
n <<= 1;
@@ -403,12 +403,12 @@
void
moon_rounded_rectangle (moon_path *path, double x, double y, double w, double
h, double radius_x, double radius_y)
{
+ g_return_if_fail (path != NULL);
+
cairo_path_data_t *data = path->cairo.data;
int pos = path->cairo.num_data;
int n = 1;
- g_return_if_fail (path != NULL);
-
if (!CHECK_SPACE (path, MOON_PATH_ROUNDED_RECTANGLE_LENGTH)) {
while (n < pos + MOON_PATH_ROUNDED_RECTANGLE_LENGTH)
n <<= 1;
@@ -526,12 +526,12 @@
void
moon_close_path (moon_path *path)
{
+ g_return_if_fail (path != NULL);
+
cairo_path_data_t *data = path->cairo.data;
int pos = path->cairo.num_data;
int n = 1;
- g_return_if_fail (path != NULL);
-
if (!CHECK_SPACE (path, MOON_PATH_CLOSE_PATH_LENGTH)) {
while (n < pos + MOON_PATH_CLOSE_PATH_LENGTH)
n <<= 1;
@@ -557,12 +557,12 @@
void
moon_get_origin (moon_path *path, double *ox, double *oy)
{
+ g_return_if_fail (path != NULL);
+
int i = 0;
double x = 0.0, y = 0.0;
cairo_path_t *c_path;
- g_return_if_fail (path != NULL);
-
c_path = &path->cairo;
for (; i < c_path->num_data; i+= c_path->data[i].header.length) {
cairo_path_data_t *data = &c_path->data[i];
@@ -609,13 +609,13 @@
void
moon_merge (moon_path *path, moon_path *subpath)
{
+ g_return_if_fail (path != NULL);
+ g_return_if_fail (subpath != NULL);
+
cairo_path_data_t *data = path->cairo.data;
int pos = path->cairo.num_data;
int n = 1;
- g_return_if_fail (path != NULL);
- g_return_if_fail (subpath != NULL);
-
if (!CHECK_SPACE (path, subpath->cairo.num_data)) {
while (n < pos + subpath->cairo.num_data)
n <<= 1;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
