summaryrefslogtreecommitdiff
path: root/hw/xwin/winpixmap.c
diff options
context:
space:
mode:
authorAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2004-06-21 13:19:32 +0000
committerAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2004-06-21 13:19:32 +0000
commitd6e8b1affec7351549c0006cc63b6923091cdd68 (patch)
tree6e5e9dd1c1ec6e141349337df844b649bbf4277d /hw/xwin/winpixmap.c
parentdfdbb60bf5f613b3554d5435f08f16bde72aa353 (diff)
Bug 777: Merge from CYGWIN branch
Diffstat (limited to 'hw/xwin/winpixmap.c')
-rw-r--r--hw/xwin/winpixmap.c41
1 files changed, 34 insertions, 7 deletions
diff --git a/hw/xwin/winpixmap.c b/hw/xwin/winpixmap.c
index 24e49719a..e1fa34f0c 100644
--- a/hw/xwin/winpixmap.c
+++ b/hw/xwin/winpixmap.c
@@ -32,6 +32,31 @@
#include "win.h"
+
+/*
+ * References to external symbols
+ */
+
+extern int g_iPixmapPrivateIndex;
+
+
+/*
+ * Local prototypes
+ */
+
+#if 0
+static void
+winXRotatePixmapNativeGDI (PixmapPtr pPix, int rw);
+
+static void
+winYRotatePixmapNativeGDI (PixmapPtr pPix, int rh);
+
+static void
+winCopyRotatePixmapNativeGDI (PixmapPtr psrcPix, PixmapPtr *ppdstPix,
+ int xrot, int yrot);
+#endif
+
+
/* See Porting Layer Definition - p. 34 */
/* See mfb/mfbpixmap.c - mfbCreatePixmap() */
PixmapPtr
@@ -51,7 +76,7 @@ winCreatePixmapNativeGDI (ScreenPtr pScreen,
}
#if CYGDEBUG
- ErrorF ("winCreatePixmap () - w %d h %d d %d bw %d\n",
+ winDebug ("winCreatePixmap () - w %d h %d d %d bw %d\n",
iWidth, iHeight, iDepth,
PixmapBytePad (iWidth, iDepth));
#endif
@@ -94,7 +119,7 @@ winCreatePixmapNativeGDI (ScreenPtr pScreen,
(BITMAPINFO **) &pPixmapPriv->pbmih);
#if CYGDEBUG
- ErrorF ("winCreatePixmap () - Created a pixmap %08x, %dx%dx%d, for " \
+ winDebug ("winCreatePixmap () - Created a pixmap %08x, %dx%dx%d, for " \
"screen: %08x\n",
pPixmapPriv->hBitmap, iWidth, iHeight, iDepth, pScreen);
#endif
@@ -115,7 +140,7 @@ winDestroyPixmapNativeGDI (PixmapPtr pPixmap)
winPrivPixmapPtr pPixmapPriv = NULL;
#if CYGDEBUG
- ErrorF ("winDestroyPixmapNativeGDI ()\n");
+ winDebug ("winDestroyPixmapNativeGDI ()\n");
#endif
/* Bail early if there is not a pixmap to destroy */
@@ -129,7 +154,7 @@ winDestroyPixmapNativeGDI (PixmapPtr pPixmap)
pPixmapPriv = winGetPixmapPriv (pPixmap);
#if CYGDEBUG
- ErrorF ("winDestroyPixmapNativeGDI - pPixmapPriv->hBitmap: %08x\n",
+ winDebug ("winDestroyPixmapNativeGDI - pPixmapPriv->hBitmap: %08x\n",
pPixmapPriv->hBitmap);
#endif
@@ -173,12 +198,13 @@ winModifyPixmapHeaderNativeGDI (PixmapPtr pPixmap,
}
+#if 0
/*
* Not used yet.
* See cfb/cfbpixmap.c
*/
-void
+static void
winXRotatePixmapNativeGDI (PixmapPtr pPix, int rw)
{
ErrorF ("winXRotatePixmap()\n");
@@ -190,7 +216,7 @@ winXRotatePixmapNativeGDI (PixmapPtr pPix, int rw)
* Not used yet.
* See cfb/cfbpixmap.c
*/
-void
+static void
winYRotatePixmapNativeGDI (PixmapPtr pPix, int rh)
{
ErrorF ("winYRotatePixmap()\n");
@@ -203,10 +229,11 @@ winYRotatePixmapNativeGDI (PixmapPtr pPix, int rh)
* See cfb/cfbpixmap.c
*/
-void
+static void
winCopyRotatePixmapNativeGDI (PixmapPtr psrcPix, PixmapPtr *ppdstPix,
int xrot, int yrot)
{
ErrorF ("winCopyRotatePixmap()\n");
/* fill in this function, look at CFB */
}
+#endif