kwo pushed a commit to branch master. http://git.enlightenment.org/legacy/imlib2.git/commit/?id=89def8bab3fe0cc3ae83036ad60b9295ba119791
commit 89def8bab3fe0cc3ae83036ad60b9295ba119791 Author: Kim Woelders <[email protected]> Date: Sat Dec 4 12:04:39 2021 +0100 Drop context check/init in API functions Obsolete as we now have an initial static one. --- src/lib/api.c | 226 ---------------------------------------------------------- 1 file changed, 226 deletions(-) diff --git a/src/lib/api.c b/src/lib/api.c index 7c343cf..a5f2ab5 100644 --- a/src/lib/api.c +++ b/src/lib/api.c @@ -180,20 +180,6 @@ imlib_context_new(void) 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 @@ -267,7 +253,6 @@ imlib_context_get(void) EAPI void imlib_context_set_cliprect(int x, int y, int w, int h) { - CHECK_CONTEXT(ctx); ctx->cliprect.x = x; ctx->cliprect.y = y; ctx->cliprect.w = w; @@ -277,7 +262,6 @@ imlib_context_set_cliprect(int x, int y, int w, int h) EAPI void imlib_context_get_cliprect(int *x, int *y, int *w, int *h) { - CHECK_CONTEXT(ctx); *x = ctx->cliprect.x; *y = ctx->cliprect.y; *w = ctx->cliprect.w; @@ -300,7 +284,6 @@ imlib_context_get_cliprect(int *x, int *y, int *w, int *h) EAPI void imlib_context_set_display(Display * display) { - CHECK_CONTEXT(ctx); ctx->display = display; } @@ -312,7 +295,6 @@ imlib_context_set_display(Display * display) EAPI Display * imlib_context_get_display(void) { - CHECK_CONTEXT(ctx); return ctx->display; } @@ -325,7 +307,6 @@ imlib_context_get_display(void) EAPI void imlib_context_disconnect_display(void) { - CHECK_CONTEXT(ctx); if (!ctx->display) return; __imlib_RenderDisconnect(ctx->display); @@ -343,7 +324,6 @@ imlib_context_disconnect_display(void) EAPI void imlib_context_set_visual(Visual * visual) { - CHECK_CONTEXT(ctx); ctx->visual = visual; ctx->depth = imlib_get_visual_depth(ctx->display, ctx->visual); } @@ -356,7 +336,6 @@ imlib_context_set_visual(Visual * visual) EAPI Visual * imlib_context_get_visual(void) { - CHECK_CONTEXT(ctx); return ctx->visual; } @@ -370,7 +349,6 @@ imlib_context_get_visual(void) EAPI void imlib_context_set_colormap(Colormap colormap) { - CHECK_CONTEXT(ctx); ctx->colormap = colormap; } @@ -382,7 +360,6 @@ imlib_context_set_colormap(Colormap colormap) EAPI Colormap imlib_context_get_colormap(void) { - CHECK_CONTEXT(ctx); return ctx->colormap; } @@ -396,7 +373,6 @@ imlib_context_get_colormap(void) EAPI void imlib_context_set_drawable(Drawable drawable) { - CHECK_CONTEXT(ctx); ctx->drawable = drawable; } @@ -408,7 +384,6 @@ imlib_context_set_drawable(Drawable drawable) EAPI Drawable imlib_context_get_drawable(void) { - CHECK_CONTEXT(ctx); return ctx->drawable; } @@ -422,7 +397,6 @@ imlib_context_get_drawable(void) EAPI void imlib_context_set_mask(Pixmap mask) { - CHECK_CONTEXT(ctx); ctx->mask = mask; } @@ -434,7 +408,6 @@ imlib_context_set_mask(Pixmap mask) EAPI Pixmap imlib_context_get_mask(void) { - CHECK_CONTEXT(ctx); return ctx->mask; } @@ -444,7 +417,6 @@ imlib_context_get_mask(void) EAPI int imlib_get_ximage_cache_count_used(void) { - CHECK_CONTEXT(ctx); return __imlib_GetXImageCacheCountUsed(ctx->display); } @@ -454,7 +426,6 @@ imlib_get_ximage_cache_count_used(void) EAPI int imlib_get_ximage_cache_count_max(void) { - CHECK_CONTEXT(ctx); return __imlib_GetXImageCacheCountMax(ctx->display); } @@ -471,7 +442,6 @@ imlib_get_ximage_cache_count_max(void) EAPI void imlib_set_ximage_cache_count_max(int count) { - CHECK_CONTEXT(ctx); __imlib_SetXImageCacheCountMax(ctx->display, count); } @@ -481,7 +451,6 @@ imlib_set_ximage_cache_count_max(int count) EAPI int imlib_get_ximage_cache_size_used(void) { - CHECK_CONTEXT(ctx); return __imlib_GetXImageCacheSizeUsed(ctx->display); } @@ -491,7 +460,6 @@ imlib_get_ximage_cache_size_used(void) EAPI int imlib_get_ximage_cache_size_max(void) { - CHECK_CONTEXT(ctx); return __imlib_GetXImageCacheSizeMax(ctx->display); } @@ -508,7 +476,6 @@ imlib_get_ximage_cache_size_max(void) EAPI void imlib_set_ximage_cache_size_max(int bytes) { - CHECK_CONTEXT(ctx); __imlib_SetXImageCacheSizeMax(ctx->display, bytes); } #endif @@ -524,7 +491,6 @@ imlib_set_ximage_cache_size_max(int bytes) EAPI void imlib_context_set_dither_mask(char dither_mask) { - CHECK_CONTEXT(ctx); ctx->dither_mask = dither_mask; } @@ -537,7 +503,6 @@ imlib_context_set_dither_mask(char dither_mask) EAPI char imlib_context_get_dither_mask(void) { - CHECK_CONTEXT(ctx); return ctx->dither_mask; } @@ -551,7 +516,6 @@ imlib_context_get_dither_mask(void) EAPI void imlib_context_set_mask_alpha_threshold(int mask_alpha_threshold) { - CHECK_CONTEXT(ctx); ctx->mask_alpha_threshold = mask_alpha_threshold; } @@ -563,7 +527,6 @@ imlib_context_set_mask_alpha_threshold(int mask_alpha_threshold) EAPI int imlib_context_get_mask_alpha_threshold(void) { - CHECK_CONTEXT(ctx); return ctx->mask_alpha_threshold; } @@ -580,7 +543,6 @@ imlib_context_get_mask_alpha_threshold(void) EAPI void imlib_context_set_anti_alias(char anti_alias) { - CHECK_CONTEXT(ctx); ctx->anti_alias = anti_alias; } @@ -593,7 +555,6 @@ imlib_context_set_anti_alias(char anti_alias) EAPI char imlib_context_get_anti_alias(void) { - CHECK_CONTEXT(ctx); return ctx->anti_alias; } @@ -611,7 +572,6 @@ imlib_context_get_anti_alias(void) EAPI void imlib_context_set_dither(char dither) { - CHECK_CONTEXT(ctx); ctx->dither = dither; } @@ -624,7 +584,6 @@ imlib_context_set_dither(char dither) EAPI char imlib_context_get_dither(void) { - CHECK_CONTEXT(ctx); return ctx->dither; } @@ -639,7 +598,6 @@ imlib_context_get_dither(void) EAPI void imlib_context_set_blend(char blend) { - CHECK_CONTEXT(ctx); ctx->blend = blend; } @@ -652,7 +610,6 @@ imlib_context_set_blend(char blend) EAPI char imlib_context_get_blend(void) { - CHECK_CONTEXT(ctx); return ctx->blend; } @@ -670,7 +627,6 @@ imlib_context_get_blend(void) EAPI void imlib_context_set_color_modifier(Imlib_Color_Modifier color_modifier) { - CHECK_CONTEXT(ctx); ctx->color_modifier = color_modifier; } @@ -682,7 +638,6 @@ imlib_context_set_color_modifier(Imlib_Color_Modifier color_modifier) EAPI Imlib_Color_Modifier imlib_context_get_color_modifier(void) { - CHECK_CONTEXT(ctx); return ctx->color_modifier; } @@ -704,7 +659,6 @@ imlib_context_get_color_modifier(void) EAPI void imlib_context_set_operation(Imlib_Operation operation) { - CHECK_CONTEXT(ctx); ctx->operation = (ImlibOp) operation; } @@ -716,7 +670,6 @@ imlib_context_set_operation(Imlib_Operation operation) EAPI Imlib_Operation imlib_context_get_operation(void) { - CHECK_CONTEXT(ctx); return (Imlib_Operation) ctx->operation; } @@ -729,7 +682,6 @@ imlib_context_get_operation(void) EAPI void imlib_context_set_font(Imlib_Font font) { - CHECK_CONTEXT(ctx); ctx->font = font; } @@ -741,7 +693,6 @@ imlib_context_set_font(Imlib_Font font) EAPI Imlib_Font imlib_context_get_font(void) { - CHECK_CONTEXT(ctx); return ctx->font; } @@ -758,7 +709,6 @@ imlib_context_get_font(void) EAPI void imlib_context_set_direction(Imlib_Text_Direction direction) { - CHECK_CONTEXT(ctx); ctx->direction = direction; } @@ -772,7 +722,6 @@ imlib_context_set_direction(Imlib_Text_Direction direction) EAPI void imlib_context_set_angle(double angle) { - CHECK_CONTEXT(ctx); ctx->angle = angle; } @@ -785,7 +734,6 @@ imlib_context_set_angle(double angle) EAPI double imlib_context_get_angle(void) { - CHECK_CONTEXT(ctx); return ctx->angle; } @@ -797,7 +745,6 @@ imlib_context_get_angle(void) EAPI Imlib_Text_Direction imlib_context_get_direction(void) { - CHECK_CONTEXT(ctx); return ctx->direction; } @@ -817,8 +764,6 @@ imlib_context_set_color(int red, int green, int blue, int alpha) { DATA8 r, g, b, a; - CHECK_CONTEXT(ctx); - r = red; g = green; b = blue; @@ -843,7 +788,6 @@ imlib_context_set_color(int red, int green, int blue, int alpha) EAPI void imlib_context_get_color(int *red, int *green, int *blue, int *alpha) { - CHECK_CONTEXT(ctx); *red = ctx->color.red; *green = ctx->color.green; *blue = ctx->color.blue; @@ -859,7 +803,6 @@ imlib_context_get_color(int *red, int *green, int *blue, int *alpha) EAPI Imlib_Color * imlib_context_get_imlib_color(void) { - CHECK_CONTEXT(ctx); return &ctx->color; } @@ -958,8 +901,6 @@ imlib_context_set_color_cmya(int cyan, int magenta, int yellow, int alpha) { DATA8 r, g, b, a; - CHECK_CONTEXT(ctx); - r = 255 - cyan; g = 255 - magenta; b = 255 - yellow; @@ -985,7 +926,6 @@ imlib_context_set_color_cmya(int cyan, int magenta, int yellow, int alpha) EAPI void imlib_context_get_color_cmya(int *cyan, int *magenta, int *yellow, int *alpha) { - CHECK_CONTEXT(ctx); *cyan = 255 - ctx->color.red; *magenta = 255 - ctx->color.green; *yellow = 255 - ctx->color.blue; @@ -1000,7 +940,6 @@ imlib_context_get_color_cmya(int *cyan, int *magenta, int *yellow, int *alpha) EAPI void imlib_context_set_color_range(Imlib_Color_Range color_range) { - CHECK_CONTEXT(ctx); ctx->color_range = color_range; } @@ -1012,7 +951,6 @@ imlib_context_set_color_range(Imlib_Color_Range color_range) EAPI Imlib_Color_Range imlib_context_get_color_range(void) { - CHECK_CONTEXT(ctx); return ctx->color_range; } @@ -1025,7 +963,6 @@ EAPI void imlib_context_set_image_data_memory_function(Imlib_Image_Data_Memory_Function memory_function) { - CHECK_CONTEXT(ctx); ctx->image_data_memory_func = memory_function; } @@ -1039,7 +976,6 @@ imlib_context_set_image_data_memory_function(Imlib_Image_Data_Memory_Function EAPI void imlib_context_set_progress_function(Imlib_Progress_Function progress_function) { - CHECK_CONTEXT(ctx); ctx->progress_func = progress_function; } @@ -1051,7 +987,6 @@ imlib_context_set_progress_function(Imlib_Progress_Function progress_function) EAPI Imlib_Image_Data_Memory_Function imlib_context_get_image_data_memory_function(void) { - CHECK_CONTEXT(ctx); return ctx->image_data_memory_func; } @@ -1063,7 +998,6 @@ imlib_context_get_image_data_memory_function(void) EAPI Imlib_Progress_Function imlib_context_get_progress_function(void) { - CHECK_CONTEXT(ctx); return ctx->progress_func; } @@ -1079,7 +1013,6 @@ imlib_context_get_progress_function(void) EAPI void imlib_context_set_progress_granularity(char progress_granularity) { - CHECK_CONTEXT(ctx); ctx->progress_granularity = progress_granularity; } @@ -1091,7 +1024,6 @@ imlib_context_set_progress_granularity(char progress_granularity) EAPI char imlib_context_get_progress_granularity(void) { - CHECK_CONTEXT(ctx); return ctx->progress_granularity; } @@ -1103,7 +1035,6 @@ imlib_context_get_progress_granularity(void) EAPI void imlib_context_set_image(Imlib_Image image) { - CHECK_CONTEXT(ctx); ctx->image = image; } @@ -1115,21 +1046,18 @@ imlib_context_set_image(Imlib_Image image) EAPI Imlib_Image imlib_context_get_image(void) { - CHECK_CONTEXT(ctx); return ctx->image; } EAPI void imlib_context_set_TTF_encoding(Imlib_TTF_Encoding encoding) { - CHECK_CONTEXT(ctx); ctx->encoding = encoding; } EAPI Imlib_TTF_Encoding imlib_context_get_TTF_encoding(void) { - CHECK_CONTEXT(ctx); return ctx->encoding; } @@ -1144,7 +1072,6 @@ imlib_context_get_TTF_encoding(void) EAPI int imlib_get_cache_used(void) { - CHECK_CONTEXT(ctx); return __imlib_CurrentCacheSize(); } @@ -1157,7 +1084,6 @@ imlib_get_cache_used(void) EAPI int imlib_get_cache_size(void) { - CHECK_CONTEXT(ctx); return __imlib_GetCacheSize(); } @@ -1173,7 +1099,6 @@ imlib_get_cache_size(void) EAPI void imlib_set_cache_size(int bytes) { - CHECK_CONTEXT(ctx); __imlib_SetCacheSize(bytes); } @@ -1186,7 +1111,6 @@ imlib_set_cache_size(int bytes) EAPI int imlib_get_color_usage(void) { - CHECK_CONTEXT(ctx); #ifdef BUILD_X11 return (int)_max_colors; #else @@ -1204,7 +1128,6 @@ imlib_get_color_usage(void) EAPI void imlib_set_color_usage(int max) { - CHECK_CONTEXT(ctx); #ifdef BUILD_X11 if (max < 2) max = 2; @@ -1223,7 +1146,6 @@ imlib_set_color_usage(int max) EAPI void imlib_flush_loaders(void) { - CHECK_CONTEXT(ctx); __imlib_RemoveAllLoaders(); } @@ -1239,7 +1161,6 @@ imlib_flush_loaders(void) EAPI int imlib_get_visual_depth(Display * display, Visual * visual) { - 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); @@ -1259,7 +1180,6 @@ imlib_get_visual_depth(Display * display, Visual * visual) EAPI Visual * imlib_get_best_visual(Display * display, int screen, int *depth_return) { - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_get_best_visual", "display", display, NULL); CHECK_PARAM_POINTER_RETURN("imlib_get_best_visual", "depth_return", @@ -1281,7 +1201,6 @@ imlib_load_image(const char *file) { Imlib_Image im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_load_image", "file", file, NULL); im = __imlib_LoadImage(file, NULL, @@ -1305,7 +1224,6 @@ imlib_load_image_immediately(const char *file) { Imlib_Image im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_load_image_immediately", "file", file, NULL); @@ -1328,7 +1246,6 @@ imlib_load_image_without_cache(const char *file) { Imlib_Image im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_load_image_without_cache", "file", file, NULL); @@ -1352,7 +1269,6 @@ imlib_load_image_immediately_without_cache(const char *file) { Imlib_Image im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_load_image_immediately_without_cache", "file", file, NULL); @@ -1382,7 +1298,6 @@ imlib_load_image_fd(int fd, const char *file) Imlib_Image im; FILE *fp; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_load_image_fd", "file", file, NULL); fp = fdopen(fd, "rb"); @@ -1418,7 +1333,6 @@ imlib_load_image_with_error_return(const char *file, Imlib_Image im; ImlibLoadError er; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_load_image_with_error_return", "file", file, NULL); @@ -1445,7 +1359,6 @@ imlib_load_image_with_error_return(const char *file, EAPI void imlib_free_image(void) { - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_free_image", "image", ctx->image); __imlib_FreeImage(ctx->image); ctx->image = NULL; @@ -1460,7 +1373,6 @@ imlib_free_image_and_decache(void) { ImlibImage *im; - 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); @@ -1476,7 +1388,6 @@ imlib_image_get_width(void) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_image_get_width", "image", ctx->image, 0); CAST_IMAGE(im, ctx->image); return im->w; @@ -1490,7 +1401,6 @@ imlib_image_get_height(void) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_image_get_height", "image", ctx->image, 0); CAST_IMAGE(im, ctx->image); return im->h; @@ -1512,7 +1422,6 @@ imlib_image_get_filename(void) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_image_get_filename", "image", ctx->image, 0); CAST_IMAGE(im, ctx->image); @@ -1542,7 +1451,6 @@ imlib_image_get_data(void) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_image_get_data", "image", ctx->image, NULL); CAST_IMAGE(im, ctx->image); @@ -1565,7 +1473,6 @@ imlib_image_get_data_for_reading_only(void) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_image_get_data_for_reading_only", "image", ctx->image, NULL); CAST_IMAGE(im, ctx->image); @@ -1587,7 +1494,6 @@ imlib_image_put_back_data(DATA32 * data) { ImlibImage *im; - 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); @@ -1607,7 +1513,6 @@ imlib_image_has_alpha(void) { ImlibImage *im; - 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)) @@ -1629,7 +1534,6 @@ imlib_image_set_changes_on_disk(void) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_image_set_never_changes_on_disk", "image", ctx->image); CAST_IMAGE(im, ctx->image); @@ -1651,7 +1555,6 @@ imlib_image_get_border(Imlib_Border * border) { ImlibImage *im; - 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); @@ -1672,7 +1575,6 @@ imlib_image_set_border(Imlib_Border * border) { ImlibImage *im; - 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); @@ -1702,7 +1604,6 @@ imlib_image_set_format(const char *format) { ImlibImage *im; - 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); @@ -1726,7 +1627,6 @@ imlib_image_set_irrelevant_format(char irrelevant) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_image_set_irrelevant_format", "image", ctx->image); CAST_IMAGE(im, ctx->image); @@ -1745,7 +1645,6 @@ imlib_image_set_irrelevant_border(char irrelevant) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_image_set_irrelevant_border", "image", ctx->image); CAST_IMAGE(im, ctx->image); @@ -1765,7 +1664,6 @@ imlib_image_set_irrelevant_alpha(char irrelevant) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_image_set_irrelevant_alpha", "image", ctx->image); CAST_IMAGE(im, ctx->image); UPDATE_FLAG(im->flags, F_ALPHA_IRRELEVANT, irrelevant); @@ -1782,7 +1680,6 @@ imlib_image_format(void) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_image_format", "image", ctx->image, NULL); CAST_IMAGE(im, ctx->image); return im->format; @@ -1799,7 +1696,6 @@ imlib_image_set_has_alpha(char has_alpha) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_image_set_has_alpha", "image", ctx->image); CAST_IMAGE(im, ctx->image); UPDATE_FLAG(im->flags, F_HAS_ALPHA, has_alpha); @@ -1821,7 +1717,6 @@ imlib_render_pixmaps_for_whole_image(Pixmap * pixmap_return, { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_render_pixmaps_for_whole_image", "image", ctx->image); CHECK_PARAM_POINTER("imlib_render_pixmaps_for_whole_image", @@ -1856,7 +1751,6 @@ imlib_render_pixmaps_for_whole_image_at_size(Pixmap * pixmap_return, { ImlibImage *im; - 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", @@ -1882,7 +1776,6 @@ imlib_render_pixmaps_for_whole_image_at_size(Pixmap * pixmap_return, EAPI void imlib_free_pixmap_and_mask(Pixmap pixmap) { - CHECK_CONTEXT(ctx); __imlib_FreePixmap(ctx->display, pixmap); } @@ -1898,7 +1791,6 @@ imlib_render_image_on_drawable(int x, int y) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_render_image_on_drawable", "image", ctx->image); CAST_IMAGE(im, ctx->image); if (__imlib_LoadImageData(im)) @@ -1925,7 +1817,6 @@ imlib_render_image_on_drawable_at_size(int x, int y, int width, int height) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_render_image_on_drawable_at_size", "image", ctx->image); CAST_IMAGE(im, ctx->image); @@ -1962,7 +1853,6 @@ imlib_render_image_part_on_drawable_at_size(int source_x, int source_y, { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_render_image_part_on_drawable_at_size", "image", ctx->image); CAST_IMAGE(im, ctx->image); @@ -1978,7 +1868,6 @@ imlib_render_image_part_on_drawable_at_size(int source_x, int source_y, EAPI DATA32 imlib_render_get_pixel_color(void) { - CHECK_CONTEXT(ctx); return __imlib_RenderGetPixel(ctx->display, ctx->drawable, ctx->visual, ctx->colormap, ctx->depth, (DATA8) ctx->color.red, @@ -2019,7 +1908,6 @@ imlib_blend_image_onto_image(Imlib_Image source_image, char merge_alpha, ImlibImage *im_src, *im_dst; int aa; - 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); @@ -2060,7 +1948,6 @@ imlib_create_image(int width, int height) { DATA32 *data; - CHECK_CONTEXT(ctx); if (!IMAGE_DIMENSIONS_OK(width, height)) return NULL; data = malloc(width * height * sizeof(DATA32)); @@ -2092,7 +1979,6 @@ imlib_create_image_using_data(int width, int height, DATA32 * data) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_create_image_using_data", "data", data, NULL); if (!IMAGE_DIMENSIONS_OK(width, height)) @@ -2123,7 +2009,6 @@ EAPI Imlib_Image { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN ("imlib_create_image_using_data_and_memory_function", "data", data, NULL); if (!IMAGE_DIMENSIONS_OK(width, height)) @@ -2153,7 +2038,6 @@ imlib_create_image_using_copied_data(int width, int height, DATA32 * data) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_create_image_using_copied_data", "data", data, NULL); if (!IMAGE_DIMENSIONS_OK(width, height)) @@ -2201,7 +2085,6 @@ imlib_create_image_from_drawable(Pixmap mask, int x, int y, int width, ImlibImage *im; char domask = 0; - CHECK_CONTEXT(ctx); if (!IMAGE_DIMENSIONS_OK(width, height)) return NULL; if (mask) @@ -2246,7 +2129,6 @@ imlib_create_image_from_ximage(XImage * image, XImage * mask, int x, int y, { ImlibImage *im; - CHECK_CONTEXT(ctx); if (!IMAGE_DIMENSIONS_OK(width, height)) return NULL; im = __imlib_CreateImage(width, height, NULL); @@ -2294,7 +2176,6 @@ imlib_create_scaled_image_from_drawable(Pixmap mask, int source_x, ImlibImage *im; char domask; - CHECK_CONTEXT(ctx); if (!IMAGE_DIMENSIONS_OK(source_width, source_height)) return NULL; if (!IMAGE_DIMENSIONS_OK(destination_width, destination_height)) @@ -2349,7 +2230,6 @@ imlib_copy_drawable_to_image(Pixmap mask, int x, int y, int width, int height, char domask = 0; int pre_adj; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_copy_drawable_to_image", "image", ctx->image, 0); if (mask) @@ -2422,7 +2302,6 @@ imlib_clone_image(void) { ImlibImage *im, *im_old; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_clone_image", "image", ctx->image, NULL); CAST_IMAGE(im_old, ctx->image); if (__imlib_LoadImageData(im_old)) @@ -2470,7 +2349,6 @@ imlib_create_cropped_image(int x, int y, int width, int height) { ImlibImage *im, *im_old; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_create_cropped_image", "image", ctx->image, NULL); if (!IMAGE_DIMENSIONS_OK(abs(width), abs(height))) @@ -2526,7 +2404,6 @@ imlib_create_cropped_scaled_image(int source_x, int source_y, { ImlibImage *im, *im_old; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_create_cropped_scaled_image", "image", ctx->image, NULL); if (!IMAGE_DIMENSIONS_OK(abs(destination_width), abs(destination_height))) @@ -2576,7 +2453,6 @@ imlib_updates_clone(Imlib_Updates updates) { ImlibUpdate *u; - CHECK_CONTEXT(ctx); u = (ImlibUpdate *) updates; return (Imlib_Updates) __imlib_DupUpdates(u); } @@ -2599,7 +2475,6 @@ imlib_update_append_rect(Imlib_Updates updates, int x, int y, int w, int h) { ImlibUpdate *u; - CHECK_CONTEXT(ctx); u = (ImlibUpdate *) updates; return (Imlib_Updates) __imlib_AddUpdate(u, x, y, w, h); } @@ -2621,7 +2496,6 @@ imlib_updates_merge(Imlib_Updates updates, int w, int h) { ImlibUpdate *u; - CHECK_CONTEXT(ctx); u = (ImlibUpdate *) updates; return (Imlib_Updates) __imlib_MergeUpdate(u, w, h, 0); } @@ -2641,7 +2515,6 @@ imlib_updates_merge_for_rendering(Imlib_Updates updates, int w, int h) { ImlibUpdate *u; - CHECK_CONTEXT(ctx); u = (ImlibUpdate *) updates; return (Imlib_Updates) __imlib_MergeUpdate(u, w, h, 3); } @@ -2656,7 +2529,6 @@ imlib_updates_free(Imlib_Updates updates) { ImlibUpdate *u; - CHECK_CONTEXT(ctx); u = (ImlibUpdate *) updates; __imlib_FreeUpdates(u); } @@ -2673,7 +2545,6 @@ imlib_updates_get_next(Imlib_Updates updates) { ImlibUpdate *u; - CHECK_CONTEXT(ctx); u = (ImlibUpdate *) updates; return (Imlib_Updates) (u->next); } @@ -2694,7 +2565,6 @@ imlib_updates_get_coordinates(Imlib_Updates updates, int *x_return, { ImlibUpdate *u; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_updates_get_coordinates", "updates", updates); u = (ImlibUpdate *) updates; if (x_return) @@ -2722,7 +2592,6 @@ imlib_updates_set_coordinates(Imlib_Updates updates, int x, int y, int width, { ImlibUpdate *u; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_updates_set_coordinates", "updates", updates); u = (ImlibUpdate *) updates; u->x = x; @@ -2748,7 +2617,6 @@ imlib_render_image_updates_on_drawable(Imlib_Updates updates, int x, int y) ImlibImage *im; int ximcs; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_render_image_updates_on_drawable", "image", ctx->image); CAST_IMAGE(im, ctx->image); @@ -2781,7 +2649,6 @@ imlib_render_image_updates_on_drawable(Imlib_Updates updates, int x, int y) EAPI Imlib_Updates imlib_updates_init(void) { - CHECK_CONTEXT(ctx); return (Imlib_Updates) NULL; } @@ -2799,7 +2666,6 @@ imlib_updates_append_updates(Imlib_Updates updates, { ImlibUpdate *u, *uu; - CHECK_CONTEXT(ctx); u = (ImlibUpdate *) updates; uu = (ImlibUpdate *) appended_updates; if (!uu) @@ -2826,7 +2692,6 @@ imlib_image_flip_horizontal(void) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_image_flip_horizontal", "image", ctx->image); CAST_IMAGE(im, ctx->image); if (__imlib_LoadImageData(im)) @@ -2843,7 +2708,6 @@ imlib_image_flip_vertical(void) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_image_flip_vertical", "image", ctx->image); CAST_IMAGE(im, ctx->image); if (__imlib_LoadImageData(im)) @@ -2862,7 +2726,6 @@ imlib_image_flip_diagonal(void) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_image_flip_diagonal", "image", ctx->image); CAST_IMAGE(im, ctx->image); if (__imlib_LoadImageData(im)) @@ -2884,7 +2747,6 @@ imlib_image_orientate(int orientation) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_image_orientate", "image", ctx->image); CAST_IMAGE(im, ctx->image); if (__imlib_LoadImageData(im)) @@ -2931,7 +2793,6 @@ imlib_image_blur(int radius) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_image_blur", "image", ctx->image); CAST_IMAGE(im, ctx->image); if (__imlib_LoadImageData(im)) @@ -2951,7 +2812,6 @@ imlib_image_sharpen(int radius) { ImlibImage *im; - CHECK_CONTEXT(ctx); CAST_IMAGE(im, ctx->image); CHECK_PARAM_POINTER("imlib_image_sharpen", "image", ctx->image); if (__imlib_LoadImageData(im)) @@ -2969,7 +2829,6 @@ imlib_image_tile_horizontal(void) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_image_tile_horizontal", "image", ctx->image); CAST_IMAGE(im, ctx->image); if (__imlib_LoadImageData(im)) @@ -2987,7 +2846,6 @@ imlib_image_tile_vertical(void) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_image_tile_vertical", "image", ctx->image); CAST_IMAGE(im, ctx->image); if (__imlib_LoadImageData(im)) @@ -3006,7 +2864,6 @@ imlib_image_tile(void) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_image_tile", "image", ctx->image); CAST_IMAGE(im, ctx->image); if (__imlib_LoadImageData(im)) @@ -3039,7 +2896,6 @@ imlib_load_font(const char *font_name) EAPI void imlib_free_font(void) { - 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); @@ -3124,7 +2980,6 @@ imlib_get_next_font_in_fallback_chain(Imlib_Font fn) EAPI void imlib_text_draw(int x, int y, const char *text) { - CHECK_CONTEXT(ctx); imlib_text_draw_with_return_metrics(x, y, text, NULL, NULL, NULL, NULL); } @@ -3154,7 +3009,6 @@ imlib_text_draw_with_return_metrics(int x, int y, const char *text, ImlibFont *fn; int dir; - 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", @@ -3193,7 +3047,6 @@ imlib_get_text_size(const char *text, int *width_return, int *height_return) int w, h; int dir; - 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; @@ -3297,7 +3150,6 @@ imlib_get_text_advance(const char *text, int *horizontal_advance_return, ImlibFont *fn; int w, h; - 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; @@ -3321,7 +3173,6 @@ imlib_get_text_inset(const char *text) { ImlibFont *fn; - 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; @@ -3337,7 +3188,6 @@ imlib_get_text_inset(const char *text) EAPI void imlib_add_path_to_font_path(const char *path) { - 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); @@ -3351,7 +3201,6 @@ imlib_add_path_to_font_path(const char *path) EAPI void imlib_remove_path_from_font_path(const char *path) { - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_remove_path_from_font_path", "path", path); __imlib_font_del_font_path(path); } @@ -3371,7 +3220,6 @@ imlib_remove_path_from_font_path(const char *path) EAPI char ** imlib_list_font_path(int *number_return) { - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_list_font_path", "number_return", number_return, NULL); return __imlib_font_list_font_path(number_return); @@ -3405,7 +3253,6 @@ imlib_text_get_index_and_location(const char *text, int x, int y, int w, h, cx, cy, cw, ch, cp, xx, yy; int dir; - 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", @@ -3517,7 +3364,6 @@ imlib_text_get_location_at_index(const char *text, int index, ImlibFont *fn; int cx, cy, cw, ch, w, h; - 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; @@ -3591,7 +3437,6 @@ imlib_text_get_location_at_index(const char *text, int index, EAPI char ** imlib_list_fonts(int *number_return) { - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_list_fonts", "number_return", number_return, NULL); return __imlib_font_list_fonts(number_return); @@ -3619,7 +3464,6 @@ imlib_free_font_list(char **font_list, int number) EAPI int imlib_get_font_cache_size(void) { - CHECK_CONTEXT(ctx); return __imlib_font_cache_get(); } @@ -3634,7 +3478,6 @@ imlib_get_font_cache_size(void) EAPI void imlib_set_font_cache_size(int bytes) { - CHECK_CONTEXT(ctx); __imlib_font_cache_set(bytes); } @@ -3645,7 +3488,6 @@ imlib_set_font_cache_size(int bytes) EAPI void imlib_flush_font_cache(void) { - CHECK_CONTEXT(ctx); __imlib_font_flush(); } @@ -3658,7 +3500,6 @@ imlib_flush_font_cache(void) EAPI int imlib_get_font_ascent(void) { - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_get_font_ascent", "font", ctx->font, 0); return __imlib_font_ascent_get(ctx->font); } @@ -3672,7 +3513,6 @@ imlib_get_font_ascent(void) EAPI int imlib_get_font_descent(void) { - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_get_font_ascent", "font", ctx->font, 0); return __imlib_font_descent_get(ctx->font); } @@ -3686,7 +3526,6 @@ imlib_get_font_descent(void) EAPI int imlib_get_maximum_font_ascent(void) { - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_get_font_ascent", "font", ctx->font, 0); return __imlib_font_max_ascent_get(ctx->font); } @@ -3700,7 +3539,6 @@ imlib_get_maximum_font_ascent(void) EAPI int imlib_get_maximum_font_descent(void) { - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_get_font_ascent", "font", ctx->font, 0); return __imlib_font_max_descent_get(ctx->font); } @@ -3715,7 +3553,6 @@ imlib_get_maximum_font_descent(void) EAPI Imlib_Color_Modifier imlib_create_color_modifier(void) { - CHECK_CONTEXT(ctx); return (Imlib_Color_Modifier) __imlib_CreateCmod(); } @@ -3725,7 +3562,6 @@ imlib_create_color_modifier(void) EAPI void imlib_free_color_modifier(void) { - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_free_color_modifier", "color_modifier", ctx->color_modifier); __imlib_FreeCmod((ImlibColorModifier *) ctx->color_modifier); @@ -3744,7 +3580,6 @@ imlib_free_color_modifier(void) EAPI void imlib_modify_color_modifier_gamma(double gamma_value) { - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_modify_color_modifier_gamma", "color_modifier", ctx->color_modifier); __imlib_CmodModGamma((ImlibColorModifier *) ctx->color_modifier, @@ -3764,7 +3599,6 @@ imlib_modify_color_modifier_gamma(double gamma_value) EAPI void imlib_modify_color_modifier_brightness(double brightness_value) { - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_modify_color_modifier_brightness", "color_modifier", ctx->color_modifier); __imlib_CmodModBrightness((ImlibColorModifier *) ctx->color_modifier, @@ -3782,7 +3616,6 @@ imlib_modify_color_modifier_brightness(double brightness_value) EAPI void imlib_modify_color_modifier_contrast(double contrast_value) { - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_modify_color_modifier_contrast", "color_modifier", ctx->color_modifier); __imlib_CmodModContrast((ImlibColorModifier *) ctx->color_modifier, @@ -3805,7 +3638,6 @@ EAPI void imlib_set_color_modifier_tables(DATA8 * red_table, DATA8 * green_table, DATA8 * blue_table, DATA8 * alpha_table) { - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_set_color_modifier_tables", "color_modifier", ctx->color_modifier); __imlib_CmodSetTables((ImlibColorModifier *) ctx->color_modifier, @@ -3826,7 +3658,6 @@ EAPI void imlib_get_color_modifier_tables(DATA8 * red_table, DATA8 * green_table, DATA8 * blue_table, DATA8 * alpha_table) { - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_get_color_modifier_tables", "color_modifier", ctx->color_modifier); __imlib_CmodGetTables((ImlibColorModifier *) ctx->color_modifier, @@ -3839,7 +3670,6 @@ imlib_get_color_modifier_tables(DATA8 * red_table, DATA8 * green_table, EAPI void imlib_reset_color_modifier(void) { - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_rset_color_modifier", "color_modifier", ctx->color_modifier); __imlib_CmodReset((ImlibColorModifier *) ctx->color_modifier); @@ -3854,7 +3684,6 @@ imlib_apply_color_modifier(void) { ImlibImage *im; - 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); @@ -3880,7 +3709,6 @@ imlib_apply_color_modifier_to_rectangle(int x, int y, int width, int height) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_apply_color_modifier_to_rectangle", "image", ctx->image); CHECK_PARAM_POINTER("imlib_apply_color_modifier_to_rectangle", @@ -3921,7 +3749,6 @@ imlib_image_draw_pixel(int x, int y, char make_updates) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_image_draw_pixel", "image", ctx->image, NULL); CAST_IMAGE(im, ctx->image); @@ -3956,7 +3783,6 @@ imlib_image_draw_line(int x1, int y1, int x2, int y2, char make_updates) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_image_draw_line", "image", ctx->image, NULL); CAST_IMAGE(im, ctx->image); @@ -3989,7 +3815,6 @@ imlib_image_draw_rectangle(int x, int y, int width, int height) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_image_draw_rectangle", "image", ctx->image); CAST_IMAGE(im, ctx->image); if (__imlib_LoadImageData(im)) @@ -4016,7 +3841,6 @@ imlib_image_fill_rectangle(int x, int y, int width, int height) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_image_fill_rectangle", "image", ctx->image); CAST_IMAGE(im, ctx->image); if (__imlib_LoadImageData(im)) @@ -4042,7 +3866,6 @@ imlib_image_copy_alpha_to_image(Imlib_Image image_source, int x, int y) { ImlibImage *im, *im2; - 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", @@ -4077,7 +3900,6 @@ imlib_image_copy_alpha_rectangle_to_image(Imlib_Image image_source, int x, { ImlibImage *im, *im2; - 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", @@ -4112,7 +3934,6 @@ imlib_image_scroll_rect(int x, int y, int width, int height, int delta_x, ImlibImage *im; int xx, yy, w, h, nx, ny; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_image_scroll_rect", "image", ctx->image); CAST_IMAGE(im, ctx->image); if (__imlib_LoadImageData(im)) @@ -4162,7 +3983,6 @@ imlib_image_copy_rect(int x, int y, int width, int height, int new_x, int new_y) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_image_copy_rect", "image", ctx->image); CAST_IMAGE(im, ctx->image); if (__imlib_LoadImageData(im)) @@ -4180,7 +4000,6 @@ imlib_image_copy_rect(int x, int y, int width, int height, int new_x, int new_y) EAPI Imlib_Color_Range imlib_create_color_range(void) { - CHECK_CONTEXT(ctx); return (Imlib_Color_Range) __imlib_CreateRange(); } @@ -4190,7 +4009,6 @@ imlib_create_color_range(void) EAPI void imlib_free_color_range(void) { - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_free_color_range", "color_range", ctx->color_range); __imlib_FreeRange((ImlibRange *) ctx->color_range); @@ -4207,7 +4025,6 @@ imlib_free_color_range(void) EAPI void imlib_add_color_to_color_range(int distance_away) { - 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, @@ -4233,7 +4050,6 @@ imlib_image_fill_color_range_rectangle(int x, int y, int width, int height, { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_image_fill_color_range_rectangle", "image", ctx->image); CHECK_PARAM_POINTER("imlib_image_fill_color_range_rectangle", @@ -4269,7 +4085,6 @@ imlib_image_fill_hsva_color_range_rectangle(int x, int y, int width, int height, { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_image_fill_color_range_rectangle", "image", ctx->image); CHECK_PARAM_POINTER("imlib_image_fill_color_range_rectangle", @@ -4299,7 +4114,6 @@ imlib_image_query_pixel(int x, int y, Imlib_Color * color_return) ImlibImage *im; DATA32 *p; - 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); @@ -4339,7 +4153,6 @@ imlib_image_query_pixel_hsva(int x, int y, float *hue, float *saturation, DATA32 *p; int r, g, b; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_image_query_pixel", "image", ctx->image); CAST_IMAGE(im, ctx->image); if (__imlib_LoadImageData(im)) @@ -4380,7 +4193,6 @@ imlib_image_query_pixel_hlsa(int x, int y, float *hue, float *lightness, DATA32 *p; int r, g, b; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_image_query_pixel", "image", ctx->image); CAST_IMAGE(im, ctx->image); if (__imlib_LoadImageData(im)) @@ -4421,7 +4233,6 @@ imlib_image_query_pixel_cmya(int x, int y, int *cyan, int *magenta, int *yellow, ImlibImage *im; DATA32 *p; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_image_query_pixel", "image", ctx->image); CAST_IMAGE(im, ctx->image); if (__imlib_LoadImageData(im)) @@ -4459,7 +4270,6 @@ imlib_image_attach_data_value(const char *key, void *data, int value, { ImlibImage *im; - 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); @@ -4482,7 +4292,6 @@ imlib_image_get_attached_data(const char *key) ImlibImageTag *t; ImlibImage *im; - 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, @@ -4508,7 +4317,6 @@ imlib_image_get_attached_value(const char *key) ImlibImageTag *t; ImlibImage *im; - 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); @@ -4530,7 +4338,6 @@ imlib_image_remove_attached_data_value(const char *key) { ImlibImage *im; - 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); @@ -4551,7 +4358,6 @@ imlib_image_remove_and_free_attached_data_value(const char *key) ImlibImageTag *t; ImlibImage *im; - 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", @@ -4572,7 +4378,6 @@ imlib_save_image(const char *filename) { ImlibImage *im; - 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); @@ -4597,7 +4402,6 @@ imlib_save_image_with_error_return(const char *filename, { ImlibImage *im; - 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", @@ -4628,7 +4432,6 @@ imlib_create_rotated_image(double angle) int x, y, dx, dy, sz; double x1, y1, d; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_create_rotated_image", "image", ctx->image, NULL); CAST_IMAGE(im_old, ctx->image); @@ -4679,7 +4482,6 @@ imlib_rotate_image_from_buffer(double angle, Imlib_Image source_image) int x, y, dx, dy, sz; double x1, y1, d; - CHECK_CONTEXT(ctx); // source image (to rotate) CHECK_PARAM_POINTER("imlib_rotate_image_from_buffer", "source_image", source_image); @@ -4758,7 +4560,6 @@ imlib_blend_image_onto_image_at_angle(Imlib_Image source_image, { ImlibImage *im_src, *im_dst; - 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", @@ -4843,7 +4644,6 @@ imlib_blend_image_onto_image_skewed(Imlib_Image source_image, { ImlibImage *im_src, *im_dst; - 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", @@ -4892,7 +4692,6 @@ imlib_render_image_on_drawable_skewed(int source_x, int source_y, { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_render_image_on_drawable_skewed", "image", ctx->image); CAST_IMAGE(im, ctx->image); @@ -4930,7 +4729,6 @@ imlib_render_image_on_drawable_at_angle(int source_x, int source_y, { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_render_image_on_drawable_at_angle", "image", ctx->image); CAST_IMAGE(im, ctx->image); @@ -4951,7 +4749,6 @@ imlib_image_filter(void) { ImlibImage *im; - 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); @@ -4964,14 +4761,12 @@ imlib_image_filter(void) EAPI Imlib_Filter imlib_create_filter(int initsize) { - CHECK_CONTEXT(ctx); return (Imlib_Filter) __imlib_CreateFilter(initsize); } EAPI void imlib_free_filter(void) { - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_free_filter", "filter", ctx->filter); __imlib_FreeFilter((ImlibFilter *) ctx->filter); ctx->filter = NULL; @@ -4986,7 +4781,6 @@ imlib_free_filter(void) EAPI void imlib_context_set_filter(Imlib_Filter filter) { - CHECK_CONTEXT(ctx); ctx->filter = filter; } @@ -4998,7 +4792,6 @@ imlib_context_set_filter(Imlib_Filter filter) EAPI Imlib_Filter imlib_context_get_filter(void) { - CHECK_CONTEXT(ctx); return ctx->filter; } @@ -5007,7 +4800,6 @@ imlib_filter_set(int xoff, int yoff, int a, int r, int g, int b) { ImlibFilter *fil; - 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); @@ -5021,7 +4813,6 @@ imlib_filter_set_alpha(int xoff, int yoff, int a, int r, int g, int b) { ImlibFilter *fil; - 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); @@ -5032,7 +4823,6 @@ imlib_filter_set_red(int xoff, int yoff, int a, int r, int g, int b) { ImlibFilter *fil; - 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); @@ -5043,7 +4833,6 @@ imlib_filter_set_green(int xoff, int yoff, int a, int r, int g, int b) { ImlibFilter *fil; - 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); @@ -5054,7 +4843,6 @@ imlib_filter_set_blue(int xoff, int yoff, int a, int r, int g, int b) { ImlibFilter *fil; - 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); @@ -5063,7 +4851,6 @@ imlib_filter_set_blue(int xoff, int yoff, int a, int r, int g, int b) EAPI void imlib_filter_constants(int a, int r, int g, int b) { - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_filter_constants", "filter", ctx->filter); __imlib_FilterConstants((ImlibFilter *) ctx->filter, a, r, g, b); } @@ -5071,7 +4858,6 @@ imlib_filter_constants(int a, int r, int g, int b) EAPI void imlib_filter_divisors(int a, int r, int g, int b) { - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_filter_divisors", "filter", ctx->filter); __imlib_FilterDivisors((ImlibFilter *) ctx->filter, a, r, g, b); } @@ -5082,7 +4868,6 @@ imlib_apply_filter(const char *script, ...) va_list param_list; ImlibImage *im; - CHECK_CONTEXT(ctx); __imlib_dynamic_filters_init(); CAST_IMAGE(im, ctx->image); if (__imlib_LoadImageData(im)) @@ -5099,7 +4884,6 @@ imlib_apply_filter(const char *script, ...) EAPI ImlibPolygon imlib_polygon_new(void) { - CHECK_CONTEXT(ctx); return (ImlibPolygon) __imlib_polygon_new(); } @@ -5115,7 +4899,6 @@ imlib_polygon_new(void) EAPI void imlib_polygon_add_point(ImlibPolygon poly, int x, int y) { - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_polygon_add_point", "polygon", poly); __imlib_polygon_add_point((ImlibPoly) poly, x, y); } @@ -5128,7 +4911,6 @@ imlib_polygon_add_point(ImlibPolygon poly, int x, int y) EAPI void imlib_polygon_free(ImlibPolygon poly) { - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_polygon_free", "polygon", poly); __imlib_polygon_free((ImlibPoly) poly); } @@ -5147,7 +4929,6 @@ imlib_image_draw_polygon(ImlibPolygon poly, unsigned char closed) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_image_draw_polygon", "image", ctx->image); CAST_IMAGE(im, ctx->image); if (__imlib_LoadImageData(im)) @@ -5170,7 +4951,6 @@ imlib_image_fill_polygon(ImlibPolygon poly) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_image_fill_polygon", "image", ctx->image); CAST_IMAGE(im, ctx->image); if (__imlib_LoadImageData(im)) @@ -5197,7 +4977,6 @@ EAPI void imlib_polygon_get_bounds(ImlibPolygon poly, int *px1, int *py1, int *px2, int *py2) { - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_polygon_get_bounds", "polygon", poly); __imlib_polygon_get_bounds((ImlibPoly) poly, px1, py1, px2, py2); } @@ -5219,7 +4998,6 @@ imlib_image_draw_ellipse(int xc, int yc, int a, int b) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_draw_ellipse", "image", ctx->image); CAST_IMAGE(im, ctx->image); if (__imlib_LoadImageData(im)) @@ -5249,7 +5027,6 @@ imlib_image_fill_ellipse(int xc, int yc, int a, int b) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_fill_ellipse", "image", ctx->image); CAST_IMAGE(im, ctx->image); if (__imlib_LoadImageData(im)) @@ -5272,7 +5049,6 @@ imlib_image_fill_ellipse(int xc, int yc, int a, int b) EAPI unsigned char imlib_polygon_contains_point(ImlibPolygon poly, int x, int y) { - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER_RETURN("imlib_polygon_contains_point", "polygon", poly, 0); return __imlib_polygon_contains_point((ImlibPoly) poly, x, y); @@ -5283,7 +5059,6 @@ imlib_image_clear(void) { ImlibImage *im; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_image_clear", "image", ctx->image); CAST_IMAGE(im, ctx->image); if (__imlib_LoadImageData(im)) @@ -5299,7 +5074,6 @@ imlib_image_clear_color(int r, int g, int b, int a) int i, max; DATA32 col; - CHECK_CONTEXT(ctx); CHECK_PARAM_POINTER("imlib_image_clear_color", "image", ctx->image); CAST_IMAGE(im, ctx->image); if (__imlib_LoadImageData(im)) --
