Enlightenment CVS committal
Author : kwo
Project : e17
Module : libs/imlib2
Dir : e17/libs/imlib2/src/lib
Modified Files:
api.c
Log Message:
Push initial ctxt - continued, wasn't done everywhere.
===================================================================
RCS file: /cvs/e/e17/libs/imlib2/src/lib/api.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- api.c 13 Nov 2007 03:47:22 -0000 1.19
+++ api.c 6 Jan 2008 13:57:09 -0000 1.20
@@ -209,6 +209,20 @@
return (Imlib_Context) context;
}
+static ImlibContext *
+_imlib_context_get(void)
+{
+ ImlibContext *context;
+
+ context = imlib_context_new();
+ imlib_context_push(context);
+
+ return context;
+}
+
+#define CHECK_CONTEXT(_ctx) \
+ if (!_ctx) _ctx = _imlib_context_get()
+
/* frees the given context if it doesn't have any reference anymore. The
last (default) context can never be freed.
If context is the current context, the context below will be made the
@@ -282,11 +296,7 @@
EAPI void
imlib_context_set_cliprect(int x, int y, int w, int h)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
ctx->cliprect.x = x;
ctx->cliprect.y = y;
ctx->cliprect.w = w;
@@ -296,11 +306,7 @@
EAPI void
imlib_context_get_cliprect(int *x, int *y, int *w, int *h)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
*x = ctx->cliprect.x;
*y = ctx->cliprect.y;
*w = ctx->cliprect.w;
@@ -323,11 +329,7 @@
EAPI void
imlib_context_set_display(Display * display)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
ctx->display = display;
}
@@ -339,11 +341,7 @@
EAPI Display *
imlib_context_get_display(void)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
return ctx->display;
}
@@ -358,11 +356,7 @@
EAPI void
imlib_context_set_visual(Visual * visual)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
ctx->visual = visual;
ctx->depth = imlib_get_visual_depth(ctx->display, ctx->visual);
}
@@ -375,11 +369,7 @@
EAPI Visual *
imlib_context_get_visual(void)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
return ctx->visual;
}
@@ -393,11 +383,7 @@
EAPI void
imlib_context_set_colormap(Colormap colormap)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
ctx->colormap = colormap;
}
@@ -409,11 +395,7 @@
EAPI Colormap
imlib_context_get_colormap(void)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
return ctx->colormap;
}
@@ -427,11 +409,7 @@
EAPI void
imlib_context_set_drawable(Drawable drawable)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
ctx->drawable = drawable;
}
@@ -443,11 +421,7 @@
EAPI Drawable
imlib_context_get_drawable(void)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
return ctx->drawable;
}
@@ -461,11 +435,7 @@
EAPI void
imlib_context_set_mask(Pixmap mask)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
ctx->mask = mask;
}
@@ -477,11 +447,7 @@
EAPI Pixmap
imlib_context_get_mask(void)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
return ctx->mask;
}
#endif
@@ -497,11 +463,7 @@
EAPI void
imlib_context_set_dither_mask(char dither_mask)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
ctx->dither_mask = dither_mask;
}
@@ -514,11 +476,7 @@
EAPI char
imlib_context_get_dither_mask(void)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
return ctx->dither_mask;
}
@@ -532,11 +490,7 @@
EAPI void
imlib_context_set_mask_alpha_threshold(int mask_alpha_threshold)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
ctx->mask_alpha_threshold = mask_alpha_threshold;
}
@@ -548,11 +502,7 @@
EAPI int
imlib_context_get_mask_alpha_threshold(void)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
return ctx->mask_alpha_threshold;
}
@@ -569,11 +519,7 @@
EAPI void
imlib_context_set_anti_alias(char anti_alias)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
ctx->anti_alias = anti_alias;
}
@@ -586,11 +532,7 @@
EAPI char
imlib_context_get_anti_alias(void)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
return ctx->anti_alias;
}
@@ -608,11 +550,7 @@
EAPI void
imlib_context_set_dither(char dither)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
ctx->dither = dither;
}
@@ -625,11 +563,7 @@
EAPI char
imlib_context_get_dither(void)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
return ctx->dither;
}
@@ -644,11 +578,7 @@
EAPI void
imlib_context_set_blend(char blend)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
ctx->blend = blend;
}
@@ -661,11 +591,7 @@
EAPI char
imlib_context_get_blend(void)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
return ctx->blend;
}
@@ -683,11 +609,7 @@
EAPI void
imlib_context_set_color_modifier(Imlib_Color_Modifier color_modifier)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
ctx->color_modifier = color_modifier;
}
@@ -699,11 +621,7 @@
EAPI Imlib_Color_Modifier
imlib_context_get_color_modifier(void)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
return ctx->color_modifier;
}
@@ -725,11 +643,7 @@
EAPI void
imlib_context_set_operation(Imlib_Operation operation)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
ctx->operation = operation;
}
@@ -741,11 +655,7 @@
EAPI Imlib_Operation
imlib_context_get_operation(void)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
return ctx->operation;
}
@@ -758,11 +668,7 @@
EAPI void
imlib_context_set_font(Imlib_Font font)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
ctx->font = font;
}
@@ -774,11 +680,7 @@
EAPI Imlib_Font
imlib_context_get_font(void)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
return ctx->font;
}
@@ -795,11 +697,7 @@
EAPI void
imlib_context_set_direction(Imlib_Text_Direction direction)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
ctx->direction = direction;
}
@@ -813,11 +711,7 @@
EAPI void
imlib_context_set_angle(double angle)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
ctx->angle = angle;
}
@@ -830,11 +724,7 @@
EAPI double
imlib_context_get_angle(void)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
return ctx->angle;
}
@@ -846,11 +736,7 @@
EAPI Imlib_Text_Direction
imlib_context_get_direction(void)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
return ctx->direction;
}
@@ -868,11 +754,7 @@
EAPI void
imlib_context_set_color(int red, int green, int blue, int alpha)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
ctx->color.red = red;
ctx->color.green = green;
ctx->color.blue = blue;
@@ -890,11 +772,7 @@
EAPI void
imlib_context_get_color(int *red, int *green, int *blue, int *alpha)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
*red = ctx->color.red;
*green = ctx->color.green;
*blue = ctx->color.blue;
@@ -910,11 +788,7 @@
EAPI Imlib_Color *
imlib_context_get_imlib_color(void)
{
- if (!ctx)
- {
- ctx = imlib_context_new();
- imlib_context_push(ctx);
- }
+ CHECK_CONTEXT(ctx);
return &ctx->color;
}
@@ -1011,8 +885,7 @@
EAPI void
imlib_context_set_color_cmya(int cyan, int magenta, int yellow, int alpha)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
ctx->color.red = 255 - cyan;
ctx->color.green = 255 - magenta;
ctx->color.blue = 255 - yellow;
@@ -1031,8 +904,7 @@
EAPI void
imlib_context_get_color_cmya(int *cyan, int *magenta, int *yellow, int *alpha)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
*cyan = 255 - ctx->color.red;
*magenta = 255 - ctx->color.green;
*yellow = 255 - ctx->color.blue;
@@ -1047,8 +919,7 @@
EAPI void
imlib_context_set_color_range(Imlib_Color_Range color_range)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
ctx->color_range = color_range;
}
@@ -1060,8 +931,7 @@
EAPI Imlib_Color_Range
imlib_context_get_color_range(void)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
return ctx->color_range;
}
@@ -1075,8 +945,7 @@
EAPI void
imlib_context_set_progress_function(Imlib_Progress_Function progress_function)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
ctx->progress_func = progress_function;
}
@@ -1088,8 +957,7 @@
EAPI Imlib_Progress_Function
imlib_context_get_progress_function(void)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
return ctx->progress_func;
}
@@ -1105,8 +973,7 @@
EAPI void
imlib_context_set_progress_granularity(char progress_granularity)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
ctx->progress_granularity = progress_granularity;
}
@@ -1118,8 +985,7 @@
EAPI char
imlib_context_get_progress_granularity(void)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
return ctx->progress_granularity;
}
@@ -1131,8 +997,7 @@
EAPI void
imlib_context_set_image(Imlib_Image image)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
ctx->image = image;
}
@@ -1144,24 +1009,21 @@
EAPI Imlib_Image
imlib_context_get_image(void)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
return ctx->image;
}
EAPI void
imlib_context_set_TTF_encoding(Imlib_TTF_Encoding encoding)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
ctx->encoding = encoding;
}
EAPI Imlib_TTF_Encoding
imlib_context_get_TTF_encoding(void)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
return ctx->encoding;
}
@@ -1176,8 +1038,7 @@
EAPI int
imlib_get_cache_size(void)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
return __imlib_GetCacheSize();
}
@@ -1193,8 +1054,7 @@
EAPI void
imlib_set_cache_size(int bytes)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
__imlib_SetCacheSize(bytes);
}
@@ -1207,8 +1067,7 @@
EAPI int
imlib_get_color_usage(void)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
#ifdef BUILD_X11
return (int)_max_colors;
#else
@@ -1226,8 +1085,7 @@
EAPI void
imlib_set_color_usage(int max)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
#ifdef BUILD_X11
if (max < 2)
max = 2;
@@ -1246,8 +1104,7 @@
EAPI void
imlib_flush_loaders(void)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
__imlib_RemoveAllLoaders();
}
@@ -1263,8 +1120,7 @@
EAPI int
imlib_get_visual_depth(Display * display, Visual * visual)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_get_visual_depth", "display", display, 0);
CHECK_PARAM_POINTER_RETURN("imlib_get_visual_depth", "visual", visual, 0);
return __imlib_XActualDepth(display, visual);
@@ -1284,8 +1140,7 @@
EAPI Visual *
imlib_get_best_visual(Display * display, int screen, int *depth_return)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_get_best_visual", "display", display,
NULL);
CHECK_PARAM_POINTER_RETURN("imlib_get_best_visual", "depth_return",
@@ -1308,8 +1163,7 @@
Imlib_Image im = NULL;
Imlib_Image prev_ctxt_image;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_load_image", "file", file, NULL);
prev_ctxt_image = ctx->image;
im = __imlib_LoadImage(file, (ImlibProgressFunction) ctx->progress_func,
@@ -1333,8 +1187,7 @@
Imlib_Image im = NULL;
Imlib_Image prev_ctxt_image;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_load_image_immediately", "file", file,
NULL);
prev_ctxt_image = ctx->image;
@@ -1357,8 +1210,7 @@
Imlib_Image im = NULL;
Imlib_Image prev_ctxt_image;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_load_image_without_cache", "file",
file, NULL);
prev_ctxt_image = ctx->image;
@@ -1382,8 +1234,7 @@
Imlib_Image im = NULL;
Imlib_Image prev_ctxt_image;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_load_image_immediately_without_cache",
"file", file, NULL);
prev_ctxt_image = ctx->image;
@@ -1410,8 +1261,7 @@
ImlibLoadError er;
Imlib_Image prev_ctxt_image;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_load_image_with_error_return", "file",
file, NULL);
if (!__imlib_FileExists(file))
@@ -1453,8 +1303,7 @@
EAPI void
imlib_free_image(void)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_free_image", "image", ctx->image);
__imlib_FreeImage(ctx->image);
ctx->image = NULL;
@@ -1469,8 +1318,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_free_image_and_decache", "image", ctx->image);
CAST_IMAGE(im, ctx->image);
SET_FLAG(im->flags, F_INVALID);
@@ -1486,8 +1334,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_image_get_width", "image", ctx->image, 0);
CAST_IMAGE(im, ctx->image);
return im->w;
@@ -1501,8 +1348,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_image_get_height", "image", ctx->image,
0);
CAST_IMAGE(im, ctx->image);
return im->h;
@@ -1524,8 +1370,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_image_get_filename", "image", ctx->image,
0);
CAST_IMAGE(im, ctx->image);
@@ -1555,8 +1400,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_image_get_data", "image", ctx->image,
NULL);
CAST_IMAGE(im, ctx->image);
@@ -1581,8 +1425,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_image_get_data_for_reading_only",
"image", ctx->image, NULL);
CAST_IMAGE(im, ctx->image);
@@ -1606,8 +1449,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_put_back_data", "image", ctx->image);
CHECK_PARAM_POINTER("imlib_image_put_back_data", "data", data);
CAST_IMAGE(im, ctx->image);
@@ -1627,8 +1469,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_image_has_alpha", "image", ctx->image, 0);
CAST_IMAGE(im, ctx->image);
if (IMAGE_HAS_ALPHA(im))
@@ -1650,8 +1491,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_set_never_changes_on_disk", "image",
ctx->image);
CAST_IMAGE(im, ctx->image);
@@ -1673,8 +1513,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_get_border", "image", ctx->image);
CHECK_PARAM_POINTER("imlib_image_get_border", "border", border);
CAST_IMAGE(im, ctx->image);
@@ -1695,8 +1534,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_set_border", "image", ctx->image);
CHECK_PARAM_POINTER("imlib_image_set_border", "border", border);
CAST_IMAGE(im, ctx->image);
@@ -1724,8 +1562,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_set_format", "image", ctx->image);
CHECK_PARAM_POINTER("imlib_image_set_format", "format", format);
CAST_IMAGE(im, ctx->image);
@@ -1753,8 +1590,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_set_irrelevant_format", "image",
ctx->image);
CAST_IMAGE(im, ctx->image);
@@ -1780,8 +1616,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_set_irrelevant_border", "image",
ctx->image);
CAST_IMAGE(im, ctx->image);
@@ -1808,8 +1643,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_set_irrelevant_alpha", "image",
ctx->image);
CAST_IMAGE(im, ctx->image);
if (irrelevant)
@@ -1833,8 +1667,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_image_format", "image", ctx->image, NULL);
CAST_IMAGE(im, ctx->image);
return im->format;
@@ -1851,8 +1684,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_set_has_alpha", "image", ctx->image);
CAST_IMAGE(im, ctx->image);
if (has_alpha)
@@ -1877,8 +1709,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_render_pixmaps_for_whole_image", "image",
ctx->image);
CHECK_PARAM_POINTER("imlib_render_pixmaps_for_whole_image",
@@ -1915,8 +1746,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_render_pixmaps_for_whole_image_at_size",
"image", ctx->image);
CHECK_PARAM_POINTER("imlib_render_pixmaps_for_whole_image_at_size",
@@ -1945,8 +1775,7 @@
EAPI void
imlib_free_pixmap_and_mask(Pixmap pixmap)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
__imlib_FreePixmap(ctx->display, pixmap);
}
@@ -1962,8 +1791,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_render_image_on_drawable", "image", ctx->image);
CAST_IMAGE(im, ctx->image);
if ((!(im->data)) && (im->loader) && (im->loader->load))
@@ -1992,8 +1820,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_render_image_on_drawable_at_size", "image",
ctx->image);
CAST_IMAGE(im, ctx->image);
@@ -2032,8 +1859,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_render_image_part_on_drawable_at_size", "image",
ctx->image);
CAST_IMAGE(im, ctx->image);
@@ -2051,8 +1877,7 @@
EAPI DATA32
imlib_render_get_pixel_color(void)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
return __imlib_RenderGetPixel(ctx->display, ctx->drawable, ctx->visual,
ctx->colormap, ctx->depth,
(DATA8) ctx->color.red,
@@ -2093,8 +1918,7 @@
ImlibImage *im_src, *im_dst;
int aa;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_blend_image_onto_image", "source_image",
source_image);
CHECK_PARAM_POINTER("imlib_blend_image_onto_image", "image", ctx->image);
@@ -2139,8 +1963,7 @@
{
DATA32 *data;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
if ((width <= 0) || (height <= 0))
return NULL;
data = malloc(width * height * sizeof(DATA32));
@@ -2172,8 +1995,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_create_image_using_data", "data", data,
NULL);
if ((width <= 0) || (height <= 0))
@@ -2202,8 +2024,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_create_image_using_copied_data", "data",
data, NULL);
if ((width <= 0) || (height <= 0))
@@ -2251,8 +2072,7 @@
ImlibImage *im;
char domask = 0;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
if (mask)
{
domask = 1;
@@ -2299,8 +2119,7 @@
ImlibImage *im;
char domask = 0;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
if (mask)
domask = 1;
im = __imlib_CreateImage(width, height, NULL);
@@ -2352,8 +2171,7 @@
GC gc = 0, mgc = 0;
Pixmap p, m;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
if ((mask) || (get_mask_from_shape))
domask = 1;
p = XCreatePixmap(ctx->display, ctx->drawable, destination_width,
@@ -2466,8 +2284,7 @@
char domask = 0;
int pre_adj;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_copy_drawable_to_image", "image",
ctx->image, 0);
if (mask)
@@ -2542,8 +2359,7 @@
{
ImlibImage *im, *im_old;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_clone_image", "image", ctx->image, NULL);
CAST_IMAGE(im_old, ctx->image);
if ((!(im_old->data)) && (im_old->loader) && (im_old->loader->load))
@@ -2595,8 +2411,7 @@
{
ImlibImage *im, *im_old;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_create_cropped_image", "image",
ctx->image, NULL);
CAST_IMAGE(im_old, ctx->image);
@@ -2652,8 +2467,7 @@
{
ImlibImage *im, *im_old;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_create_cropped_scaled_image", "image",
ctx->image, NULL);
CAST_IMAGE(im_old, ctx->image);
@@ -2703,8 +2517,7 @@
{
ImlibUpdate *u;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
u = (ImlibUpdate *) updates;
return (Imlib_Updates) __imlib_DupUpdates(u);
}
@@ -2727,8 +2540,7 @@
{
ImlibUpdate *u;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
u = (ImlibUpdate *) updates;
return (Imlib_Updates) __imlib_AddUpdate(u, x, y, w, h);
}
@@ -2750,8 +2562,7 @@
{
ImlibUpdate *u;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
u = (ImlibUpdate *) updates;
return (Imlib_Updates) __imlib_MergeUpdate(u, w, h, 0);
}
@@ -2771,8 +2582,7 @@
{
ImlibUpdate *u;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
u = (ImlibUpdate *) updates;
return (Imlib_Updates) __imlib_MergeUpdate(u, w, h, 3);
}
@@ -2787,8 +2597,7 @@
{
ImlibUpdate *u;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
u = (ImlibUpdate *) updates;
__imlib_FreeUpdates(u);
}
@@ -2805,8 +2614,7 @@
{
ImlibUpdate *u;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
u = (ImlibUpdate *) updates;
return (Imlib_Updates) (u->next);
}
@@ -2827,8 +2635,7 @@
{
ImlibUpdate *u;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_updates_get_coordinates", "updates", updates);
u = (ImlibUpdate *) updates;
if (x_return)
@@ -2856,8 +2663,7 @@
{
ImlibUpdate *u;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_updates_set_coordinates", "updates", updates);
u = (ImlibUpdate *) updates;
u->x = x;
@@ -2882,8 +2688,7 @@
ImlibUpdate *u;
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_render_image_updates_on_drawable", "image",
ctx->image);
CAST_IMAGE(im, ctx->image);
@@ -2915,8 +2720,7 @@
EAPI Imlib_Updates
imlib_updates_init(void)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
return (Imlib_Updates) NULL;
}
@@ -2934,8 +2738,7 @@
{
ImlibUpdate *u, *uu;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
u = (ImlibUpdate *) updates;
uu = (ImlibUpdate *) appended_updates;
if (!uu)
@@ -2962,8 +2765,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_flip_horizontal", "image", ctx->image);
CAST_IMAGE(im, ctx->image);
if ((!(im->data)) && (im->loader) && (im->loader->load))
@@ -2982,8 +2784,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_flip_vertical", "image", ctx->image);
CAST_IMAGE(im, ctx->image);
if ((!(im->data)) && (im->loader) && (im->loader->load))
@@ -3004,8 +2805,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_flip_diagonal", "image", ctx->image);
CAST_IMAGE(im, ctx->image);
if ((!(im->data)) && (im->loader) && (im->loader->load))
@@ -3029,8 +2829,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_orientate", "image", ctx->image);
CAST_IMAGE(im, ctx->image);
if ((!(im->data)) && (im->loader) && (im->loader->load))
@@ -3079,8 +2878,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_blur", "image", ctx->image);
CAST_IMAGE(im, ctx->image);
if ((!(im->data)) && (im->loader) && (im->loader->load))
@@ -3102,8 +2900,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CAST_IMAGE(im, ctx->image);
CHECK_PARAM_POINTER("imlib_image_sharpen", "image", ctx->image);
if ((!(im->data)) && (im->loader) && (im->loader->load))
@@ -3123,8 +2920,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_tile_horizontal", "image", ctx->image);
CAST_IMAGE(im, ctx->image);
if ((!(im->data)) && (im->loader) && (im->loader->load))
@@ -3144,8 +2940,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_tile_vertical", "image", ctx->image);
CAST_IMAGE(im, ctx->image);
if ((!(im->data)) && (im->loader) && (im->loader->load))
@@ -3166,8 +2961,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_tile", "image", ctx->image);
CAST_IMAGE(im, ctx->image);
if ((!(im->data)) && (im->loader) && (im->loader->load))
@@ -3202,8 +2996,7 @@
EAPI void
imlib_free_font(void)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_free_font", "font", ctx->font);
imlib_remove_font_from_fallback_chain(ctx->font);
imlib_font_free(ctx->font);
@@ -3288,8 +3081,7 @@
EAPI void
imlib_text_draw(int x, int y, const char *text)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
imlib_text_draw_with_return_metrics(x, y, text, NULL, NULL, NULL, NULL);
}
@@ -3319,8 +3111,7 @@
ImlibFont *fn;
int dir;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_text_draw_with_return_metrics", "font",
ctx->font);
CHECK_PARAM_POINTER("imlib_text_draw_with_return_metrics", "image",
@@ -3363,8 +3154,7 @@
int w, h;
int dir;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_get_text_size", "font", ctx->font);
CHECK_PARAM_POINTER("imlib_get_text_size", "text", text);
fn = (ImlibFont *) ctx->font;
@@ -3468,8 +3258,7 @@
ImlibFont *fn;
int w, h;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_get_text_advance", "font", ctx->font);
CHECK_PARAM_POINTER("imlib_get_text_advance", "text", text);
fn = (ImlibFont *) ctx->font;
@@ -3493,8 +3282,7 @@
{
ImlibFont *fn;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_get_text_advance", "font", ctx->font, 0);
CHECK_PARAM_POINTER_RETURN("imlib_get_text_advance", "text", text, 0);
fn = (ImlibFont *) ctx->font;
@@ -3510,8 +3298,7 @@
EAPI void
imlib_add_path_to_font_path(const char *path)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_add_path_to_font_path", "path", path);
if (!imlib_font_path_exists(path))
imlib_font_add_font_path(path);
@@ -3525,8 +3312,7 @@
EAPI void
imlib_remove_path_from_font_path(const char *path)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_remove_path_from_font_path", "path", path);
imlib_font_del_font_path(path);
}
@@ -3546,8 +3332,7 @@
EAPI char **
imlib_list_font_path(int *number_return)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_list_font_path", "number_return",
number_return, NULL);
return imlib_font_list_font_path(number_return);
@@ -3581,8 +3366,7 @@
int w, h, cx, cy, cw, ch, cp, xx, yy;
int dir;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_text_get_index_and_location", "font",
ctx->font, -1);
CHECK_PARAM_POINTER_RETURN("imlib_text_get_index_and_location", "text",
@@ -3694,8 +3478,7 @@
ImlibFont *fn;
int cx, cy, cw, ch, w, h;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_text_get_index_and_location", "font", ctx->font);
CHECK_PARAM_POINTER("imlib_text_get_index_and_location", "text", text);
fn = (ImlibFont *) ctx->font;
@@ -3768,8 +3551,7 @@
EAPI char **
imlib_list_fonts(int *number_return)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_list_fonts", "number_return",
number_return, NULL);
return imlib_font_list_fonts(number_return);
@@ -3797,8 +3579,7 @@
EAPI int
imlib_get_font_cache_size(void)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
return imlib_font_cache_get();
}
@@ -3813,8 +3594,7 @@
EAPI void
imlib_set_font_cache_size(int bytes)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
imlib_font_cache_set(bytes);
}
@@ -3825,8 +3605,7 @@
EAPI void
imlib_flush_font_cache(void)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
imlib_font_flush();
}
@@ -3839,8 +3618,7 @@
EAPI int
imlib_get_font_ascent(void)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_get_font_ascent", "font", ctx->font, 0);
return imlib_font_ascent_get(ctx->font);
}
@@ -3854,8 +3632,7 @@
EAPI int
imlib_get_font_descent(void)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_get_font_ascent", "font", ctx->font, 0);
return imlib_font_descent_get(ctx->font);
}
@@ -3869,8 +3646,7 @@
EAPI int
imlib_get_maximum_font_ascent(void)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_get_font_ascent", "font", ctx->font, 0);
return imlib_font_max_ascent_get(ctx->font);
}
@@ -3884,8 +3660,7 @@
EAPI int
imlib_get_maximum_font_descent(void)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_get_font_ascent", "font", ctx->font, 0);
return imlib_font_max_descent_get(ctx->font);
}
@@ -3900,8 +3675,7 @@
EAPI Imlib_Color_Modifier
imlib_create_color_modifier(void)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
return (Imlib_Color_Modifier) __imlib_CreateCmod();
}
@@ -3911,8 +3685,7 @@
EAPI void
imlib_free_color_modifier(void)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_free_color_modifier", "color_modifier",
ctx->color_modifier);
__imlib_FreeCmod((ImlibColorModifier *) ctx->color_modifier);
@@ -3931,8 +3704,7 @@
EAPI void
imlib_modify_color_modifier_gamma(double gamma_value)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_modify_color_modifier_gamma", "color_modifier",
ctx->color_modifier);
__imlib_CmodModGamma((ImlibColorModifier *) ctx->color_modifier,
@@ -3952,8 +3724,7 @@
EAPI void
imlib_modify_color_modifier_brightness(double brightness_value)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_modify_color_modifier_brightness",
"color_modifier", ctx->color_modifier);
__imlib_CmodModBrightness((ImlibColorModifier *) ctx->color_modifier,
@@ -3971,8 +3742,7 @@
EAPI void
imlib_modify_color_modifier_contrast(double contrast_value)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_modify_color_modifier_contrast",
"color_modifier", ctx->color_modifier);
__imlib_CmodModContrast((ImlibColorModifier *) ctx->color_modifier,
@@ -3995,8 +3765,7 @@
imlib_set_color_modifier_tables(DATA8 * red_table, DATA8 * green_table,
DATA8 * blue_table, DATA8 * alpha_table)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_set_color_modifier_tables", "color_modifier",
ctx->color_modifier);
__imlib_CmodSetTables((ImlibColorModifier *) ctx->color_modifier,
@@ -4017,8 +3786,7 @@
imlib_get_color_modifier_tables(DATA8 * red_table, DATA8 * green_table,
DATA8 * blue_table, DATA8 * alpha_table)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_get_color_modifier_tables", "color_modifier",
ctx->color_modifier);
__imlib_CmodGetTables((ImlibColorModifier *) ctx->color_modifier,
@@ -4031,8 +3799,7 @@
EAPI void
imlib_reset_color_modifier(void)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_rset_color_modifier", "color_modifier",
ctx->color_modifier);
__imlib_CmodReset((ImlibColorModifier *) ctx->color_modifier);
@@ -4047,8 +3814,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_apply_color_modifier", "image", ctx->image);
CHECK_PARAM_POINTER("imlib_apply_color_modifier", "color_modifier",
ctx->color_modifier);
@@ -4076,8 +3842,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_apply_color_modifier_to_rectangle", "image",
ctx->image);
CHECK_PARAM_POINTER("imlib_apply_color_modifier_to_rectangle",
@@ -4121,8 +3886,7 @@
ImlibImage *im;
DATA32 color;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_image_draw_pixel", "image", ctx->image,
NULL);
CAST_IMAGE(im, ctx->image);
@@ -4164,8 +3928,7 @@
ImlibImage *im;
DATA32 color;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_image_draw_line", "image", ctx->image,
NULL);
CAST_IMAGE(im, ctx->image);
@@ -4205,8 +3968,7 @@
ImlibImage *im;
DATA32 color;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_draw_rectangle", "image", ctx->image);
CAST_IMAGE(im, ctx->image);
if ((!(im->data)) && (im->loader) && (im->loader->load))
@@ -4240,8 +4002,7 @@
ImlibImage *im;
DATA32 color;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_fill_rectangle", "image", ctx->image);
CAST_IMAGE(im, ctx->image);
if ((!(im->data)) && (im->loader) && (im->loader->load))
@@ -4273,8 +4034,7 @@
{
ImlibImage *im, *im2;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_copy_alpha_to_image", "image_source",
image_source);
CHECK_PARAM_POINTER("imlib_image_copy_alpha_to_image", "image_destination",
@@ -4313,8 +4073,7 @@
{
ImlibImage *im, *im2;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_copy_alpha_rectangle_to_image",
"image_source", image_source);
CHECK_PARAM_POINTER("imlib_image_copy_alpha_rectangle_to_image",
@@ -4353,8 +4112,7 @@
ImlibImage *im;
int xx, yy, w, h, nx, ny;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_scroll_rect", "image", ctx->image);
CAST_IMAGE(im, ctx->image);
if ((!(im->data)) && (im->loader) && (im->loader->load))
@@ -4406,8 +4164,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_copy_rect", "image", ctx->image);
CAST_IMAGE(im, ctx->image);
if ((!(im->data)) && (im->loader) && (im->loader->load))
@@ -4427,8 +4184,7 @@
EAPI Imlib_Color_Range
imlib_create_color_range(void)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
return (Imlib_Color_Range) __imlib_CreateRange();
}
@@ -4438,8 +4194,7 @@
EAPI void
imlib_free_color_range(void)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_free_color_range", "color_range",
ctx->color_range);
__imlib_FreeRange((ImlibRange *) ctx->color_range);
@@ -4456,8 +4211,7 @@
EAPI void
imlib_add_color_to_color_range(int distance_away)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_add_color_to_color_range", "color_range",
ctx->color_range);
__imlib_AddRangeColor((ImlibRange *) ctx->color_range, ctx->color.red,
@@ -4483,8 +4237,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_fill_color_range_rectangle", "image",
ctx->image);
CHECK_PARAM_POINTER("imlib_image_fill_color_range_rectangle",
@@ -4522,8 +4275,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_fill_color_range_rectangle", "image",
ctx->image);
CHECK_PARAM_POINTER("imlib_image_fill_color_range_rectangle",
@@ -4555,8 +4307,7 @@
ImlibImage *im;
DATA32 *p;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_query_pixel", "image", ctx->image);
CHECK_PARAM_POINTER("imlib_image_query_pixel", "color_return",
color_return);
CAST_IMAGE(im, ctx->image);
@@ -4598,8 +4349,7 @@
DATA32 *p;
int r, g, b;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_query_pixel", "image", ctx->image);
CAST_IMAGE(im, ctx->image);
if ((!(im->data)) && (im->loader) && (im->loader->load))
@@ -4642,8 +4392,7 @@
DATA32 *p;
int r, g, b;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_query_pixel", "image", ctx->image);
CAST_IMAGE(im, ctx->image);
if ((!(im->data)) && (im->loader) && (im->loader->load))
@@ -4686,8 +4435,7 @@
ImlibImage *im;
DATA32 *p;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_query_pixel", "image", ctx->image);
CAST_IMAGE(im, ctx->image);
if ((!(im->data)) && (im->loader) && (im->loader->load))
@@ -4727,8 +4475,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_attach_data_value", "image", ctx->image);
CHECK_PARAM_POINTER("imlib_image_attach_data_value", "key", key);
CAST_IMAGE(im, ctx->image);
@@ -4751,8 +4498,7 @@
ImlibImageTag *t;
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_image_get_attached_data", "image",
ctx->image, NULL);
CHECK_PARAM_POINTER_RETURN("imlib_image_get_attached_data", "key", key,
@@ -4778,8 +4524,7 @@
ImlibImageTag *t;
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_image_get_attached_value", "image",
ctx->image, 0);
CHECK_PARAM_POINTER_RETURN("imlib_image_get_attached_value", "key", key, 0);
@@ -4801,8 +4546,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_remove_attached_data_value", "image",
ctx->image);
CHECK_PARAM_POINTER("imlib_image_remove_attached_data_value", "key", key);
@@ -4823,8 +4567,7 @@
ImlibImageTag *t;
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_remove_and_free_attached_data_value",
"image", ctx->image);
CHECK_PARAM_POINTER("imlib_image_remove_and_free_attached_data_value",
@@ -4846,8 +4589,7 @@
ImlibImage *im;
Imlib_Image prev_ctxt_image;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_save_image", "image", ctx->image);
CHECK_PARAM_POINTER("imlib_save_image", "filename", filename);
CAST_IMAGE(im, ctx->image);
@@ -4875,8 +4617,7 @@
ImlibImage *im;
Imlib_Image prev_ctxt_image;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_save_image_with_error_return", "image",
ctx->image);
CHECK_PARAM_POINTER("imlib_save_image_with_error_return", "filename",
@@ -4909,8 +4650,7 @@
int x, y, dx, dy, sz;
double x1, y1, d;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_create_rotated_image", "image",
ctx->image, NULL);
CAST_IMAGE(im_old, ctx->image);
@@ -4967,8 +4707,7 @@
int x, y, dx, dy, sz;
double x1, y1, d;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
// source image (to rotate)
CHECK_PARAM_POINTER("imlib_rotate_image_from_buffer", "source_image",
source_image);
@@ -5057,8 +4796,7 @@
{
ImlibImage *im_src, *im_dst;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_blend_image_onto_image_at_angle",
"source_image", source_image);
CHECK_PARAM_POINTER("imlib_blend_image_onto_image_at_angle", "image",
@@ -5147,8 +4885,7 @@
{
ImlibImage *im_src, *im_dst;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_blend_image_onto_image_skewed", "source_image",
source_image);
CHECK_PARAM_POINTER("imlib_blend_image_onto_image_skewed", "image",
@@ -5201,8 +4938,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_render_image_on_drawable_skewed", "image",
ctx->image);
CAST_IMAGE(im, ctx->image);
@@ -5243,8 +4979,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_render_image_on_drawable_at_angle", "image",
ctx->image);
CAST_IMAGE(im, ctx->image);
@@ -5268,8 +5003,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_filter", "image", ctx->image);
CHECK_PARAM_POINTER("imlib_image_filter", "filter", ctx->filter);
CAST_IMAGE(im, ctx->image);
@@ -5284,16 +5018,14 @@
EAPI Imlib_Filter
imlib_create_filter(int initsize)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
return (Imlib_Filter) __imlib_CreateFilter(initsize);
}
EAPI void
imlib_free_filter(void)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_free_filter", "filter", ctx->filter);
__imlib_FreeFilter((ImlibFilter *) ctx->filter);
ctx->filter = NULL;
@@ -5308,8 +5040,7 @@
EAPI void
imlib_context_set_filter(Imlib_Filter filter)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
ctx->filter = filter;
}
@@ -5321,8 +5052,7 @@
EAPI Imlib_Filter
imlib_context_get_filter(void)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
return ctx->filter;
}
@@ -5331,8 +5061,7 @@
{
ImlibFilter *fil;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_filter_set", "filter", ctx->filter);
fil = (ImlibFilter *) ctx->filter;
__imlib_FilterSetColor(&fil->alpha, xoff, yoff, a, 0, 0, 0);
@@ -5346,8 +5075,7 @@
{
ImlibFilter *fil;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_filter_set_alpha", "filter", ctx->filter);
fil = (ImlibFilter *) ctx->filter;
__imlib_FilterSetColor(&fil->alpha, xoff, yoff, a, r, g, b);
@@ -5358,8 +5086,7 @@
{
ImlibFilter *fil;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_filter_set_red", "filter", ctx->filter);
fil = (ImlibFilter *) ctx->filter;
__imlib_FilterSetColor(&fil->red, xoff, yoff, a, r, g, b);
@@ -5370,8 +5097,7 @@
{
ImlibFilter *fil;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_filter_set_green", "filter", ctx->filter);
fil = (ImlibFilter *) ctx->filter;
__imlib_FilterSetColor(&fil->green, xoff, yoff, a, r, g, b);
@@ -5382,8 +5108,7 @@
{
ImlibFilter *fil;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_filter_set_blue", "filter", ctx->filter);
fil = (ImlibFilter *) ctx->filter;
__imlib_FilterSetColor(&fil->blue, xoff, yoff, a, r, g, b);
@@ -5392,8 +5117,7 @@
EAPI void
imlib_filter_constants(int a, int r, int g, int b)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_filter_constants", "filter", ctx->filter);
__imlib_FilterConstants((ImlibFilter *) ctx->filter, a, r, g, b);
}
@@ -5401,8 +5125,7 @@
EAPI void
imlib_filter_divisors(int a, int r, int g, int b)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_filter_divisors", "filter", ctx->filter);
__imlib_FilterDivisors((ImlibFilter *) ctx->filter, a, r, g, b);
}
@@ -5413,8 +5136,7 @@
va_list param_list;
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
__imlib_dynamic_filters_init();
CAST_IMAGE(im, ctx->image);
if ((!(im->data)) && (im->loader) && (im->loader->load))
@@ -5433,8 +5155,7 @@
EAPI ImlibPolygon
imlib_polygon_new(void)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
return (ImlibPolygon) __imlib_polygon_new();
}
@@ -5450,8 +5171,7 @@
EAPI void
imlib_polygon_add_point(ImlibPolygon poly, int x, int y)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_polygon_add_point", "polygon", poly);
__imlib_polygon_add_point((ImlibPoly) poly, x, y);
}
@@ -5464,8 +5184,7 @@
EAPI void
imlib_polygon_free(ImlibPolygon poly)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_polygon_free", "polygon", poly);
__imlib_polygon_free((ImlibPoly) poly);
}
@@ -5485,8 +5204,7 @@
ImlibImage *im;
DATA32 color;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_draw_polygon", "image", ctx->image);
CAST_IMAGE(im, ctx->image);
if ((!(im->data)) && (im->loader) && (im->loader->load))
@@ -5516,8 +5234,7 @@
ImlibImage *im;
DATA32 color;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_fill_polygon", "image", ctx->image);
CAST_IMAGE(im, ctx->image);
if ((!(im->data)) && (im->loader) && (im->loader->load))
@@ -5550,8 +5267,7 @@
imlib_polygon_get_bounds(ImlibPolygon poly, int *px1, int *py1, int *px2,
int *py2)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_polygon_get_bounds", "polygon", poly);
__imlib_polygon_get_bounds((ImlibPoly) poly, px1, py1, px2, py2);
}
@@ -5574,8 +5290,7 @@
ImlibImage *im;
DATA32 color;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_draw_ellipse", "image", ctx->image);
CAST_IMAGE(im, ctx->image);
if ((!(im->data)) && (im->loader) && (im->loader->load))
@@ -5612,8 +5327,7 @@
ImlibImage *im;
DATA32 color;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_fill_ellipse", "image", ctx->image);
CAST_IMAGE(im, ctx->image);
if ((!(im->data)) && (im->loader) && (im->loader->load))
@@ -5642,8 +5356,7 @@
EAPI unsigned char
imlib_polygon_contains_point(ImlibPolygon poly, int x, int y)
{
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER_RETURN("imlib_polygon_contains_point", "polygon", poly,
0);
return __imlib_polygon_contains_point((ImlibPoly) poly, x, y);
@@ -5654,8 +5367,7 @@
{
ImlibImage *im;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_clear", "image", ctx->image);
CAST_IMAGE(im, ctx->image);
if ((!(im->data)) && (im->loader) && (im->loader->load))
@@ -5673,8 +5385,7 @@
int i, max;
DATA32 col;
- if (!ctx)
- ctx = imlib_context_new();
+ CHECK_CONTEXT(ctx);
CHECK_PARAM_POINTER("imlib_image_clear_color", "image", ctx->image);
CAST_IMAGE(im, ctx->image);
if ((!(im->data)) && (im->loader) && (im->loader->load))
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
