michael@0: # HG changeset patch
michael@0: # User Robert O'Callahan <robert@ocallahan.org>
michael@0: # Date 1294019288 -46800
michael@0: # Node ID e427b4ea7e2ff980769e1acd92f4730c5ed3654f
michael@0: # Parent  bacc54d452a9fddb5a0d6a1442ec7be4de81ffa7
michael@0: Bug 593604. Part 2.5: cairo_pattern_get_surface should not call cairo_error. r=jrmuizel,a=blocking
michael@0: 
michael@0: diff --git a/gfx/cairo/cairo/src/cairo-pattern.c b/gfx/cairo/cairo/src/cairo-pattern.c
michael@0: --- a/gfx/cairo/cairo/src/cairo-pattern.c
michael@0: +++ b/gfx/cairo/cairo/src/cairo-pattern.c
michael@0: @@ -2940,17 +2940,17 @@ cairo_pattern_get_surface (cairo_pattern
michael@0:  			   cairo_surface_t **surface)
michael@0:  {
michael@0:      cairo_surface_pattern_t *spat = (cairo_surface_pattern_t*) pattern;
michael@0:  
michael@0:      if (pattern->status)
michael@0:  	return pattern->status;
michael@0:  
michael@0:      if (pattern->type != CAIRO_PATTERN_TYPE_SURFACE)
michael@0: -	return _cairo_error (CAIRO_STATUS_PATTERN_TYPE_MISMATCH);
michael@0: +	return CAIRO_STATUS_PATTERN_TYPE_MISMATCH;
michael@0:  
michael@0:      if (surface)
michael@0:  	*surface = spat->surface;
michael@0:  
michael@0:      return CAIRO_STATUS_SUCCESS;
michael@0:  }
michael@0:  
michael@0:  /**