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.84 by sf-exg, Sat Oct 16 20:25:06 2010 UTC vs.
Revision 1.91 by sf-exg, Mon Oct 18 16:10:35 2010 UTC

… …
222 int diff = window_size - image_size; 222 int diff = window_size - image_size;
223 int smaller = min (image_size, window_size); 223 int smaller = min (image_size, window_size);
224 224
225 if (align >= 0 && align <= 100) 225 if (align >= 0 && align <= 100)
226 return diff * align / 100; 226 return diff * align / 100;
227 else if (align > 100 && align <= 200 ) 227 else if (align > 100 && align <= 200)
228 return ((align - 100) * smaller / 100) + window_size - smaller; 228 return ((align - 100) * smaller / 100) + window_size - smaller;
229 else if (align >= -100 && align < 0) 229 else if (align >= -100 && align < 0)
230 return ((align + 100) * smaller / 100) - image_size; 230 return ((align + 100) * smaller / 100) - image_size;
231 return 0; 231 return 0;
232} 232}
… …
468 x = make_align_position (h_align, target_width, w); 468 x = make_align_position (h_align, target_width, w);
469 y = make_align_position (v_align, target_height, h); 469 y = make_align_position (v_align, target_height, h);
470 } 470 }
471 471
472 flags &= ~sizeSensitive; 472 flags &= ~sizeSensitive;
473 if (h_scale != 0 || v_scale != 0 473 if ((flags & propScale) || h_scale || v_scale
474 || h_align != 0 || v_align != 0 474 || (!(flags & rootAlign) && (h_align || v_align))
475 || w > target_width || h > target_height) 475 || w > target_width || h > target_height)
476 flags |= sizeSensitive; 476 flags |= sizeSensitive;
477} 477}
478 478
479# ifdef HAVE_AFTERIMAGE 479# ifdef HAVE_AFTERIMAGE
… …
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
… …
1117 1117
1118#if XFT 1118#if XFT
1119static void 1119static void
1120get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 1120get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1121{ 1121{
1122 double sigma = radius / 2.0; 1122 double sigma = radius / 2.0;
1123 double scale = sqrt (2.0 * M_PI) * sigma; 1123 double scale = sqrt (2.0 * M_PI) * sigma;
1124 double sum = 0.0; 1124 double sum = 0.0;
1125 1125
1126 for (int i = 0; i < width; i++) 1126 for (int i = 0; i < width; i++)
1127 { 1127 {
1128 double x = i - width / 2; 1128 double x = i - width / 2;
1129 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 1129 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1130 sum += kernel[i]; 1130 sum += kernel[i];
1131 } 1131 }
1132 1132
1133 params[0] = XDoubleToFixed (width); 1133 params[0] = XDoubleToFixed (width);
1134 params[1] = XDoubleToFixed (1); 1134 params[1] = XDoubleToFixed (1);
1135 1135
1136 for (int i = 0; i < width; i++) 1136 for (int i = 0; i < width; i++)
1137 params[i+2] = XDoubleToFixed (kernel[i] / sum); 1137 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1138} 1138}
1139#endif 1139#endif
1140 1140
1141bool 1141bool
1142bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1142bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
… …
1147 double *kernel = (double *)malloc (size * sizeof (double)); 1147 double *kernel = (double *)malloc (size * sizeof (double));
1148 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1148 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1149 1149
1150 Display *dpy = target->dpy; 1150 Display *dpy = target->dpy;
1151 XRenderPictureAttributes pa; 1151 XRenderPictureAttributes pa;
1152 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, target->visual); 1152 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1153 1153
1154 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1154 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1155 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1155 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1156 1156
1157 if (kernel && params && src && dst) 1157 if (kernel && params && src && dst)
… …
1375 { 1375 {
1376 if (!need_client_side_rendering ()) 1376 if (!need_client_side_rendering ())
1377 { 1377 {
1378 if (flags & (blurNeeded | blurServerSide)) 1378 if (flags & (blurNeeded | blurServerSide))
1379 { 1379 {
1380 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))
1381 result |= transpPmapBlurred; 1381 result |= transpPmapBlurred;
1382 } 1382 }
1383 if (flags & (tintNeeded | tintServerSide)) 1383 if (flags & (tintNeeded | tintServerSide))
1384 { 1384 {
1385 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))
1386 result |= transpPmapTinted; 1386 result |= transpPmapTinted;
1387 } 1387 }
1388 } /* server side rendering completed */ 1388 } /* server side rendering completed */
1389 1389
1390 if (pixmap) 1390 if (pixmap)
… …
1417 return false; 1417 return false;
1418} 1418}
1419# endif /* ENABLE_TRANSPARENCY */ 1419# endif /* ENABLE_TRANSPARENCY */
1420 1420
1421# ifndef HAVE_AFTERIMAGE 1421# ifndef HAVE_AFTERIMAGE
1422static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1422static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm);
1423# endif 1423# endif
1424 1424
1425bool 1425bool
1426bgPixmap_t::render () 1426bgPixmap_t::render ()
1427{ 1427{
… …
1471 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1471 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1472 { 1472 {
1473 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1473 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1474 if (flags & tintSet) 1474 if (flags & tintSet)
1475 tint.get (c); 1475 tint.get (c);
1476 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1476 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b);
1477 } 1477 }
1478# endif 1478# endif
1479 1479
1480 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1480 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1481 1481
… …
1616/* taken from aterm-0.4.2 */ 1616/* taken from aterm-0.4.2 */
1617 1617
1618typedef uint32_t RUINT32T; 1618typedef uint32_t RUINT32T;
1619 1619
1620static void 1620static void
1621ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1621ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm)
1622{ 1622{
1623 int sh_r, sh_g, sh_b; 1623 int sh_r, sh_g, sh_b;
1624 RUINT32T mask_r, mask_g, mask_b; 1624 RUINT32T mask_r, mask_g, mask_b;
1625 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1625 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1626 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1626 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1627 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1627 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1628 int i; 1628 int i;
1629 1629
1630 Visual *visual = term->visual;
1631
1632 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1630 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1633 1631
1634 /* for convenience */ 1632 /* for convenience */
1635 mask_r = visual->red_mask; 1633 mask_r = visual->red_mask;
1636 mask_g = visual->green_mask; 1634 mask_g = visual->green_mask;
1637 mask_b = visual->blue_mask; 1635 mask_b = visual->blue_mask;
1638 1636
1639 /* boring lookup table pre-initialization */ 1637 /* boring lookup table pre-initialization */
1640 switch (srcImage->bits_per_pixel) { 1638 switch (srcImage->bits_per_pixel)
1639 {
1641 case 15: 1640 case 15:
1642 if ((mask_r != 0x7c00) || 1641 if ((mask_r != 0x7c00) ||
1643 (mask_g != 0x03e0) || 1642 (mask_g != 0x03e0) ||
1644 (mask_b != 0x001f)) 1643 (mask_b != 0x001f))
1645 return; 1644 return;
1646 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1645 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
1647 lookup_r = lookup; 1646 lookup_r = lookup;
1648 lookup_g = lookup+32; 1647 lookup_g = lookup+32;
1649 lookup_b = lookup+32+32; 1648 lookup_b = lookup+32+32;
1650 sh_r = 10; 1649 sh_r = 10;
1651 sh_g = 5; 1650 sh_g = 5;
1652 sh_b = 0; 1651 sh_b = 0;
1653 break; 1652 break;
1654 case 16: 1653 case 16:
1655 if ((mask_r != 0xf800) || 1654 if ((mask_r != 0xf800) ||
1656 (mask_g != 0x07e0) || 1655 (mask_g != 0x07e0) ||
1657 (mask_b != 0x001f)) 1656 (mask_b != 0x001f))
1658 return; 1657 return;
1659 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1658 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
1660 lookup_r = lookup; 1659 lookup_r = lookup;
1661 lookup_g = lookup+32; 1660 lookup_g = lookup+32;
1662 lookup_b = lookup+32+64; 1661 lookup_b = lookup+32+64;
1663 sh_r = 11; 1662 sh_r = 11;
1664 sh_g = 5; 1663 sh_g = 5;
1665 sh_b = 0; 1664 sh_b = 0;
1666 break; 1665 break;
1667 case 24: 1666 case 24:
1668 if ((mask_r != 0xff0000) || 1667 if ((mask_r != 0xff0000) ||
1669 (mask_g != 0x00ff00) || 1668 (mask_g != 0x00ff00) ||
1670 (mask_b != 0x0000ff)) 1669 (mask_b != 0x0000ff))
1671 return; 1670 return;
1672 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1671 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1673 lookup_r = lookup; 1672 lookup_r = lookup;
1674 lookup_g = lookup+256; 1673 lookup_g = lookup+256;
1675 lookup_b = lookup+256+256; 1674 lookup_b = lookup+256+256;
1676 sh_r = 16; 1675 sh_r = 16;
1677 sh_g = 8; 1676 sh_g = 8;
1678 sh_b = 0; 1677 sh_b = 0;
1679 break; 1678 break;
1680 case 32: 1679 case 32:
1681 if ((mask_r != 0xff0000) || 1680 if ((mask_r != 0xff0000) ||
1682 (mask_g != 0x00ff00) || 1681 (mask_g != 0x00ff00) ||
1683 (mask_b != 0x0000ff)) 1682 (mask_b != 0x0000ff))
1684 return; 1683 return;
1685 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1684 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1686 lookup_r = lookup; 1685 lookup_r = lookup;
1687 lookup_g = lookup+256; 1686 lookup_g = lookup+256;
1688 lookup_b = lookup+256+256; 1687 lookup_b = lookup+256+256;
1689 sh_r = 16; 1688 sh_r = 16;
1690 sh_g = 8; 1689 sh_g = 8;
1691 sh_b = 0; 1690 sh_b = 0;
1692 break; 1691 break;
1693 default: 1692 default:
1694 return; /* we do not support this color depth */ 1693 return; /* we do not support this color depth */
1695 } 1694 }
1696 1695
1697 /* prepare limits for color transformation (each channel is handled separately) */ 1696 /* prepare limits for color transformation (each channel is handled separately) */
1698 if (shade > 100) { 1697 if (shade > 100)
1698 {
1699 shade = 200 - shade; 1699 shade = 200 - shade;
1700 1700
1701 lower_lim_r = 65535-rm; 1701 lower_lim_r = 65535-rm;
1702 lower_lim_g = 65535-gm; 1702 lower_lim_g = 65535-gm;
1703 lower_lim_b = 65535-bm; 1703 lower_lim_b = 65535-bm;
1704 1704
1705 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1705 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
1706 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1706 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
1707 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1707 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
1708 1708
1709 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1709 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1710 }
1710 } else { 1711 else
1712 {
1711 1713
1712 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1714 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1713 1715
1714 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1716 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1715 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1717 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1716 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); 1718 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1717 } 1719 }
1718 1720
1719 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */ 1721 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1720 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 )) 1722 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000))
1721 { 1723 {
1722 unsigned int tmp; 1724 unsigned int tmp;
1723 1725
1724 tmp = lower_lim_r; 1726 tmp = lower_lim_r;
1725 lower_lim_r = lower_lim_b; 1727 lower_lim_r = lower_lim_b;
1726 lower_lim_b = tmp; 1728 lower_lim_b = tmp;
1727 1729
1728 tmp = upper_lim_r; 1730 tmp = upper_lim_r;
1729 upper_lim_r = upper_lim_b; 1731 upper_lim_r = upper_lim_b;
1730 upper_lim_b = tmp; 1732 upper_lim_b = tmp;
1731 } 1733 }
1732 1734
1733 /* fill our lookup tables */ 1735 /* fill our lookup tables */
1734 for (i = 0; i <= mask_r>>sh_r; i++) 1736 for (i = 0; i <= mask_r>>sh_r; i++)
1735 { 1737 {
1736 RUINT32T tmp; 1738 RUINT32T tmp;
1737 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1739 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
1738 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1740 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
1739 lookup_r[i] = (tmp/65535)<<sh_r; 1741 lookup_r[i] = (tmp/65535)<<sh_r;
1740 } 1742 }
1741 for (i = 0; i <= mask_g>>sh_g; i++) 1743 for (i = 0; i <= mask_g>>sh_g; i++)
1742 { 1744 {
1743 RUINT32T tmp; 1745 RUINT32T tmp;
1744 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1746 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
1745 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1747 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
1746 lookup_g[i] = (tmp/65535)<<sh_g; 1748 lookup_g[i] = (tmp/65535)<<sh_g;
1747 } 1749 }
1748 for (i = 0; i <= mask_b>>sh_b; i++) 1750 for (i = 0; i <= mask_b>>sh_b; i++)
1749 { 1751 {
1750 RUINT32T tmp; 1752 RUINT32T tmp;
1751 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1753 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
1752 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1754 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
1753 lookup_b[i] = (tmp/65535)<<sh_b; 1755 lookup_b[i] = (tmp/65535)<<sh_b;
1754 } 1756 }
1755 1757
1756 /* apply table to input image (replacing colors by newly calculated ones) */ 1758 /* apply table to input image (replacing colors by newly calculated ones) */
1757 switch (srcImage->bits_per_pixel) 1759 switch (srcImage->bits_per_pixel)
1758 { 1760 {
1759 case 15: 1761 case 15:
1760 { 1762 {
1761 unsigned short *p1, *pf, *p, *pl; 1763 unsigned short *p1, *pf, *p, *pl;
1762 p1 = (unsigned short *) srcImage->data; 1764 p1 = (unsigned short *) srcImage->data;
1763 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1765 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1764 while (p1 < pf) 1766 while (p1 < pf)
1765 { 1767 {
1766 p = p1; 1768 p = p1;
1767 pl = p1 + srcImage->width; 1769 pl = p1 + srcImage->width;
1768 for (; p < pl; p++) 1770 for (; p < pl; p++)
1769 { 1771 {
1770 *p = lookup_r[(*p & 0x7c00)>>10] | 1772 *p = lookup_r[(*p & 0x7c00)>>10] |
1771 lookup_g[(*p & 0x03e0)>> 5] | 1773 lookup_g[(*p & 0x03e0)>> 5] |
1772 lookup_b[(*p & 0x001f)]; 1774 lookup_b[(*p & 0x001f)];
1773 } 1775 }
1774 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line); 1776 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1777 }
1778 break;
1775 } 1779 }
1776 break;
1777 }
1778 case 16: 1780 case 16:
1779 { 1781 {
1780 unsigned short *p1, *pf, *p, *pl; 1782 unsigned short *p1, *pf, *p, *pl;
1781 p1 = (unsigned short *) srcImage->data; 1783 p1 = (unsigned short *) srcImage->data;
1782 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1784 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1783 while (p1 < pf) 1785 while (p1 < pf)
1784 { 1786 {
1785 p = p1; 1787 p = p1;
1786 pl = p1 + srcImage->width; 1788 pl = p1 + srcImage->width;
1787 for (; p < pl; p++) 1789 for (; p < pl; p++)
1788 { 1790 {
1789 *p = lookup_r[(*p & 0xf800)>>11] | 1791 *p = lookup_r[(*p & 0xf800)>>11] |
1790 lookup_g[(*p & 0x07e0)>> 5] | 1792 lookup_g[(*p & 0x07e0)>> 5] |
1791 lookup_b[(*p & 0x001f)]; 1793 lookup_b[(*p & 0x001f)];
1792 } 1794 }
1793 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line); 1795 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1796 }
1797 break;
1794 } 1798 }
1795 break;
1796 }
1797 case 24: 1799 case 24:
1798 { 1800 {
1799 unsigned char *p1, *pf, *p, *pl; 1801 unsigned char *p1, *pf, *p, *pl;
1800 p1 = (unsigned char *) srcImage->data; 1802 p1 = (unsigned char *) srcImage->data;
1801 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1803 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1802 while (p1 < pf) 1804 while (p1 < pf)
1803 { 1805 {
1804 p = p1; 1806 p = p1;
1805 pl = p1 + srcImage->width * 3; 1807 pl = p1 + srcImage->width * 3;
1806 for (; p < pl; p += 3) 1808 for (; p < pl; p += 3)
1807 { 1809 {
1808 p[0] = lookup_r[(p[0] & 0xff0000)>>16]; 1810 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1809 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8]; 1811 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1810 p[2] = lookup_r[(p[2] & 0x0000ff)]; 1812 p[2] = lookup_r[(p[2] & 0x0000ff)];
1811 } 1813 }
1812 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line); 1814 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1815 }
1816 break;
1813 } 1817 }
1814 break;
1815 }
1816 case 32: 1818 case 32:
1817 { 1819 {
1818 RUINT32T *p1, *pf, *p, *pl; 1820 RUINT32T *p1, *pf, *p, *pl;
1819 p1 = (RUINT32T *) srcImage->data; 1821 p1 = (RUINT32T *) srcImage->data;
1820 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1822 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1821 1823
1822 while (p1 < pf) 1824 while (p1 < pf)
1823 { 1825 {
1824 p = p1; 1826 p = p1;
1825 pl = p1 + srcImage->width; 1827 pl = p1 + srcImage->width;
1826 for (; p < pl; p++) 1828 for (; p < pl; p++)
1827 { 1829 {
1828 *p = lookup_r[(*p & 0xff0000)>>16] | 1830 *p = lookup_r[(*p & 0xff0000)>>16] |
1829 lookup_g[(*p & 0x00ff00)>> 8] | 1831 lookup_g[(*p & 0x00ff00)>> 8] |
1830 lookup_b[(*p & 0x0000ff)] | 1832 lookup_b[(*p & 0x0000ff)] |
1831 (*p & ~0xffffff); 1833 (*p & ~0xffffff);
1832 } 1834 }
1833 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line); 1835 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1836 }
1837 break;
1834 } 1838 }
1835 break;
1836 }
1837 } 1839 }
1838 1840
1839 free (lookup); 1841 free (lookup);
1840} 1842}
1841#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1843#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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