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.169 by sf-exg, Fri Aug 19 18:04:01 2011 UTC vs.
Revision 1.186 by sf-exg, Wed Dec 28 11:11:25 2011 UTC

… …
150 int smaller = min (image_size, window_size); 150 int smaller = min (image_size, window_size);
151 151
152 if (align >= 0 && align <= 100) 152 if (align >= 0 && align <= 100)
153 return diff * align / 100; 153 return diff * align / 100;
154 else if (align > 100 && align <= 200) 154 else if (align > 100 && align <= 200)
155 return ((align - 100) * smaller / 100) + window_size - smaller; 155 return (align - 100) * smaller / 100 + window_size - smaller;
156 else if (align >= -100 && align < 0) 156 else if (align >= -100 && align < 0)
157 return ((align + 100) * smaller / 100) - image_size; 157 return (align + 100) * smaller / 100 - image_size;
158 return 0; 158 return 0;
159} 159}
160 160
161static inline int 161static inline int
162make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 162make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
… …
181{ 181{
182 bool changed = false; 182 bool changed = false;
183 int geom_flags = 0; 183 int geom_flags = 0;
184 int x = 0, y = 0; 184 int x = 0, y = 0;
185 unsigned int w = 0, h = 0; 185 unsigned int w = 0, h = 0;
186 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS)); 186 unsigned long new_flags = 0;
187 187
188 if (geom == NULL) 188 if (geom == NULL)
189 return false; 189 return false;
190 190
191 if (geom[0]) 191 if (geom[0])
192 { 192 {
193 char **arr = rxvt_strsplit (':', geom); 193 char **arr = rxvt_strsplit (':', geom);
194 194
195 for (int i = 0; arr[i]; i++) 195 for (int i = 0; arr[i]; i++)
196 { 196 {
197 if (!strcasecmp (arr[i], "style=tiled")) 197 if (!strcasecmp (arr[i], "style=tiled"))
198 { 198 {
199 new_flags = BG_TILE; 199 new_flags = BG_TILE;
200 w = h = noScale; 200 w = h = noScale;
201 x = y = 0; 201 x = y = 0;
202 geom_flags = WidthValue|HeightValue|XValue|YValue; 202 geom_flags = WidthValue|HeightValue|XValue|YValue;
203 } 203 }
204 else if (!strcasecmp (arr[i], "style=aspect-stretched")) 204 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
205 { 205 {
206 new_flags = BG_PROP_SCALE; 206 new_flags = BG_KEEP_ASPECT;
207 w = h = windowScale; 207 w = h = windowScale;
208 x = y = centerAlign; 208 x = y = centerAlign;
209 geom_flags = WidthValue|HeightValue|XValue|YValue; 209 geom_flags = WidthValue|HeightValue|XValue|YValue;
210 } 210 }
211 else if (!strcasecmp (arr[i], "style=stretched")) 211 else if (!strcasecmp (arr[i], "style=stretched"))
… …
227 w = h = noScale; 227 w = h = noScale;
228 geom_flags = WidthValue|HeightValue; 228 geom_flags = WidthValue|HeightValue;
229 } 229 }
230 else if (!strcasecmp (arr[i], "op=tile")) 230 else if (!strcasecmp (arr[i], "op=tile"))
231 new_flags |= BG_TILE; 231 new_flags |= BG_TILE;
232 else if (!strcasecmp (arr[i], "op=pscale")) 232 else if (!strcasecmp (arr[i], "op=keep-aspect"))
233 new_flags |= BG_PROP_SCALE; 233 new_flags |= BG_KEEP_ASPECT;
234 else if (!strcasecmp (arr[i], "op=root")) 234 else if (!strcasecmp (arr[i], "op=root-align"))
235 new_flags |= BG_ROOT_ALIGN; 235 new_flags |= BG_ROOT_ALIGN;
236 236
237 // deprecated 237 // deprecated
238 else if (!strcasecmp (arr[i], "tile")) 238 else if (!strcasecmp (arr[i], "tile"))
239 { 239 {
… …
241 w = h = noScale; 241 w = h = noScale;
242 geom_flags |= WidthValue|HeightValue; 242 geom_flags |= WidthValue|HeightValue;
243 } 243 }
244 else if (!strcasecmp (arr[i], "propscale")) 244 else if (!strcasecmp (arr[i], "propscale"))
245 { 245 {
246 new_flags |= BG_PROP_SCALE; 246 new_flags |= BG_KEEP_ASPECT;
247 w = h = windowScale;
248 geom_flags |= WidthValue|HeightValue;
247 } 249 }
248 else if (!strcasecmp (arr[i], "hscale")) 250 else if (!strcasecmp (arr[i], "hscale"))
249 { 251 {
250 new_flags |= BG_TILE; 252 new_flags |= BG_TILE;
251 w = windowScale; 253 w = windowScale;
… …
281 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h); 283 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
282 } /* done parsing ops */ 284 } /* done parsing ops */
283 285
284 rxvt_free_strsplit (arr); 286 rxvt_free_strsplit (arr);
285 } 287 }
288
289 new_flags |= bg_flags & ~BG_GEOMETRY_FLAGS;
286 290
287 if (!update) 291 if (!update)
288 { 292 {
289 if (!(geom_flags & XValue)) 293 if (!(geom_flags & XValue))
290 x = y = defaultAlign; 294 x = y = defaultAlign;
… …
322 int target_height = szHint.height; 326 int target_height = szHint.height;
323 327
324 w = h_scale * target_width / 100; 328 w = h_scale * target_width / 100;
325 h = v_scale * target_height / 100; 329 h = v_scale * target_height / 100;
326 330
327 if (bg_flags & BG_PROP_SCALE) 331 if (bg_flags & BG_KEEP_ASPECT)
328 { 332 {
329 float scale = (float)w / image_width; 333 float scale = (float)w / image_width;
330 min_it (scale, (float)h / image_height); 334 min_it (scale, (float)h / image_height);
331 w = image_width * scale + 0.5; 335 w = image_width * scale + 0.5;
332 h = image_height * scale + 0.5; 336 h = image_height * scale + 0.5;
… …
383 } 387 }
384 388
385 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 389 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
386 { 390 {
387 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 391 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
388 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 392 ASA_XImage,
389 100, ASIMAGE_QUALITY_DEFAULT); 393 100, ASIMAGE_QUALITY_DEFAULT);
390 if (tmp) 394 if (tmp)
391 { 395 {
392 destroy_asimage (&background); 396 destroy_asimage (&background);
393 background = tmp; 397 background = tmp;
… …
412 416
413 if (!original_asim 417 if (!original_asim
414 || (!(bg_flags & BG_ROOT_ALIGN) 418 || (!(bg_flags & BG_ROOT_ALIGN)
415 && (x >= target_width 419 && (x >= target_width
416 || y >= target_height 420 || y >= target_height
417 || (x + w <= 0) 421 || x + w <= 0
418 || (y + h <= 0)))) 422 || y + h <= 0)))
419 { 423 {
420 if (background) 424 if (background)
421 { 425 {
422 new_pmap_width = background->width; 426 new_pmap_width = background->width;
423 new_pmap_height = background->height; 427 new_pmap_height = background->height;
… …
437 } 441 }
438 else 442 else
439 { 443 {
440 result = original_asim; 444 result = original_asim;
441 445
442 if ((w != original_asim->width) 446 if (w != original_asim->width
443 || (h != original_asim->height)) 447 || h != original_asim->height)
444 { 448 {
445 result = scale_asimage (asv, original_asim, 449 result = scale_asimage (asv, original_asim,
446 w, h, 450 w, h,
447 background ? ASA_ASImage : ASA_XImage, 451 ASA_XImage,
448 100, ASIMAGE_QUALITY_DEFAULT); 452 100, ASIMAGE_QUALITY_DEFAULT);
449 } 453 }
450 454
451 if (background == NULL) 455 if (background == NULL)
452 { 456 {
… …
702 get_image_geometry (image_width, image_height, w, h, x, y); 706 get_image_geometry (image_width, image_height, w, h, x, y);
703 707
704 if (!(bg_flags & BG_ROOT_ALIGN) 708 if (!(bg_flags & BG_ROOT_ALIGN)
705 && (x >= target_width 709 && (x >= target_width
706 || y >= target_height 710 || y >= target_height
707 || (x + w <= 0) 711 || x + w <= 0
708 || (y + h <= 0))) 712 || y + h <= 0))
709 return false; 713 return false;
710 714
711 result = pixbuf; 715 result = pixbuf;
712 716
713 if ((w != image_width) 717 if (w != image_width
714 || (h != image_height)) 718 || h != image_height)
715 { 719 {
716 result = gdk_pixbuf_scale_simple (pixbuf, 720 result = gdk_pixbuf_scale_simple (pixbuf,
717 w, h, 721 w, h,
718 GDK_INTERP_BILINEAR); 722 GDK_INTERP_BILINEAR);
719 } 723 }
… …
951} 955}
952 956
953void 957void
954rxvt_term::set_tint_shade_flags () 958rxvt_term::set_tint_shade_flags ()
955{ 959{
956 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 960 rgba c;
957 bool has_shade = shade != 100; 961 bool has_shade = shade != 100;
958 962
959 bg_flags &= ~BG_TINT_FLAGS; 963 bg_flags &= ~BG_TINT_FLAGS;
960 964
961 if (bg_flags & BG_TINT_SET) 965 if (bg_flags & BG_TINT_SET)
… …
987} 991}
988 992
989bool 993bool
990rxvt_term::bg_set_shade (const char *shade_str) 994rxvt_term::bg_set_shade (const char *shade_str)
991{ 995{
992 int new_shade = (shade_str) ? atoi (shade_str) : 100; 996 int new_shade = atoi (shade_str);
993 997
994 clamp_it (new_shade, -100, 200); 998 clamp_it (new_shade, -100, 200);
995 if (new_shade < 0) 999 if (new_shade < 0)
996 new_shade = 200 - (100 + new_shade); 1000 new_shade = 200 - (100 + new_shade);
997 1001
… …
1031bool 1035bool
1032rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1036rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1033{ 1037{
1034 bool ret = false; 1038 bool ret = false;
1035#if XRENDER 1039#if XRENDER
1040 if (!(bg_flags & BG_HAS_RENDER_CONV))
1041 return false;
1042
1036 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1043 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1037 double *kernel = (double *)malloc (size * sizeof (double)); 1044 double *kernel = (double *)malloc (size * sizeof (double));
1038 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1045 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1039 1046
1040 XRenderPictureAttributes pa; 1047 XRenderPictureAttributes pa;
… …
1113 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1120 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1114 ret = true; 1121 ret = true;
1115 XFreeGC (dpy, gc); 1122 XFreeGC (dpy, gc);
1116 } 1123 }
1117 } 1124 }
1118 else
1119 {
1120# if XRENDER 1125# if XRENDER
1126 else if (bg_flags & BG_HAS_RENDER)
1127 {
1121 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1128 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1122 1129
1123 if (bg_flags & BG_TINT_SET) 1130 if (bg_flags & BG_TINT_SET)
1124 tint.get (c); 1131 tint.get (c);
1125 1132
… …
1180 ret = true; 1187 ret = true;
1181 1188
1182 XRenderFreePicture (dpy, mask_pic); 1189 XRenderFreePicture (dpy, mask_pic);
1183 XRenderFreePicture (dpy, overlay_pic); 1190 XRenderFreePicture (dpy, overlay_pic);
1184 XRenderFreePicture (dpy, back_pic); 1191 XRenderFreePicture (dpy, back_pic);
1192 }
1185# endif 1193# endif
1186 }
1187 1194
1188 return ret; 1195 return ret;
1189} 1196}
1190 1197
1191/* 1198/*
… …
1275 bg_pmap_width = window_width; 1282 bg_pmap_width = window_width;
1276 bg_pmap_height = window_height; 1283 bg_pmap_height = window_height;
1277 } 1284 }
1278 1285
1279 /* straightforward pixmap copy */ 1286 /* straightforward pixmap copy */
1280 while (sx < 0) sx += root_width; 1287 while (sx < 0) sx += root_pmap_width;
1281 while (sy < 0) sy += root_height; 1288 while (sy < 0) sy += root_pmap_height;
1282 1289
1283 gcv.tile = recoded_root_pmap; 1290 gcv.tile = recoded_root_pmap;
1284 gcv.fill_style = FillTiled; 1291 gcv.fill_style = FillTiled;
1285 gcv.ts_x_origin = -sx; 1292 gcv.ts_x_origin = -sx;
1286 gcv.ts_y_origin = -sy; 1293 gcv.ts_y_origin = -sy;
… …
1292 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1299 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1293 XFreeGC (dpy, gc); 1300 XFreeGC (dpy, gc);
1294 1301
1295 if (!(bg_flags & BG_CLIENT_RENDER)) 1302 if (!(bg_flags & BG_CLIENT_RENDER))
1296 { 1303 {
1297 if ((bg_flags & BG_NEEDS_BLUR) 1304 if (bg_flags & BG_NEEDS_BLUR)
1298 && (bg_flags & BG_HAS_RENDER_CONV))
1299 { 1305 {
1300 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1306 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1301 result &= ~BG_NEEDS_BLUR; 1307 result &= ~BG_NEEDS_BLUR;
1302 } 1308 }
1303 if ((bg_flags & BG_NEEDS_TINT) 1309 if (bg_flags & BG_NEEDS_TINT)
1304 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1305 { 1310 {
1306 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1311 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1307 result &= ~BG_NEEDS_TINT; 1312 result &= ~BG_NEEDS_TINT;
1308 } 1313 }
1309 } /* server side rendering completed */ 1314 } /* server side rendering completed */
… …
1323 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]); 1328 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1324 1329
1325 root_pixmap = new_root_pixmap; 1330 root_pixmap = new_root_pixmap;
1326} 1331}
1327# endif /* ENABLE_TRANSPARENCY */ 1332# endif /* ENABLE_TRANSPARENCY */
1328
1329#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1330static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1331# endif
1332 1333
1333bool 1334bool
1334rxvt_term::bg_render () 1335rxvt_term::bg_render ()
1335{ 1336{
1336 unsigned long tr_flags = 0; 1337 unsigned long tr_flags = 0;
… …
1341 { 1342 {
1342 /* we need to re-generate transparency pixmap in that case ! */ 1343 /* we need to re-generate transparency pixmap in that case ! */
1343 tr_flags = make_transparency_pixmap (); 1344 tr_flags = make_transparency_pixmap ();
1344 if (tr_flags == 0) 1345 if (tr_flags == 0)
1345 return false; 1346 return false;
1346 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1347 bg_flags |= BG_IS_VALID; 1347 bg_flags |= BG_IS_VALID;
1348 } 1348 }
1349# endif 1349# endif
1350 1350
1351# ifdef BG_IMAGE_FROM_FILE 1351# ifdef BG_IMAGE_FROM_FILE
1352 if ((bg_flags & BG_IS_FROM_FILE) 1352 if ((bg_flags & BG_IS_FROM_FILE)
… …
1358# endif 1358# endif
1359 1359
1360# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1360# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1361 XImage *result = NULL; 1361 XImage *result = NULL;
1362 1362
1363 if (tr_flags && !(bg_flags & BG_IS_VALID)) 1363 if (tr_flags & BG_NEEDS_TINT)
1364 { 1364 {
1365 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); 1365 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1366 } 1366 }
1367 1367
1368 if (result) 1368 if (result)
1369 { 1369 {
1370 /* our own client-side tinting */ 1370 /* our own client-side tinting */
1371 if (tr_flags & BG_NEEDS_TINT) 1371 //if (tr_flags & BG_NEEDS_TINT)
1372 { 1372 if (1)
1373 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1374 if (bg_flags & BG_TINT_SET)
1375 tint.get (c);
1376 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); 1373 tint_ximage (DefaultVisual (dpy, display->screen), result);
1377 }
1378 1374
1379 GC gc = XCreateGC (dpy, vt, 0UL, NULL); 1375 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1380 1376
1381 if (gc) 1377 if (gc)
1382 { 1378 {
1383 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1379 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1384 1380
1385 XFreeGC (dpy, gc); 1381 XFreeGC (dpy, gc);
1386 bg_flags |= BG_IS_VALID;
1387 } 1382 }
1388 1383
1389 XDestroyImage (result); 1384 XDestroyImage (result);
1390 } 1385 }
1391# endif 1386# endif
… …
1434#endif /* HAVE_BG_PIXMAP */ 1429#endif /* HAVE_BG_PIXMAP */
1435 1430
1436#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1431#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1437/* based on code from aterm-0.4.2 */ 1432/* based on code from aterm-0.4.2 */
1438 1433
1439static void 1434static inline void
1440shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1435fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1436{
1437 for (int i = 0; i <= mask >> sh; i++)
1438 {
1439 uint32_t tmp;
1440 tmp = i * high;
1441 tmp += (mask >> sh) * low;
1442 lookup[i] = (tmp / 0xffff) << sh;
1443 }
1444}
1445
1446void
1447rxvt_term::tint_ximage (Visual *visual, XImage *ximage)
1441{ 1448{
1442 int sh_r, sh_g, sh_b; 1449 int sh_r, sh_g, sh_b;
1443 uint32_t mask_r, mask_g, mask_b; 1450 uint32_t mask_r, mask_g, mask_b;
1444 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1451 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1445 rgba low; 1452 unsigned short low;
1446 rgba high;
1447 int i;
1448 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1453 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1449 1454
1450 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1455 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1451 1456
1452 /* for convenience */ 1457 /* for convenience */
… …
1511 break; 1516 break;
1512 default: 1517 default:
1513 return; /* we do not support this color depth */ 1518 return; /* we do not support this color depth */
1514 } 1519 }
1515 1520
1521 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1522
1523 if (bg_flags & BG_TINT_SET)
1524 tint.get (c);
1525
1516 /* prepare limits for color transformation (each channel is handled separately) */ 1526 /* prepare limits for color transformation (each channel is handled separately) */
1517 if (shade > 100) 1527 if (shade > 100)
1518 { 1528 {
1519 shade = 200 - shade;
1520
1521 high.r = c.r * shade / 100;
1522 high.g = c.g * shade / 100;
1523 high.b = c.b * shade / 100;
1524
1525 low.r = 65535 * (100 - shade) / 100; 1529 c.r = c.r * (200 - shade) / 100;
1526 low.g = 65535 * (100 - shade) / 100; 1530 c.g = c.g * (200 - shade) / 100;
1527 low.b = 65535 * (100 - shade) / 100; 1531 c.b = c.b * (200 - shade) / 100;
1532
1533 low = 0xffff * (shade - 100) / 100;
1528 } 1534 }
1529 else 1535 else
1530 { 1536 {
1531 high.r = c.r * shade / 100; 1537 c.r = c.r * shade / 100;
1532 high.g = c.g * shade / 100; 1538 c.g = c.g * shade / 100;
1533 high.b = c.b * shade / 100; 1539 c.b = c.b * shade / 100;
1534 1540
1535 low.r = low.g = low.b = 0; 1541 low = 0;
1536 } 1542 }
1537 1543
1538 /* fill our lookup tables */ 1544 /* fill our lookup tables */
1539 for (i = 0; i <= mask_r>>sh_r; i++) 1545 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1540 { 1546 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1541 uint32_t tmp; 1547 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1542 tmp = i * high.r;
1543 tmp += (mask_r>>sh_r) * low.r;
1544 lookup_r[i] = (tmp/65535)<<sh_r;
1545 }
1546 for (i = 0; i <= mask_g>>sh_g; i++)
1547 {
1548 uint32_t tmp;
1549 tmp = i * high.g;
1550 tmp += (mask_g>>sh_g) * low.g;
1551 lookup_g[i] = (tmp/65535)<<sh_g;
1552 }
1553 for (i = 0; i <= mask_b>>sh_b; i++)
1554 {
1555 uint32_t tmp;
1556 tmp = i * high.b;
1557 tmp += (mask_b>>sh_b) * low.b;
1558 lookup_b[i] = (tmp/65535)<<sh_b;
1559 }
1560 1548
1561 /* apply table to input image (replacing colors by newly calculated ones) */ 1549 /* apply table to input image (replacing colors by newly calculated ones) */
1562 if (ximage->bits_per_pixel == 32 1550 if (ximage->bits_per_pixel == 32
1563 && (ximage->depth == 24 || ximage->depth == 32) 1551 && (ximage->depth == 24 || ximage->depth == 32)
1564 && ximage->byte_order == host_byte_order) 1552 && ximage->byte_order == host_byte_order)

Diff Legend

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