Clean warnings.

SVN revision: 17992
This commit is contained in:
sebastid 2005-10-26 20:32:27 +00:00 committed by sebastid
parent c12421c7a3
commit 2cede9353e
3 changed files with 6 additions and 14 deletions

View File

@ -12,7 +12,6 @@ _xre_font_surface_new(Ximage_Info *xinf, RGBA_Font_Glyph *fg)
XR_Font_Surface *fs;
DATA8 *data;
int w, h, j;
DATA8 *ndata;
XRenderPictureAttributes att;
Ximage_Image *xim;
Evas_Hash *pool;
@ -30,7 +29,7 @@ _xre_font_surface_new(Ximage_Info *xinf, RGBA_Font_Glyph *fg)
fs = fg->ext_dat;
if ((fs->xinf->disp == xinf->disp) && (fs->xinf->root == xinf->root))
return fs;
snprintf(buf, sizeof(buf), "@%p@/@%x@", fs->xinf->disp, fs->xinf->root);
snprintf(buf, sizeof(buf), "@%p@/@%lx@", fs->xinf->disp, fs->xinf->root);
pool = evas_hash_find(_xr_fg_pool, buf);
if (pool)
{
@ -49,7 +48,7 @@ _xre_font_surface_new(Ximage_Info *xinf, RGBA_Font_Glyph *fg)
fs->w = w;
fs->h = h;
snprintf(buf, sizeof(buf), "@%p@/@%x@", fs->xinf->disp, fs->xinf->root);
snprintf(buf, sizeof(buf), "@%p@/@%lx@", fs->xinf->disp, fs->xinf->root);
pool = evas_hash_find(_xr_fg_pool, buf);
snprintf(buf2, sizeof(buf2), "%p", fg);
pool = evas_hash_add(pool, buf2, fs);
@ -129,11 +128,11 @@ _xre_font_pool_cb(Evas_Hash *hash, const char *key, void *data, void *fdata)
{
Evas_Hash *pool;
XR_Font_Surface *fs;
char buf[256], buf2[256];
char buf[256];
fs = fdata;
pool = data;
snprintf(buf, sizeof(buf), "@%p@/@%x@", fs->xinf->disp, fs->xinf->root);
snprintf(buf, sizeof(buf), "@%p@/@%lx@", fs->xinf->disp, fs->xinf->root);
pool = evas_hash_del(pool, buf, fs);
hash = evas_hash_modify(hash, key, pool);
return 1;
@ -156,7 +155,6 @@ _xre_font_surface_draw(Ximage_Info *xinf, RGBA_Image *surface, RGBA_Draw_Context
XR_Font_Surface *fs;
Xrender_Surface *target_surface;
XRectangle rect;
XRenderPictureAttributes att;
int r, g, b, a;
fs = fg->ext_dat;

View File

@ -53,13 +53,7 @@ _xre_gradient_colors_clear(XR_Gradient *gr)
void
_xre_gradient_draw(Xrender_Surface *rs, RGBA_Draw_Context *dc, XR_Gradient *gr, int x, int y, int w, int h, double angle)
{
XTransform xf;
XRectangle rect;
XRenderPictureAttributes att;
Picture mask;
int r, g, b, a, op;
RGBA_Image *im;
double a2;
if ((w <= 0) || (h <= 0)) return;

View File

@ -74,9 +74,9 @@ _xre_image_load(Ximage_Info *xinf, char *file, char *key)
if (!file) return NULL;
if (key)
snprintf(buf, sizeof(buf), "/@%p@%x@/%s//://%s", xinf->disp, xinf->root, file, key);
snprintf(buf, sizeof(buf), "/@%p@%lx@/%s//://%s", xinf->disp, xinf->root, file, key);
else
snprintf(buf, sizeof(buf), "/@%p@%x@/%s", xinf->disp, xinf->root, file);
snprintf(buf, sizeof(buf), "/@%p@%lx@/%s", xinf->disp, xinf->root, file);
im = __xre_image_find(buf);
if (im)
{