From 46974eec6744f1c6a61e493dcdfe2471aec87c00 Mon Sep 17 00:00:00 2001 From: iovar Date: Sat, 22 Nov 2008 16:39:04 +0000 Subject: src/rmd_cache.c, src/rmd_cache_frame.c, src/rmd_get_frame.c, src/rmd_init_encoder.c, src/rmd_poll_events.c, src/rmd_rectinsert.c, src/rmd_rectinsert.h, src/rmd_rescue.c, src/rmd_setbrwindow.c, src/rmd_specsfile.c, src/rmd_types.h, src/rmd_update_image.c, src/test-rectinsert-data.c, src/test-rectinsert-types.h, src/test-rectinsert.c: Replaced the custom WGeometry struct-type with the Xlib-provided XRectangle type. Since XRectangle has unsigned width and height, any places in the code where -1 was used in these members of WGeometry to denote invalid rects, where changed to 0 ( zero width or height rects are also considered invalid, wherever met). Also, the following variable renames happened : wgeom => xrect, rgeom => rrect, geom => rect and so on. Some other minor changes in this commit are all related to this type change and also the fact that WGeometry had members of type int, while XRectangle is comprised of short members. git-svn-id: https://recordmydesktop.svn.sourceforge.net/svnroot/recordmydesktop/trunk@580 f606c939-3180-4ac9-a4b8-4b8779d57d0a --- recordmydesktop/src/rmd_specsfile.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'recordmydesktop/src/rmd_specsfile.c') diff --git a/recordmydesktop/src/rmd_specsfile.c b/recordmydesktop/src/rmd_specsfile.c index 13ec249..c168401 100644 --- a/recordmydesktop/src/rmd_specsfile.c +++ b/recordmydesktop/src/rmd_specsfile.c @@ -44,8 +44,8 @@ int WriteSpecsFile(ProgData *pdata){ else{ fprintf(fp,"recordMyDesktop = %s\n",VERSION); - fprintf(fp,"Width = %d\n",pdata->brwin.rgeom.width); - fprintf(fp,"Height = %d\n",pdata->brwin.rgeom.height); + fprintf(fp,"Width = %hu\n",pdata->brwin.rrect.width); + fprintf(fp,"Height = %hu\n",pdata->brwin.rrect.height); fprintf(fp,"Filename = %s\n",pdata->args.filename); fprintf(fp,"FPS = %f\n",pdata->args.fps); fprintf(fp,"NoSound = %d\n",pdata->args.nosound); @@ -91,11 +91,11 @@ int ReadSpecsFile(ProgData *pdata){ fprintf(stderr,"Error reading VERSION attribute!!!\n"); return 1; } - if(fscanf(fp,"Width = %d\n",&pdata->brwin.rgeom.width)!=1){ + if(fscanf(fp,"Width = %hu\n",&pdata->brwin.rrect.width)!=1){ fprintf(stderr,"Error reading Width attribute!!!\n"); return 1; } - if(fscanf(fp,"Height = %d\n",&pdata->brwin.rgeom.height)!=1){ + if(fscanf(fp,"Height = %hu\n",&pdata->brwin.rrect.height)!=1){ fprintf(stderr,"Error reading Height attribute!!!\n"); return 1; } -- cgit v1.2.1