diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-04-10 16:20:51 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-04-10 16:20:51 +0200 |
| commit | cc24d8ba254f1e5062c21adfa07f8b58bb2c5eaa (patch) | |
| tree | e22b443672f84f9305e682f2c6c0d0e896b967a6 /nx-X11/programs/Xserver/hw/nxagent/Image.c | |
| parent | 9e2588e56f5b712c4501a19c1f723257c05aa6af (diff) | |
| parent | c4c5485474a03bcfd2632d12c2e6e88ba20be471 (diff) | |
| download | nx-libs-cc24d8ba254f1e5062c21adfa07f8b58bb2c5eaa.tar.gz nx-libs-cc24d8ba254f1e5062c21adfa07f8b58bb2c5eaa.tar.bz2 nx-libs-cc24d8ba254f1e5062c21adfa07f8b58bb2c5eaa.zip | |
Merge branch 'sunweaver-pr/switch-to-libXfont2-API' into 3.6.x
Attributes GH PR #362: https://github.com/ArcticaProject/nx-libs/pull/362
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Image.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Image.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.c b/nx-X11/programs/Xserver/hw/nxagent/Image.c index 4fa98f842..590f0b249 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Image.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Image.c @@ -98,9 +98,9 @@ int nxagentAlphaCompat = 0; * displays having different byte order. */ -extern void BitOrderInvert(unsigned char *, int); -extern void TwoByteSwap(unsigned char *, register int); -extern void FourByteSwap(register unsigned char *, register int); +extern void nxagentBitOrderInvert(unsigned char *, int); +extern void nxagentTwoByteSwap(unsigned char *, register int); +extern void nxagentFourByteSwap(register unsigned char *, register int); /* * Store the last visual used to unpack @@ -206,7 +206,7 @@ int nxagentImageReformat(char *base, int nbytes, int bpp, int order) "bits per pixel [%d] byte order [%d].\n", nbytes, bpp, order); #endif - BitOrderInvert((unsigned char *) base, nbytes); + nxagentBitOrderInvert((unsigned char *) base, nbytes); } #if IMAGE_BYTE_ORDER != BITMAP_BIT_ORDER && BITMAP_SCANLINE_UNIT != 8 @@ -231,7 +231,7 @@ int nxagentImageReformat(char *base, int nbytes, int bpp, int order) "bits per pixel [%d] byte order [%d].\n", nbytes, bpp, order); #endif - TwoByteSwap((unsigned char *) base, nbytes); + nxagentTwoByteSwap((unsigned char *) base, nbytes); } break; @@ -245,7 +245,7 @@ int nxagentImageReformat(char *base, int nbytes, int bpp, int order) "bits per pixel [%d] byte order [%d].\n", nbytes, bpp, order); #endif - FourByteSwap((unsigned char *) base, nbytes); + nxagentFourByteSwap((unsigned char *) base, nbytes); } break; @@ -1152,7 +1152,7 @@ FIXME: Should use an unpack resource here. #ifdef TEST fprintf(stderr, "nxagentPutSubImage: Display image order is [%d] bitmap order is [%d].\n", - ImageByteOrder(nxagentDisplay), BitmapBitOrder(nxagentDisplay)); + ImageByteOrder(nxagentDisplay), nxagentBitmapBitOrder(nxagentDisplay)); #endif /* |