Merge branch 'master' into bug/3014/krfbbug/3014/krfb

1 files changed, 9 insertions, 9 deletions

diff --git a/krdc/vnc/scaling.cpp b/krdc/vnc/scaling.cpp
index b79b8873..edfd0558 100644
--- a/krdc/vnc/scaling.cpp
+++ b/krdc/vnc/scaling.cpp
@@ -53,14 +53,14 @@ void pnmscale_fractional(const TQImage& src, TQImage& dst, int x, int y, int w,
 {
     TQRgb* xelrow = 0;
     TQRgb* tempxelrow = 0;
-    register TQRgb* xP;
-    register TQRgb* nxP;
+    TQRgb* xP;
+    TQRgb* nxP;
     int rows, cols, rowsread, newrows, newcols;
-    register int row, col, needtoreadrow;
+    int row, col, needtoreadrow;
     const uchar maxval = 255;
     double xscale, yscale;
     long sxscale, syscale;
-    register long fracrowtofill, fracrowleft;
+    long fracrowtofill, fracrowleft;
     long* as;
     long* rs;
     long* gs;
@@ -153,12 +153,12 @@ if ((rowswritten >= y) && (rowswritten <= (y + h))) {
 		xelrow = (TQRgb*)src.scanLine(rowsread++);
 		needtoreadrow = 0;
 	    }
-	    register long a=0;
+	    long a=0;
 	    for ( col = 0, xP = xelrow, nxP = tempxelrow, colswritten = 0;
 		  col < cols; ++col, ++xP, ++nxP, ++colswritten )
 	    {
 if ((rowswritten >= y) && (rowswritten <= (y + h))) {
-		register long r, g, b;
+		long r, g, b;
 
 		if ( as ) {
 		    r = rs[col] + fracrowtofill * tqRed( *xP ) * tqAlpha( *xP ) / 255;
@@ -205,9 +205,9 @@ if ((rowswritten >= y) && (rowswritten <= (y + h))) {
 	    /* shortcut X scaling if possible */
 	    memcpy(dst.scanLine(rowswritten++), tempxelrow, newcols*4);
 	} else {
-	    register long a, r, g, b;
-	    register long fraccoltofill, fraccolleft = 0;
-	    register int needcol;
+	    long a, r, g, b;
+	    long fraccoltofill, fraccolleft = 0;
+	    int needcol;
 
 	    nxP = (TQRgb*)dst.scanLine(rowswritten++);
 	    colswritten = 0;