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.107 by sf-exg, Mon Nov 1 14:29:33 2010 UTC vs.
Revision 1.117 by sf-exg, Fri Nov 12 22:00:05 2010 UTC

… …
23 *---------------------------------------------------------------------*/ 23 *---------------------------------------------------------------------*/
24 24
25#include <cmath> 25#include <cmath>
26#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28
29#if XRENDER
30# include <X11/extensions/Xrender.h>
31#endif
28 32
29#define DO_TIMING_TEST 0 33#define DO_TIMING_TEST 0
30 34
31#if DO_TIMING_TEST 35#if DO_TIMING_TEST
32# include <sys/time.h> 36# include <sys/time.h>
… …
168 return true; 172 return true;
169 } 173 }
170# endif 174# endif
171 175
172 return false; 176 return false;
173}; 177}
174 178
175bool bgPixmap_t::need_client_side_rendering () 179bool bgPixmap_t::need_client_side_rendering ()
176{ 180{
177# ifdef HAVE_AFTERIMAGE 181# ifdef HAVE_AFTERIMAGE
178 if (original_asim) 182 if (original_asim)
… …
250} 254}
251 255
252bool 256bool
253bgPixmap_t::set_geometry (const char *geom) 257bgPixmap_t::set_geometry (const char *geom)
254{ 258{
259 bool changed = false;
255 int geom_flags = 0, changed = 0; 260 int geom_flags = 0;
256 int x = 0, y = 0; 261 int x = 0, y = 0;
257 unsigned int w = 0, h = 0; 262 unsigned int w = 0, h = 0;
258 unsigned int n; 263 unsigned int n;
259 unsigned long new_flags = (flags & (~geometryFlags)); 264 unsigned long new_flags = (flags & (~geometryFlags));
260 const char *p; 265 const char *p;
… …
416 421
417 while (*ops != ':' && *ops != '\0') ++ops; 422 while (*ops != ':' && *ops != '\0') ++ops;
418 } /* done parsing ops */ 423 } /* done parsing ops */
419 } 424 }
420 425
421 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed; 426 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
422 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed; 427 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
423 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed; 428 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
424 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed; 429 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
425 } 430 }
426 431
427 if (new_flags != flags) 432 if (new_flags != flags)
428 { 433 {
429 flags = new_flags; 434 flags = new_flags;
430 changed++; 435 changed = true;
431 } 436 }
432 437
433 return (changed > 0); 438 return changed;
434} 439}
435 440
436void 441void
437bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 442bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
438{ 443{
… …
661 if (result) 666 if (result)
662 { 667 {
663 XGCValues gcv; 668 XGCValues gcv;
664 GC gc; 669 GC gc;
665 670
666 if (pixmap)
667 {
668 if (pmap_width != new_pmap_width
669 || pmap_height != new_pmap_height
670 || pmap_depth != target->depth)
671 {
672 XFreePixmap (target->dpy, pixmap);
673 pixmap = None;
674 }
675 }
676
677 /* create Pixmap */ 671 /* create Pixmap */
678 if (pixmap == None) 672 if (pixmap == None
673 || pmap_width != new_pmap_width
674 || pmap_height != new_pmap_height
675 || pmap_depth != target->depth)
679 { 676 {
677 if (pixmap)
678 XFreePixmap (target->dpy, pixmap);
680 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 679 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
681 pmap_width = new_pmap_width; 680 pmap_width = new_pmap_width;
682 pmap_height = new_pmap_height; 681 pmap_height = new_pmap_height;
683 pmap_depth = target->depth; 682 pmap_depth = target->depth;
684 } 683 }
… …
729 return false; 728 return false;
730 729
731 if (!pixbuf) 730 if (!pixbuf)
732 return false; 731 return false;
733 732
734#if !XRENDER
735 if (background_flags) 733 if (background_flags
734 && !(flags & HAS_RENDER))
736 return false; 735 return false;
737#endif
738 736
739 GdkPixbuf *result; 737 GdkPixbuf *result;
740 738
741 int image_width = gdk_pixbuf_get_width (pixbuf); 739 int image_width = gdk_pixbuf_get_width (pixbuf);
742 int image_height = gdk_pixbuf_get_height (pixbuf); 740 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
793 new_pmap_width = min (image_width, target_width); 791 new_pmap_width = min (image_width, target_width);
794 new_pmap_height = min (image_height, target_height); 792 new_pmap_height = min (image_height, target_height);
795 } 793 }
796 } 794 }
797 795
798 if (pixmap)
799 {
800 if (pmap_width != new_pmap_width
801 || pmap_height != new_pmap_height
802 || pmap_depth != target->depth)
803 {
804 XFreePixmap (target->dpy, pixmap);
805 pixmap = None;
806 }
807 }
808
809 if (pixmap == None) 796 if (pixmap == None
797 || pmap_width != new_pmap_width
798 || pmap_height != new_pmap_height
799 || pmap_depth != target->depth)
810 { 800 {
801 if (pixmap)
802 XFreePixmap (target->dpy, pixmap);
811 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 803 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
812 pmap_width = new_pmap_width; 804 pmap_width = new_pmap_width;
813 pmap_height = new_pmap_height; 805 pmap_height = new_pmap_height;
814 pmap_depth = target->depth; 806 pmap_depth = target->depth;
815 } 807 }
… …
968} 960}
969 961
970bool 962bool
971bgPixmap_t::set_blur_radius (const char *geom) 963bgPixmap_t::set_blur_radius (const char *geom)
972{ 964{
973 int changed = 0; 965 bool changed = false;
974 unsigned int hr, vr; 966 unsigned int hr, vr;
975 int junk; 967 int junk;
976 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 968 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
977 969
978 if (!(geom_flags & WidthValue)) 970 if (!(geom_flags & WidthValue))
… …
983 min_it (hr, 128); 975 min_it (hr, 128);
984 min_it (vr, 128); 976 min_it (vr, 128);
985 977
986 if (h_blurRadius != hr) 978 if (h_blurRadius != hr)
987 { 979 {
988 ++changed; 980 changed = true;
989 h_blurRadius = hr; 981 h_blurRadius = hr;
990 } 982 }
991 983
992 if (v_blurRadius != vr) 984 if (v_blurRadius != vr)
993 { 985 {
994 ++changed; 986 changed = true;
995 v_blurRadius = vr; 987 v_blurRadius = vr;
996 } 988 }
997 989
998 if (v_blurRadius == 0 && h_blurRadius == 0) 990 if (v_blurRadius == 0 && h_blurRadius == 0)
999 flags &= ~blurNeeded; 991 flags &= ~blurNeeded;
1000 else 992 else
1001 flags |= blurNeeded; 993 flags |= blurNeeded;
1002 994
1003#if XRENDER
1004 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1005 if (filters)
1006 {
1007 for (int i = 0; i < filters->nfilter; i++)
1008 if (!strcmp (filters->filter[i], FilterConvolution))
1009 flags |= bgPixmap_t::blurServerSide;
1010
1011 XFree (filters);
1012 }
1013#endif
1014
1015 return (changed > 0); 995 return changed;
1016} 996}
1017 997
1018static inline unsigned long 998static inline unsigned long
1019compute_tint_shade_flags (rxvt_color *tint, int shade) 999compute_tint_shade_flags (rxvt_color *tint, int shade)
1020{ 1000{
… …
1039 { 1019 {
1040 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 1020 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
1041 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 1021 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
1042 { 1022 {
1043 flags |= bgPixmap_t::tintNeeded; 1023 flags |= bgPixmap_t::tintNeeded;
1044 }
1045 }
1046
1047 if (flags & bgPixmap_t::tintNeeded)
1048 {
1049 if (flags & bgPixmap_t::tintWholesome)
1050 flags |= bgPixmap_t::tintServerSide;
1051 else
1052 {
1053#if XRENDER
1054 flags |= bgPixmap_t::tintServerSide;
1055#endif
1056 } 1024 }
1057 } 1025 }
1058 1026
1059 return flags; 1027 return flags;
1060} 1028}
… …
1259 1227
1260 if (mask_pic && overlay_pic && back_pic) 1228 if (mask_pic && overlay_pic && back_pic)
1261 { 1229 {
1262 XRenderColor mask_c; 1230 XRenderColor mask_c;
1263 1231
1264 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1232 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0;
1265 mask_c.alpha = 0xffff; 1233 mask_c.alpha = 0xffff;
1266 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1234 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1267 1235
1268 mask_c.alpha = 0; 1236 mask_c.alpha = 0;
1269 mask_c.red = 0xffff - c.r; 1237 mask_c.red = 0xffff - c.r;
… …
1336 Pixmap recoded_root_pmap = root_pixmap; 1304 Pixmap recoded_root_pmap = root_pixmap;
1337 1305
1338 if (root_pixmap != None && root_depth != target->depth) 1306 if (root_pixmap != None && root_depth != target->depth)
1339 { 1307 {
1340#if XRENDER 1308#if XRENDER
1309 if (flags & HAS_RENDER)
1310 {
1341 XRenderPictureAttributes pa; 1311 XRenderPictureAttributes pa;
1342 1312
1343 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 1313 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1344 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); 1314 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1345 1315
1346 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth); 1316 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1347 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 1317 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1348 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); 1318 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1349 1319
1350 if (src && dst) 1320 if (src && dst)
1351 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 1321 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1322 else
1323 {
1324 XFreePixmap (dpy, recoded_root_pmap);
1325 root_pixmap = None;
1326 }
1327
1328 XRenderFreePicture (dpy, src);
1329 XRenderFreePicture (dpy, dst);
1330 }
1352 else 1331 else
1353 { 1332#endif
1354 XFreePixmap (dpy, recoded_root_pmap);
1355 root_pixmap = None;
1356 }
1357
1358 XRenderFreePicture (dpy, src);
1359 XRenderFreePicture (dpy, dst);
1360#else
1361 root_pixmap = None; 1333 root_pixmap = None;
1362#endif
1363 } 1334 }
1364 1335
1365 if (root_pixmap == None) 1336 if (root_pixmap == None)
1366 return 0; 1337 return 0;
1367 1338
… …
1384 if (gc) 1355 if (gc)
1385 { 1356 {
1386 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1357 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1387 result |= transpPmapTiled; 1358 result |= transpPmapTiled;
1388 XFreeGC (dpy, gc); 1359 XFreeGC (dpy, gc);
1389 }
1390 1360
1391 if (tiled_root_pmap != None)
1392 {
1393 if (!need_client_side_rendering ()) 1361 if (!need_client_side_rendering ())
1394 { 1362 {
1395 if ((flags & blurNeeded) 1363 if ((flags & blurNeeded)
1396 && (flags & blurServerSide)) 1364 && (flags & HAS_RENDER_CONV))
1397 { 1365 {
1398 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1366 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1399 result |= transpPmapBlurred; 1367 result |= transpPmapBlurred;
1400 } 1368 }
1401 if ((flags & tintNeeded) 1369 if ((flags & tintNeeded)
1402 && (flags & tintServerSide)) 1370 && (flags & (tintWholesome | HAS_RENDER)))
1403 { 1371 {
1404 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1372 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1405 result |= transpPmapTinted; 1373 result |= transpPmapTinted;
1406 } 1374 }
1407 } /* server side rendering completed */ 1375 } /* server side rendering completed */
… …
1412 pixmap = tiled_root_pmap; 1380 pixmap = tiled_root_pmap;
1413 pmap_width = window_width; 1381 pmap_width = window_width;
1414 pmap_height = window_height; 1382 pmap_height = window_height;
1415 pmap_depth = target->depth; 1383 pmap_depth = target->depth;
1416 } 1384 }
1385 else
1386 XFreePixmap (dpy, tiled_root_pmap);
1417 1387
1418 if (recoded_root_pmap != root_pixmap) 1388 if (recoded_root_pmap != root_pixmap)
1419 XFreePixmap (dpy, recoded_root_pmap); 1389 XFreePixmap (dpy, recoded_root_pmap);
1420 1390
1421 return result; 1391 return result;
… …
1430 1400
1431 root_pixmap = new_root_pixmap; 1401 root_pixmap = new_root_pixmap;
1432} 1402}
1433# endif /* ENABLE_TRANSPARENCY */ 1403# endif /* ENABLE_TRANSPARENCY */
1434 1404
1435# ifndef HAVE_AFTERIMAGE 1405#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1436static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm); 1406static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c);
1437# endif 1407# endif
1438 1408
1439bool 1409bool
1440bgPixmap_t::render () 1410bgPixmap_t::render ()
1441{ 1411{
… …
1464 if (render_image (background_flags)) 1434 if (render_image (background_flags))
1465 flags = flags & ~isInvalid; 1435 flags = flags & ~isInvalid;
1466 } 1436 }
1467# endif 1437# endif
1468 1438
1439# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1469 XImage *result = NULL; 1440 XImage *result = NULL;
1470 1441
1471 if (background_flags && (flags & isInvalid)) 1442 if (background_flags && (flags & isInvalid))
1472 { 1443 {
1473 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1444 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1474 } 1445 }
1475 1446
1476 if (result) 1447 if (result)
1477 { 1448 {
1478# if !defined(HAVE_AFTERIMAGE) && !XRENDER
1479 /* our own client-side tinting */ 1449 /* our own client-side tinting */
1480 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1450 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1481 { 1451 {
1482 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1452 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1483 if (flags & tintSet) 1453 if (flags & tintSet)
1484 tint.get (c); 1454 tint.get (c);
1485 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b); 1455 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1486 } 1456 }
1487# endif
1488 1457
1489 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1458 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1490 1459
1491 if (gc) 1460 if (gc)
1492 { 1461 {
… …
1496 flags = flags & ~isInvalid; 1465 flags = flags & ~isInvalid;
1497 } 1466 }
1498 1467
1499 XDestroyImage (result); 1468 XDestroyImage (result);
1500 } 1469 }
1470# endif
1501 1471
1502 if (flags & isInvalid) 1472 if (flags & isInvalid)
1503 { 1473 {
1504 if (pixmap != None) 1474 if (pixmap != None)
1505 { 1475 {
… …
1517 1487
1518void 1488void
1519bgPixmap_t::set_target (rxvt_term *new_target) 1489bgPixmap_t::set_target (rxvt_term *new_target)
1520{ 1490{
1521 target = new_target; 1491 target = new_target;
1492
1493 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1494#if XRENDER
1495 int major, minor;
1496 if (XRenderQueryVersion (target->dpy, &major, &minor))
1497 flags |= HAS_RENDER;
1498 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1499 if (filters)
1500 {
1501 for (int i = 0; i < filters->nfilter; i++)
1502 if (!strcmp (filters->filter[i], FilterConvolution))
1503 flags |= HAS_RENDER_CONV;
1504
1505 XFree (filters);
1506 }
1507#endif
1522} 1508}
1523 1509
1524void 1510void
1525bgPixmap_t::apply () 1511bgPixmap_t::apply ()
1526{ 1512{
… …
1575 flags |= hasChanged; 1561 flags |= hasChanged;
1576} 1562}
1577 1563
1578#endif /* HAVE_BG_PIXMAP */ 1564#endif /* HAVE_BG_PIXMAP */
1579 1565
1580#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XRENDER 1566#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1581/* taken from aterm-0.4.2 */ 1567/* taken from aterm-0.4.2 */
1582 1568
1583static void 1569static void
1584ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) 1570ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c)
1585{ 1571{
1586 int sh_r, sh_g, sh_b; 1572 int sh_r, sh_g, sh_b;
1587 uint32_t mask_r, mask_g, mask_b; 1573 uint32_t mask_r, mask_g, mask_b;
1588 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1574 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1589 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1575 rgba low;
1590 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1576 rgba high;
1591 int i; 1577 int i;
1592 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1578 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1593 1579
1594 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1580 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1595 1581
… …
1660 /* prepare limits for color transformation (each channel is handled separately) */ 1646 /* prepare limits for color transformation (each channel is handled separately) */
1661 if (shade > 100) 1647 if (shade > 100)
1662 { 1648 {
1663 shade = 200 - shade; 1649 shade = 200 - shade;
1664 1650
1665 lower_lim_r = 65535-rm; 1651 high.r = (65535 - c.r) * shade / 100;
1666 lower_lim_g = 65535-gm; 1652 high.g = (65535 - c.g) * shade / 100;
1667 lower_lim_b = 65535-bm; 1653 high.b = (65535 - c.b) * shade / 100;
1668 1654
1669 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100); 1655 low.r = 65535 - high.r;
1670 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100); 1656 low.g = 65535 - high.g;
1671 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100); 1657 low.b = 65535 - high.b;
1672
1673 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1674 } 1658 }
1675 else 1659 else
1676 { 1660 {
1661 high.r = c.r * shade / 100;
1662 high.g = c.g * shade / 100;
1663 high.b = c.b * shade / 100;
1677 1664
1678 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1665 low.r = low.g = low.b = 0;
1679
1680 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1681 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1682 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1683 } 1666 }
1684 1667
1685 /* fill our lookup tables */ 1668 /* fill our lookup tables */
1686 for (i = 0; i <= mask_r>>sh_r; i++) 1669 for (i = 0; i <= mask_r>>sh_r; i++)
1687 { 1670 {
1688 uint32_t tmp; 1671 uint32_t tmp;
1689 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r)); 1672 tmp = i * high.r;
1690 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r); 1673 tmp += (mask_r>>sh_r) * low.r;
1691 lookup_r[i] = (tmp/65535)<<sh_r; 1674 lookup_r[i] = (tmp/65535)<<sh_r;
1692 } 1675 }
1693 for (i = 0; i <= mask_g>>sh_g; i++) 1676 for (i = 0; i <= mask_g>>sh_g; i++)
1694 { 1677 {
1695 uint32_t tmp; 1678 uint32_t tmp;
1696 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g)); 1679 tmp = i * high.g;
1697 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g); 1680 tmp += (mask_g>>sh_g) * low.g;
1698 lookup_g[i] = (tmp/65535)<<sh_g; 1681 lookup_g[i] = (tmp/65535)<<sh_g;
1699 } 1682 }
1700 for (i = 0; i <= mask_b>>sh_b; i++) 1683 for (i = 0; i <= mask_b>>sh_b; i++)
1701 { 1684 {
1702 uint32_t tmp; 1685 uint32_t tmp;
1703 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b)); 1686 tmp = i * high.b;
1704 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b); 1687 tmp += (mask_b>>sh_b) * low.b;
1705 lookup_b[i] = (tmp/65535)<<sh_b; 1688 lookup_b[i] = (tmp/65535)<<sh_b;
1706 } 1689 }
1707 1690
1708 /* apply table to input image (replacing colors by newly calculated ones) */ 1691 /* apply table to input image (replacing colors by newly calculated ones) */
1709 if (srcImage->bits_per_pixel == 32 1692 if (srcImage->bits_per_pixel == 32

Diff Legend

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