From b1057f437bf65300831a0ccb45b920787c6b318d Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 11 Jun 2011 06:00:15 +0000 Subject: TQt4 port kdemultimedia This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- .../lib/util/render/dither/colorTableHighBit.cpp | 20 +++++++------- mpeglib/lib/util/render/dither/ditherer_mmx16.cpp | 32 +++++++++++----------- mpeglib/lib/util/render/dither2YUV/rgb2yuvdefs.h | 4 +-- mpeglib/lib/util/render/x11/initDisplay.cpp | 6 ++-- mpeglib/lib/util/render/x11/x11Surface.cpp | 2 +- 5 files changed, 32 insertions(+), 32 deletions(-) (limited to 'mpeglib/lib/util/render') diff --git a/mpeglib/lib/util/render/dither/colorTableHighBit.cpp b/mpeglib/lib/util/render/dither/colorTableHighBit.cpp index 171f4e97..86b0b135 100644 --- a/mpeglib/lib/util/render/dither/colorTableHighBit.cpp +++ b/mpeglib/lib/util/render/dither/colorTableHighBit.cpp @@ -21,7 +21,7 @@ * Erik Corry's multi-byte dither routines. * * The basic idea is that the Init generates all the necessary tables. - * The tables incorporate the information about the layout of pixels + * The tables incorporate the information about the tqlayout of pixels * in the XImage, so that it should be able to cope with 15-bit, 16-bit * 24-bit (non-packed) and 32-bit (10-11 bits per color!) screens. * At present it cannot cope with 24-bit packed mode, since this involves @@ -131,9 +131,9 @@ void ColorTableHighBit::initHighColor(int thirty2,unsigned int redMask, unsigned int greenMask, unsigned int blueMask) { - unsigned PIXVAL red_mask = redMask; - unsigned PIXVAL green_mask =greenMask; - unsigned PIXVAL blue_mask = blueMask; + unsigned PIXVAL red_tqmask = redMask; + unsigned PIXVAL green_tqmask =greenMask; + unsigned PIXVAL blue_tqmask = blueMask; int CR, CB, i; @@ -197,12 +197,12 @@ void ColorTableHighBit::initHighColor(int thirty2,unsigned int redMask, * Set up entries 0-255 in rgb-to-pixel value tables. */ for (i = 0; i < 256; i++) { - r_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(red_mask)); - r_2_pix_alloc[i + 256] <<= free_bits_at_bottom(red_mask); - g_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(green_mask)); - g_2_pix_alloc[i + 256] <<= free_bits_at_bottom(green_mask); - b_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(blue_mask)); - b_2_pix_alloc[i + 256] <<= free_bits_at_bottom(blue_mask); + r_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(red_tqmask)); + r_2_pix_alloc[i + 256] <<= free_bits_at_bottom(red_tqmask); + g_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(green_tqmask)); + g_2_pix_alloc[i + 256] <<= free_bits_at_bottom(green_tqmask); + b_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(blue_tqmask)); + b_2_pix_alloc[i + 256] <<= free_bits_at_bottom(blue_tqmask); /* * If we have 16-bit output depth, then we double the value * in the top word. This means that we can write out both diff --git a/mpeglib/lib/util/render/dither/ditherer_mmx16.cpp b/mpeglib/lib/util/render/dither/ditherer_mmx16.cpp index 757f0676..1de9cc17 100644 --- a/mpeglib/lib/util/render/dither/ditherer_mmx16.cpp +++ b/mpeglib/lib/util/render/dither/ditherer_mmx16.cpp @@ -26,8 +26,8 @@ static unsigned short MMX16_Vredcoeff[] = {0x66, 0x66, 0x66, 0x66}; static unsigned short MMX16_Ugrncoeff[] = {0xffe8, 0xffe8, 0xffe8, 0xffe8}; static unsigned short MMX16_Vgrncoeff[] = {0xffcd, 0xffcd, 0xffcd, 0xffcd}; static unsigned short MMX16_Ycoeff[] = {0x4a, 0x4a, 0x4a, 0x4a}; -static unsigned short MMX16_redmask[] = {0xf800, 0xf800, 0xf800, 0xf800}; -static unsigned short MMX16_grnmask[] = {0x7e0, 0x7e0, 0x7e0, 0x7e0}; +static unsigned short MMX16_redtqmask[] = {0xf800, 0xf800, 0xf800, 0xf800}; +static unsigned short MMX16_grntqmask[] = {0x7e0, 0x7e0, 0x7e0, 0x7e0}; void dummy_dithermmx16() { cout << "MMX16_0"<display; @@ -152,7 +152,7 @@ void CreateFullColorWindow (XWindow* xwindow) { cout << "visual is null"<colormap==0) { xswa.colormap = XCreateColormap(dpy, XRootWindow(dpy, screen), @@ -166,7 +166,7 @@ void CreateFullColorWindow (XWindow* xwindow) { /* xwindow->window = XCreateWindow(dpy, RootWindow(dpy, screen), x, y, w, h, (unsigned int) 1, depth, c_class, - visual, mask, &xswa); + visual, tqmask, &xswa); */ } diff --git a/mpeglib/lib/util/render/x11/x11Surface.cpp b/mpeglib/lib/util/render/x11/x11Surface.cpp index d7b8f052..0aaf7743 100644 --- a/mpeglib/lib/util/render/x11/x11Surface.cpp +++ b/mpeglib/lib/util/render/x11/x11Surface.cpp @@ -183,7 +183,7 @@ int X11Surface::open(int width, int height,const char *title, bool border) { } else { // depth is <= 8 // allocate memory for dithertables - // gets the rgb masks + // gets the rgb tqmasks initColorDisplay(xWindow); // create 8 bit dithertables // create private colormap -- cgit v1.2.1