ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/background.C
(Generate patch)

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.81 by sf-exg, Wed Oct 13 23:08:11 2010 UTC vs.
Revision 1.89 by sf-exg, Mon Oct 18 15:35:19 2010 UTC

… …
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
8 * Copyright (c) 2010 Emanuele Giaquinta <e.giaquinta@glauco.it>
8 * 9 *
9 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by 11 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or 12 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version. 13 * (at your option) any later version.
… …
175{ 176{
176# ifdef HAVE_AFTERIMAGE 177# ifdef HAVE_AFTERIMAGE
177 if (original_asim) 178 if (original_asim)
178 return true; 179 return true;
179# endif 180# endif
180# ifdef ENABLE_TRANSPARENCY
181 if (flags & isTransparent)
182 {
183# ifdef HAVE_AFTERIMAGE
184 if ((flags & blurNeeded) && !(flags & blurServerSide))
185 return true;
186# endif
187 if ((flags & tintNeeded) && !(flags & tintServerSide))
188 return true;
189 }
190# endif
191 return false; 181 return false;
192} 182}
193 183
194# ifdef BG_IMAGE_FROM_FILE 184# ifdef BG_IMAGE_FROM_FILE
195static inline bool 185static inline bool
… …
232 int diff = window_size - image_size; 222 int diff = window_size - image_size;
233 int smaller = min (image_size, window_size); 223 int smaller = min (image_size, window_size);
234 224
235 if (align >= 0 && align <= 100) 225 if (align >= 0 && align <= 100)
236 return diff * align / 100; 226 return diff * align / 100;
237 else if (align > 100 && align <= 200 ) 227 else if (align > 100 && align <= 200)
238 return ((align - 100) * smaller / 100) + window_size - smaller; 228 return ((align - 100) * smaller / 100) + window_size - smaller;
239 else if (align >= -100 && align < 0) 229 else if (align >= -100 && align < 0)
240 return ((align + 100) * smaller / 100) - image_size; 230 return ((align + 100) * smaller / 100) - image_size;
241 return 0; 231 return 0;
242} 232}
… …
478 x = make_align_position (h_align, target_width, w); 468 x = make_align_position (h_align, target_width, w);
479 y = make_align_position (v_align, target_height, h); 469 y = make_align_position (v_align, target_height, h);
480 } 470 }
481 471
482 flags &= ~sizeSensitive; 472 flags &= ~sizeSensitive;
483 if (h_scale != 0 || v_scale != 0 473 if ((flags & propScale) || h_scale || v_scale
484 || h_align != 0 || v_align != 0 474 || (!(flags & rootAlign) && (h_align || v_align))
485 || w > target_width || h > target_height) 475 || w > target_width || h > target_height)
486 flags |= sizeSensitive; 476 flags |= sizeSensitive;
487} 477}
488 478
489# ifdef HAVE_AFTERIMAGE 479# ifdef HAVE_AFTERIMAGE
… …
941 } 931 }
942 932
943# ifdef HAVE_AFTERIMAGE 933# ifdef HAVE_AFTERIMAGE
944 if (!target->asimman) 934 if (!target->asimman)
945 target->asimman = create_generic_imageman (target->rs[Rs_path]); 935 target->asimman = create_generic_imageman (target->rs[Rs_path]);
946 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 936 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
937 if (image)
938 {
947 if (original_asim) 939 if (original_asim)
940 safe_asimage_destroy (original_asim);
941 original_asim = image;
948 have_image = true; 942 have_image = true;
949 return have_image; 943 return true;
944 }
950# endif 945# endif
951 946
952# ifdef HAVE_PIXBUF 947# ifdef HAVE_PIXBUF
953 pixbuf = gdk_pixbuf_new_from_file (file, NULL); 948 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
949 if (image)
950 {
954 if (pixbuf) 951 if (pixbuf)
952 g_object_unref (pixbuf);
953 pixbuf = image;
955 have_image = true; 954 have_image = true;
956 return have_image; 955 return true;
956 }
957# endif 957# endif
958 } 958 }
959 959
960 return false; 960 return false;
961} 961}
… …
1007 flags &= ~blurNeeded; 1007 flags &= ~blurNeeded;
1008 else 1008 else
1009 flags |= blurNeeded; 1009 flags |= blurNeeded;
1010 1010
1011#if XFT 1011#if XFT
1012 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root); 1012 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1013 if (filters) 1013 if (filters)
1014 { 1014 {
1015 for (int i = 0; i < filters->nfilter; i++) 1015 for (int i = 0; i < filters->nfilter; i++)
1016 if (!strcmp (filters->filter[i], FilterConvolution)) 1016 if (!strcmp (filters->filter[i], FilterConvolution))
1017 flags |= bgPixmap_t::blurServerSide; 1017 flags |= bgPixmap_t::blurServerSide;
1018 1018
1019 XFree (filters); 1019 XFree (filters);
1020 } 1020 }
1021#endif 1021#endif
1022 1022
1023 return (changed > 0); 1023 return (changed > 0);
1024} 1024}
1025 1025
… …
1113 } 1113 }
1114 1114
1115 return false; 1115 return false;
1116} 1116}
1117 1117
1118#if XFT
1118static void 1119static void
1119get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 1120get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1120{ 1121{
1121 double sigma = radius / 2.0; 1122 double sigma = radius / 2.0;
1122 double scale = sqrt (2.0 * M_PI) * sigma; 1123 double scale = sqrt (2.0 * M_PI) * sigma;
1123 double sum = 0.0; 1124 double sum = 0.0;
1124 1125
1125 for (int i = 0; i < width; i++) 1126 for (int i = 0; i < width; i++)
1126 { 1127 {
1127 double x = i - width / 2; 1128 double x = i - width / 2;
1128 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 1129 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1129 sum += kernel[i]; 1130 sum += kernel[i];
1130 } 1131 }
1131 1132
1132 params[0] = XDoubleToFixed (width); 1133 params[0] = XDoubleToFixed (width);
1133 params[1] = XDoubleToFixed (1); 1134 params[1] = XDoubleToFixed (1);
1134 1135
1135 for (int i = 0; i < width; i++) 1136 for (int i = 0; i < width; i++)
1136 params[i+2] = XDoubleToFixed (kernel[i] / sum); 1137 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1137} 1138}
1139#endif
1138 1140
1139bool 1141bool
1140bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1142bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1141{ 1143{
1142 bool ret = false; 1144 bool ret = false;
… …
1371 1373
1372 if (tiled_root_pmap != None) 1374 if (tiled_root_pmap != None)
1373 { 1375 {
1374 if (!need_client_side_rendering ()) 1376 if (!need_client_side_rendering ())
1375 { 1377 {
1376 if ((flags & blurNeeded)) 1378 if (flags & (blurNeeded | blurServerSide))
1377 { 1379 {
1378 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) 1380 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1379 result |= transpPmapBlurred; 1381 result |= transpPmapBlurred;
1380 } 1382 }
1381 if ((flags & tintNeeded)) 1383 if (flags & (tintNeeded | tintServerSide))
1382 { 1384 {
1383 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) 1385 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1384 result |= transpPmapTinted; 1386 result |= transpPmapTinted;
1385 } 1387 }
1386 } /* server side rendering completed */ 1388 } /* server side rendering completed */
1387 1389
1388 if (pixmap) 1390 if (pixmap)
… …
1625 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1627 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1626 int i; 1628 int i;
1627 1629
1628 Visual *visual = term->visual; 1630 Visual *visual = term->visual;
1629 1631
1630 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1632 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1631 1633
1632 /* for convenience */ 1634 /* for convenience */
1633 mask_r = visual->red_mask; 1635 mask_r = visual->red_mask;
1634 mask_g = visual->green_mask; 1636 mask_g = visual->green_mask;
1635 mask_b = visual->blue_mask; 1637 mask_b = visual->blue_mask;
1636 1638
1637 /* boring lookup table pre-initialization */ 1639 /* boring lookup table pre-initialization */
1638 switch (srcImage->bits_per_pixel) { 1640 switch (srcImage->bits_per_pixel)
1641 {
1639 case 15: 1642 case 15:
1640 if ((mask_r != 0x7c00) || 1643 if ((mask_r != 0x7c00) ||
1641 (mask_g != 0x03e0) || 1644 (mask_g != 0x03e0) ||
1642 (mask_b != 0x001f)) 1645 (mask_b != 0x001f))
1643 return; 1646 return;
1644 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1647 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
1645 lookup_r = lookup; 1648 lookup_r = lookup;
1646 lookup_g = lookup+32; 1649 lookup_g = lookup+32;
1647 lookup_b = lookup+32+32; 1650 lookup_b = lookup+32+32;
1648 sh_r = 10; 1651 sh_r = 10;
1649 sh_g = 5; 1652 sh_g = 5;
1650 sh_b = 0; 1653 sh_b = 0;
1651 break; 1654 break;
1652 case 16: 1655 case 16:
1653 if ((mask_r != 0xf800) || 1656 if ((mask_r != 0xf800) ||
1654 (mask_g != 0x07e0) || 1657 (mask_g != 0x07e0) ||
1655 (mask_b != 0x001f)) 1658 (mask_b != 0x001f))
1656 return; 1659 return;
1657 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1660 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
1658 lookup_r = lookup; 1661 lookup_r = lookup;
1659 lookup_g = lookup+32; 1662 lookup_g = lookup+32;
1660 lookup_b = lookup+32+64; 1663 lookup_b = lookup+32+64;
1661 sh_r = 11; 1664 sh_r = 11;
1662 sh_g = 5; 1665 sh_g = 5;
1663 sh_b = 0; 1666 sh_b = 0;
1664 break; 1667 break;
1665 case 24: 1668 case 24:
1666 if ((mask_r != 0xff0000) || 1669 if ((mask_r != 0xff0000) ||
1667 (mask_g != 0x00ff00) || 1670 (mask_g != 0x00ff00) ||
1668 (mask_b != 0x0000ff)) 1671 (mask_b != 0x0000ff))
1669 return; 1672 return;
1670 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1673 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1671 lookup_r = lookup; 1674 lookup_r = lookup;
1672 lookup_g = lookup+256; 1675 lookup_g = lookup+256;
1673 lookup_b = lookup+256+256; 1676 lookup_b = lookup+256+256;
1674 sh_r = 16; 1677 sh_r = 16;
1675 sh_g = 8; 1678 sh_g = 8;
1676 sh_b = 0; 1679 sh_b = 0;
1677 break; 1680 break;
1678 case 32: 1681 case 32:
1679 if ((mask_r != 0xff0000) || 1682 if ((mask_r != 0xff0000) ||
1680 (mask_g != 0x00ff00) || 1683 (mask_g != 0x00ff00) ||
1681 (mask_b != 0x0000ff)) 1684 (mask_b != 0x0000ff))
1682 return; 1685 return;
1683 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1686 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1684 lookup_r = lookup; 1687 lookup_r = lookup;
1685 lookup_g = lookup+256; 1688 lookup_g = lookup+256;
1686 lookup_b = lookup+256+256; 1689 lookup_b = lookup+256+256;
1687 sh_r = 16; 1690 sh_r = 16;
1688 sh_g = 8; 1691 sh_g = 8;
1689 sh_b = 0; 1692 sh_b = 0;
1690 break; 1693 break;
1691 default: 1694 default:
1692 return; /* we do not support this color depth */ 1695 return; /* we do not support this color depth */
1693 } 1696 }
1694 1697
1695 /* prepare limits for color transformation (each channel is handled separately) */ 1698 /* prepare limits for color transformation (each channel is handled separately) */
1696 if (shade > 100) { 1699 if (shade > 100)
1700 {
1697 shade = 200 - shade; 1701 shade = 200 - shade;
1698 1702
1699 lower_lim_r = 65535-rm; 1703 lower_lim_r = 65535-rm;
1700 lower_lim_g = 65535-gm; 1704 lower_lim_g = 65535-gm;
1701 lower_lim_b = 65535-bm; 1705 lower_lim_b = 65535-bm;
1702 1706
1703 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1707 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
1704 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1708 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
1705 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1709 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
1706 1710
1707 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1711 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1712 }
1708 } else { 1713 else
1714 {
1709 1715
1710 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1716 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1711 1717
1712 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1718 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1713 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1719 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1714 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); 1720 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1715 } 1721 }
1716 1722
1717 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */ 1723 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1718 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 )) 1724 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000))
1719 { 1725 {
1720 unsigned int tmp; 1726 unsigned int tmp;
1721 1727
1722 tmp = lower_lim_r; 1728 tmp = lower_lim_r;
1723 lower_lim_r = lower_lim_b; 1729 lower_lim_r = lower_lim_b;
1724 lower_lim_b = tmp; 1730 lower_lim_b = tmp;
1725 1731
1726 tmp = upper_lim_r; 1732 tmp = upper_lim_r;
1727 upper_lim_r = upper_lim_b; 1733 upper_lim_r = upper_lim_b;
1728 upper_lim_b = tmp; 1734 upper_lim_b = tmp;
1729 } 1735 }
1730 1736
1731 /* fill our lookup tables */ 1737 /* fill our lookup tables */
1732 for (i = 0; i <= mask_r>>sh_r; i++) 1738 for (i = 0; i <= mask_r>>sh_r; i++)
1733 { 1739 {
1734 RUINT32T tmp; 1740 RUINT32T tmp;
1735 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1741 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
1736 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1742 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
1737 lookup_r[i] = (tmp/65535)<<sh_r; 1743 lookup_r[i] = (tmp/65535)<<sh_r;
1738 } 1744 }
1739 for (i = 0; i <= mask_g>>sh_g; i++) 1745 for (i = 0; i <= mask_g>>sh_g; i++)
1740 { 1746 {
1741 RUINT32T tmp; 1747 RUINT32T tmp;
1742 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1748 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
1743 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1749 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
1744 lookup_g[i] = (tmp/65535)<<sh_g; 1750 lookup_g[i] = (tmp/65535)<<sh_g;
1745 } 1751 }
1746 for (i = 0; i <= mask_b>>sh_b; i++) 1752 for (i = 0; i <= mask_b>>sh_b; i++)
1747 { 1753 {
1748 RUINT32T tmp; 1754 RUINT32T tmp;
1749 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1755 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
1750 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1756 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
1751 lookup_b[i] = (tmp/65535)<<sh_b; 1757 lookup_b[i] = (tmp/65535)<<sh_b;
1752 } 1758 }
1753 1759
1754 /* apply table to input image (replacing colors by newly calculated ones) */ 1760 /* apply table to input image (replacing colors by newly calculated ones) */
1755 switch (srcImage->bits_per_pixel) 1761 switch (srcImage->bits_per_pixel)
1756 { 1762 {
1757 case 15: 1763 case 15:
1758 { 1764 {
1759 unsigned short *p1, *pf, *p, *pl; 1765 unsigned short *p1, *pf, *p, *pl;
1760 p1 = (unsigned short *) srcImage->data; 1766 p1 = (unsigned short *) srcImage->data;
1761 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1767 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1762 while (p1 < pf) 1768 while (p1 < pf)
1763 { 1769 {
1764 p = p1; 1770 p = p1;
1765 pl = p1 + srcImage->width; 1771 pl = p1 + srcImage->width;
1766 for (; p < pl; p++) 1772 for (; p < pl; p++)
1767 { 1773 {
1768 *p = lookup_r[(*p & 0x7c00)>>10] | 1774 *p = lookup_r[(*p & 0x7c00)>>10] |
1769 lookup_g[(*p & 0x03e0)>> 5] | 1775 lookup_g[(*p & 0x03e0)>> 5] |
1770 lookup_b[(*p & 0x001f)]; 1776 lookup_b[(*p & 0x001f)];
1771 } 1777 }
1772 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line); 1778 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1779 }
1780 break;
1773 } 1781 }
1774 break;
1775 }
1776 case 16: 1782 case 16:
1777 { 1783 {
1778 unsigned short *p1, *pf, *p, *pl; 1784 unsigned short *p1, *pf, *p, *pl;
1779 p1 = (unsigned short *) srcImage->data; 1785 p1 = (unsigned short *) srcImage->data;
1780 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1786 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1781 while (p1 < pf) 1787 while (p1 < pf)
1782 { 1788 {
1783 p = p1; 1789 p = p1;
1784 pl = p1 + srcImage->width; 1790 pl = p1 + srcImage->width;
1785 for (; p < pl; p++) 1791 for (; p < pl; p++)
1786 { 1792 {
1787 *p = lookup_r[(*p & 0xf800)>>11] | 1793 *p = lookup_r[(*p & 0xf800)>>11] |
1788 lookup_g[(*p & 0x07e0)>> 5] | 1794 lookup_g[(*p & 0x07e0)>> 5] |
1789 lookup_b[(*p & 0x001f)]; 1795 lookup_b[(*p & 0x001f)];
1790 } 1796 }
1791 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line); 1797 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1798 }
1799 break;
1792 } 1800 }
1793 break;
1794 }
1795 case 24: 1801 case 24:
1796 { 1802 {
1797 unsigned char *p1, *pf, *p, *pl; 1803 unsigned char *p1, *pf, *p, *pl;
1798 p1 = (unsigned char *) srcImage->data; 1804 p1 = (unsigned char *) srcImage->data;
1799 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1805 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1800 while (p1 < pf) 1806 while (p1 < pf)
1801 { 1807 {
1802 p = p1; 1808 p = p1;
1803 pl = p1 + srcImage->width * 3; 1809 pl = p1 + srcImage->width * 3;
1804 for (; p < pl; p += 3) 1810 for (; p < pl; p += 3)
1805 { 1811 {
1806 p[0] = lookup_r[(p[0] & 0xff0000)>>16]; 1812 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1807 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8]; 1813 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1808 p[2] = lookup_r[(p[2] & 0x0000ff)]; 1814 p[2] = lookup_r[(p[2] & 0x0000ff)];
1809 } 1815 }
1810 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line); 1816 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1817 }
1818 break;
1811 } 1819 }
1812 break;
1813 }
1814 case 32: 1820 case 32:
1815 { 1821 {
1816 RUINT32T *p1, *pf, *p, *pl; 1822 RUINT32T *p1, *pf, *p, *pl;
1817 p1 = (RUINT32T *) srcImage->data; 1823 p1 = (RUINT32T *) srcImage->data;
1818 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1824 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1819 1825
1820 while (p1 < pf) 1826 while (p1 < pf)
1821 { 1827 {
1822 p = p1; 1828 p = p1;
1823 pl = p1 + srcImage->width; 1829 pl = p1 + srcImage->width;
1824 for (; p < pl; p++) 1830 for (; p < pl; p++)
1825 { 1831 {
1826 *p = lookup_r[(*p & 0xff0000)>>16] | 1832 *p = lookup_r[(*p & 0xff0000)>>16] |
1827 lookup_g[(*p & 0x00ff00)>> 8] | 1833 lookup_g[(*p & 0x00ff00)>> 8] |
1828 lookup_b[(*p & 0x0000ff)] | 1834 lookup_b[(*p & 0x0000ff)] |
1829 (*p & ~0xffffff); 1835 (*p & ~0xffffff);
1830 } 1836 }
1831 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line); 1837 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1838 }
1839 break;
1832 } 1840 }
1833 break;
1834 }
1835 } 1841 }
1836 1842
1837 free (lookup); 1843 free (lookup);
1838} 1844}
1839#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1845#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines