Sophie

Sophie

distrib > Mandriva > 2009.0 > i586 > by-pkgid > 5b63d07a32e109167fc4d05db047fdd3 > files > 2

kvdr-0.64-2mdv2008.0.src.rpm

diff -urN tmp/kvdr/kvdr.cpp kvdr/kvdr/kvdr.cpp
--- tmp/kvdr/kvdr.cpp	2005-02-09 08:27:26.809587000 +0100
+++ kvdr/kvdr/kvdr.cpp	2005-02-09 08:30:08.838138229 +0100
@@ -418,7 +418,7 @@
        )
     {
     	 fprintf(stderr,"kvdr and v4l-conf disagree about the framebuffer geometry\noverlay will not be shown\n");
-       fprintf(stderr,"kvdr: FbAddr=%x Bpp=%d height=%d width=%d bps=%d\n",(unsigned int)vb.base,vb.depth,vb.height,vb.width,vb.bytesperline);
+       fprintf(stderr,"kvdr: FbAddr=%lx Bpp=%d height=%d width=%d bps=%d\n",(unsigned long)vb.base,vb.depth,vb.height,vb.width,vb.bytesperline);
        fprintf(stderr,"v4l : FbAddr=%x Bpp=%d height=%d width=%d bps=%d\n",FbAddr,Bpp,SizeY,SizeX,(vb.depth+1)/8*vb.width);
        ovlFbSet = ovlGeoSet = false;
        ovlClipCount = 0;
diff -ruN kvdr-old/kvdr/ckvdrcfg.cpp kvdr/kvdr/ckvdrcfg.cpp
--- kvdr-old/kvdr/ckvdrcfg.cpp	2004-02-22 19:40:51.000000000 +0000
+++ kvdr/kvdr/ckvdrcfg.cpp	2005-02-07 19:37:03.153118464 +0000
@@ -421,7 +421,7 @@
 	if(-1!=((Kvdr*)p)->video_fd.handle())
 	{
     ((Kvdr*)p)->OvlF(((Kvdr*)p)->display_width,((Kvdr*)p)->display_height,
-                     (int)((Kvdr*)p)->base,((Kvdr*)p)->bpp,((Kvdr*)p)->palette);
+                     (long)((Kvdr*)p)->base,((Kvdr*)p)->bpp,((Kvdr*)p)->palette);
     ((Kvdr*)p)->OvlP(((Kvdr*)p)->brightness,((Kvdr*)p)->colour,
                             ((Kvdr*)p)->hue,((Kvdr*)p)->contrast);
 		((Kvdr*)p)->OverlayOnOffSLOT(1);
diff -ruN kvdr-old/kvdr/kvdr.cpp kvdr/kvdr/kvdr.cpp
--- kvdr-old/kvdr/kvdr.cpp	2004-08-07 08:55:07.000000000 +0100
+++ kvdr/kvdr/kvdr.cpp	2005-02-07 19:37:03.154118312 +0000
@@ -342,7 +342,7 @@
   //Set the Frambuffer and Image properties:
 	if (!(args->isSet("x")))
 	{
-    OvlF(display_width,display_height,(int)base,bpp,palette);
+    OvlF(display_width,display_height,(long)base,bpp,palette);
     OvlP(brightness,colour,hue,contrast);
     ovlstat=true;
     setMaximumSize(f_size_x,f_size_y);
@@ -1560,7 +1560,7 @@
 	  	return;//should never happen anyway: vid_dev taken away below kvdr
 	  }
 	}
-  OvlF(display_width,display_height,(int)base,bpp,palette);
+  OvlF(display_width,display_height,(long)base,bpp,palette);
   OvlP(brightness,colour,hue,contrast);
 	OverlayOnOffSLOT(1);
 	usleep(20000);//not to fast...
@@ -1966,7 +1966,7 @@
       	video_fd.open(IO_ReadWrite);
       	if( !(args->isSet("x")) )
       	{
-          OvlF(display_width,display_height,(int)base,bpp,palette);
+          OvlF(display_width,display_height,(long)base,bpp,palette);
           OvlP(brightness,colour,hue,contrast);
       		OverlayOnOffSLOT(1);
         }