Changeset 50371 in vbox for trunk/src/VBox/GuestHost/OpenGL

Timestamp:

Feb 7, 2014 9:59:02 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

92126

Message:

crOpenGL: screenshot bugfixes, some more to follow

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• include/cr_vreg.h (modified) (1 diff)
• util/bmpscale.cpp (modified) (2 diffs)

trunk/src/VBox/GuestHost/OpenGL/include/cr_vreg.h

@@ -49 +49 @@
 
 #ifndef IN_RING0
+#define CR_FLOAT_RCAST(_t, _v) ((_t)((float)(_v) + 0.5))
+
 DECLINLINE(void) VBoxRectStretch(PRTRECT pRect, float xStretch, float yStretch)
 {
-    pRect->xLeft = (int32_t)(pRect->xLeft * xStretch);
-    pRect->yTop = (int32_t)(pRect->yTop * yStretch);
-    pRect->xRight = (int32_t)(pRect->xRight * xStretch);
-    pRect->yBottom = (int32_t)(pRect->yBottom * yStretch);
+    pRect->xLeft = CR_FLOAT_RCAST(int32_t, pRect->xLeft * xStretch);
+    pRect->yTop = CR_FLOAT_RCAST(int32_t, pRect->yTop * yStretch);
+    pRect->xRight = CR_FLOAT_RCAST(int32_t, pRect->xRight * xStretch);
+    pRect->yBottom = CR_FLOAT_RCAST(int32_t, pRect->yBottom * yStretch);
 }
 

trunk/src/VBox/GuestHost/OpenGL/util/bmpscale.cpp

@@ -61 +61 @@
 }
 
-DECLINLINE(void) gdImageSetPixel (gdImagePtr im, int x, int y, int color, int w)
+DECLINLINE(void) gdImageSetPixel (gdImagePtr im, int x, int y, int color, int cbLine)
 {
-    *(int32_t *)(im + y * w * 4 + x * 4) = color;
+    *(int32_t *)(im + y * cbLine + x * 4) = color;
 }
 
@@ -190 +190 @@
                gdTrueColorAlpha ((int) red,
                          (int) green,
-                         (int) blue, (int) alpha), dstW);
+                         (int) blue, (int) alpha), dstW * 4);
     }
     }