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.157 by sf-exg, Tue Aug 9 21:48:00 2011 UTC vs.
Revision 1.179 by sf-exg, Sat Dec 24 09:44:10 2011 UTC

… …
32 32
33#ifndef FilterConvolution 33#ifndef FilterConvolution
34#define FilterConvolution "convolution" 34#define FilterConvolution "convolution"
35#endif 35#endif
36 36
37/*
38 * Pixmap geometry string interpretation :
39 * Each geometry string contains zero or one scale/position
40 * adjustment and may optionally be followed by a colon and one or more
41 * colon-delimited pixmap operations.
42 * The following table shows the valid geometry strings and their
43 * effects on the background image :
44 *
45 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
46 * W and H are percentages of the terminal window size.
47 * X and Y are also percentages; e.g., +50+50 centers
48 * the image in the window.
49 *
50 * Pixmap Operations : (should be prepended by a colon)
51 * tile Tile image. Scaling/position modifiers above will affect
52 * the tile size and origin.
53 * propscale When scaling, scale proportionally. That is, maintain the
54 * proper aspect ratio for the image. Any portion of the
55 * background not covered by the image is filled with the
56 * current background color.
57 * hscale Scale horizontally, tile vertically ?
58 * vscale Tile horizontally, scale vertically ?
59 * scale Scale both up and down
60 */
61
62#ifdef HAVE_BG_PIXMAP 37#ifdef HAVE_BG_PIXMAP
63void 38void
64rxvt_term::bg_destroy () 39rxvt_term::bg_destroy ()
65{ 40{
66#ifdef HAVE_AFTERIMAGE 41#ifdef HAVE_AFTERIMAGE
… …
175 int smaller = min (image_size, window_size); 150 int smaller = min (image_size, window_size);
176 151
177 if (align >= 0 && align <= 100) 152 if (align >= 0 && align <= 100)
178 return diff * align / 100; 153 return diff * align / 100;
179 else if (align > 100 && align <= 200) 154 else if (align > 100 && align <= 200)
180 return ((align - 100) * smaller / 100) + window_size - smaller; 155 return (align - 100) * smaller / 100 + window_size - smaller;
181 else if (align >= -100 && align < 0) 156 else if (align >= -100 && align < 0)
182 return ((align + 100) * smaller / 100) - image_size; 157 return (align + 100) * smaller / 100 - image_size;
183 return 0; 158 return 0;
184} 159}
185 160
186static inline int 161static inline int
187make_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)
… …
206{ 181{
207 bool changed = false; 182 bool changed = false;
208 int geom_flags = 0; 183 int geom_flags = 0;
209 int x = 0, y = 0; 184 int x = 0, y = 0;
210 unsigned int w = 0, h = 0; 185 unsigned int w = 0, h = 0;
211 unsigned int n;
212 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS)); 186 unsigned long new_flags = bg_flags & ~BG_GEOMETRY_FLAGS;
213 const char *ops;
214 187
215 if (geom == NULL) 188 if (geom == NULL)
216 return false; 189 return false;
217 190
218 char str[256]; 191 if (geom[0])
219
220 ops = strchr (geom, ':');
221 if (ops == NULL)
222 n = strlen (geom);
223 else
224 n = ops - geom;
225
226 if (n >= sizeof (str))
227 return false;
228
229 memcpy (str, geom, n);
230 str[n] = '\0';
231 rxvt_strtrim (str);
232
233 if (str[0])
234 { 192 {
235 /* we have geometry string - let's handle it prior to applying ops */ 193 char **arr = rxvt_strsplit (':', geom);
194
195 for (int i = 0; arr[i]; i++)
196 {
197 if (!strcasecmp (arr[i], "style=tiled"))
198 {
199 new_flags = BG_TILE;
200 w = h = noScale;
201 x = y = 0;
202 geom_flags = WidthValue|HeightValue|XValue|YValue;
203 }
204 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
205 {
206 new_flags = BG_KEEP_ASPECT;
207 w = h = windowScale;
208 x = y = centerAlign;
209 geom_flags = WidthValue|HeightValue|XValue|YValue;
210 }
211 else if (!strcasecmp (arr[i], "style=stretched"))
212 {
213 new_flags = 0;
214 w = h = windowScale;
215 geom_flags = WidthValue|HeightValue;
216 }
217 else if (!strcasecmp (arr[i], "style=centered"))
218 {
219 new_flags = 0;
220 w = h = noScale;
221 x = y = centerAlign;
222 geom_flags = WidthValue|HeightValue|XValue|YValue;
223 }
224 else if (!strcasecmp (arr[i], "style=root-tiled"))
225 {
226 new_flags = BG_TILE|BG_ROOT_ALIGN;
227 w = h = noScale;
228 geom_flags = WidthValue|HeightValue;
229 }
230 else if (!strcasecmp (arr[i], "op=tile"))
231 new_flags |= BG_TILE;
232 else if (!strcasecmp (arr[i], "op=keep-aspect"))
233 new_flags |= BG_KEEP_ASPECT;
234 else if (!strcasecmp (arr[i], "op=root-align"))
235 new_flags |= BG_ROOT_ALIGN;
236
237 // deprecated
238 else if (!strcasecmp (arr[i], "tile"))
239 {
240 new_flags |= BG_TILE;
241 w = h = noScale;
242 geom_flags |= WidthValue|HeightValue;
243 }
244 else if (!strcasecmp (arr[i], "propscale"))
245 {
246 new_flags |= BG_KEEP_ASPECT;
247 w = h = windowScale;
248 geom_flags |= WidthValue|HeightValue;
249 }
250 else if (!strcasecmp (arr[i], "hscale"))
251 {
252 new_flags |= BG_TILE;
253 w = windowScale;
254 h = noScale;
255 geom_flags |= WidthValue|HeightValue;
256 }
257 else if (!strcasecmp (arr[i], "vscale"))
258 {
259 new_flags |= BG_TILE;
260 h = windowScale;
261 w = noScale;
262 geom_flags |= WidthValue|HeightValue;
263 }
264 else if (!strcasecmp (arr[i], "scale"))
265 {
266 w = h = windowScale;
267 geom_flags |= WidthValue|HeightValue;
268 }
269 else if (!strcasecmp (arr[i], "auto"))
270 {
271 w = h = windowScale;
272 x = y = centerAlign;
273 geom_flags |= WidthValue|HeightValue|XValue|YValue;
274 }
275 else if (!strcasecmp (arr[i], "root"))
276 {
277 new_flags |= BG_TILE|BG_ROOT_ALIGN;
278 w = h = noScale;
279 geom_flags |= WidthValue|HeightValue;
280 }
281
282 else
236 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 283 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
237 } /* done parsing geometry string */ 284 } /* done parsing ops */
285
286 rxvt_free_strsplit (arr);
287 }
238 288
239 if (!update) 289 if (!update)
240 { 290 {
241 if (!(geom_flags & XValue)) 291 if (!(geom_flags & XValue))
242 x = y = defaultAlign; 292 x = y = defaultAlign;
… …
251 w = h; 301 w = h;
252 302
253 geom_flags |= WidthValue|HeightValue|XValue|YValue; 303 geom_flags |= WidthValue|HeightValue|XValue|YValue;
254 } 304 }
255 305
256 if (ops)
257 {
258 char **arr = rxvt_strsplit (':', ops + 1);
259
260 for (int i = 0; arr[i]; i++)
261 {
262 if (!strcasecmp (arr[i], "tile"))
263 {
264 new_flags |= BG_TILE;
265 w = h = noScale;
266 geom_flags |= WidthValue|HeightValue;
267 }
268 else if (!strcasecmp (arr[i], "propscale"))
269 {
270 new_flags |= BG_PROP_SCALE;
271 }
272 else if (!strcasecmp (arr[i], "hscale"))
273 {
274 if (w == 0) w = windowScale;
275
276 h = noScale;
277 geom_flags |= WidthValue|HeightValue;
278 }
279 else if (!strcasecmp (arr[i], "vscale"))
280 {
281 if (h == 0) h = windowScale;
282
283 w = noScale;
284 geom_flags |= WidthValue|HeightValue;
285 }
286 else if (!strcasecmp (arr[i], "scale"))
287 {
288 if (h == 0) h = windowScale;
289 if (w == 0) w = windowScale;
290
291 geom_flags |= WidthValue|HeightValue;
292 }
293 else if (!strcasecmp (arr[i], "root"))
294 {
295 new_flags |= BG_TILE|BG_ROOT_ALIGN;
296 w = h = noScale;
297 geom_flags |= WidthValue|HeightValue;
298 }
299 } /* done parsing ops */
300
301 rxvt_free_strsplit (arr);
302 }
303
304 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 306 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
305 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 307 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
306 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 308 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
307 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; 309 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
308 310
… …
319rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 321rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
320{ 322{
321 int target_width = szHint.width; 323 int target_width = szHint.width;
322 int target_height = szHint.height; 324 int target_height = szHint.height;
323 325
326 w = h_scale * target_width / 100;
327 h = v_scale * target_height / 100;
328
324 if (bg_flags & BG_PROP_SCALE) 329 if (bg_flags & BG_KEEP_ASPECT)
325 { 330 {
326 float scale = (float)target_width / image_width; 331 float scale = (float)w / image_width;
327 min_it (scale, (float)target_height / image_height); 332 min_it (scale, (float)h / image_height);
328 w = image_width * scale + 0.5; 333 w = image_width * scale + 0.5;
329 h = image_height * scale + 0.5; 334 h = image_height * scale + 0.5;
330 } 335 }
331 else
332 {
333 w = h_scale * target_width / 100;
334 h = v_scale * target_height / 100;
335 }
336 336
337 if (!w) w = image_width; 337 if (!w) w = image_width;
338 if (!h) h = image_height; 338 if (!h) h = image_height;
339 339
340 if (bg_flags & BG_ROOT_ALIGN) 340 if (bg_flags & BG_ROOT_ALIGN)
… …
348 y = make_align_position (v_align, target_height, h); 348 y = make_align_position (v_align, target_height, h);
349 } 349 }
350 350
351 bg_flags &= ~BG_IS_SIZE_SENSITIVE; 351 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
352 if (!(bg_flags & BG_TILE) 352 if (!(bg_flags & BG_TILE)
353 || (bg_flags & BG_PROP_SCALE) || h_scale || v_scale 353 || h_scale || v_scale
354 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 354 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
355 || w > target_width || h > target_height) 355 || w > target_width || h > target_height)
356 bg_flags |= BG_IS_SIZE_SENSITIVE; 356 bg_flags |= BG_IS_SIZE_SENSITIVE;
357} 357}
358 358
… …
385 } 385 }
386 386
387 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 387 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
388 { 388 {
389 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 389 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
390 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 390 ASA_XImage,
391 100, ASIMAGE_QUALITY_DEFAULT); 391 100, ASIMAGE_QUALITY_DEFAULT);
392 if (tmp) 392 if (tmp)
393 { 393 {
394 destroy_asimage (&background); 394 destroy_asimage (&background);
395 background = tmp; 395 background = tmp;
… …
414 414
415 if (!original_asim 415 if (!original_asim
416 || (!(bg_flags & BG_ROOT_ALIGN) 416 || (!(bg_flags & BG_ROOT_ALIGN)
417 && (x >= target_width 417 && (x >= target_width
418 || y >= target_height 418 || y >= target_height
419 || (x + w <= 0) 419 || x + w <= 0
420 || (y + h <= 0)))) 420 || y + h <= 0)))
421 { 421 {
422 if (background) 422 if (background)
423 { 423 {
424 new_pmap_width = background->width; 424 new_pmap_width = background->width;
425 new_pmap_height = background->height; 425 new_pmap_height = background->height;
… …
439 } 439 }
440 else 440 else
441 { 441 {
442 result = original_asim; 442 result = original_asim;
443 443
444 if ((w != original_asim->width) 444 if (w != original_asim->width
445 || (h != original_asim->height)) 445 || h != original_asim->height)
446 { 446 {
447 result = scale_asimage (asv, original_asim, 447 result = scale_asimage (asv, original_asim,
448 w, h, 448 w, h,
449 background ? ASA_ASImage : ASA_XImage, 449 ASA_XImage,
450 100, ASIMAGE_QUALITY_DEFAULT); 450 100, ASIMAGE_QUALITY_DEFAULT);
451 } 451 }
452 452
453 if (background == NULL) 453 if (background == NULL)
454 { 454 {
… …
704 get_image_geometry (image_width, image_height, w, h, x, y); 704 get_image_geometry (image_width, image_height, w, h, x, y);
705 705
706 if (!(bg_flags & BG_ROOT_ALIGN) 706 if (!(bg_flags & BG_ROOT_ALIGN)
707 && (x >= target_width 707 && (x >= target_width
708 || y >= target_height 708 || y >= target_height
709 || (x + w <= 0) 709 || x + w <= 0
710 || (y + h <= 0))) 710 || y + h <= 0))
711 return false; 711 return false;
712 712
713 result = pixbuf; 713 result = pixbuf;
714 714
715 if ((w != image_width) 715 if (w != image_width
716 || (h != image_height)) 716 || h != image_height)
717 { 717 {
718 result = gdk_pixbuf_scale_simple (pixbuf, 718 result = gdk_pixbuf_scale_simple (pixbuf,
719 w, h, 719 w, h,
720 GDK_INTERP_BILINEAR); 720 GDK_INTERP_BILINEAR);
721 } 721 }
… …
850rxvt_term::bg_set_file (const char *file) 850rxvt_term::bg_set_file (const char *file)
851{ 851{
852 if (!file || !*file) 852 if (!file || !*file)
853 return false; 853 return false;
854 854
855 bool ret = false;
855 if (const char *p = strchr (file, ';')) 856 const char *p = strchr (file, ';');
857
858 if (p)
856 { 859 {
857 size_t len = p - file; 860 size_t len = p - file;
858 char *f = rxvt_temp_buf<char> (len + 1); 861 char *f = rxvt_temp_buf<char> (len + 1);
859 memcpy (f, file, len); 862 memcpy (f, file, len);
860 f[len] = '\0'; 863 f[len] = '\0';
… …
869 { 872 {
870 if (original_asim) 873 if (original_asim)
871 safe_asimage_destroy (original_asim); 874 safe_asimage_destroy (original_asim);
872 original_asim = image; 875 original_asim = image;
873 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 876 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
874 return true; 877 ret = true;
875 } 878 }
876# endif 879# endif
877 880
878# ifdef HAVE_PIXBUF 881# ifdef HAVE_PIXBUF
879 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 882 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
… …
881 { 884 {
882 if (pixbuf) 885 if (pixbuf)
883 g_object_unref (pixbuf); 886 g_object_unref (pixbuf);
884 pixbuf = image; 887 pixbuf = image;
885 bg_flags |= BG_IS_FROM_FILE; 888 bg_flags |= BG_IS_FROM_FILE;
886 return true; 889 ret = true;
887 } 890 }
888# endif 891# endif
889 892
893 if (ret)
894 {
895 if (p)
896 bg_set_geometry (p + 1);
897 else
898 bg_set_default_geometry ();
899 }
900
890 return false; 901 return ret;
891} 902}
892 903
893# endif /* BG_IMAGE_FROM_FILE */ 904# endif /* BG_IMAGE_FROM_FILE */
894 905
895# ifdef ENABLE_TRANSPARENCY 906# ifdef ENABLE_TRANSPARENCY
… …
1266 bg_pmap_width = window_width; 1277 bg_pmap_width = window_width;
1267 bg_pmap_height = window_height; 1278 bg_pmap_height = window_height;
1268 } 1279 }
1269 1280
1270 /* straightforward pixmap copy */ 1281 /* straightforward pixmap copy */
1271 while (sx < 0) sx += root_width; 1282 while (sx < 0) sx += root_pmap_width;
1272 while (sy < 0) sy += root_height; 1283 while (sy < 0) sy += root_pmap_height;
1273 1284
1274 gcv.tile = recoded_root_pmap; 1285 gcv.tile = recoded_root_pmap;
1275 gcv.fill_style = FillTiled; 1286 gcv.fill_style = FillTiled;
1276 gcv.ts_x_origin = -sx; 1287 gcv.ts_x_origin = -sx;
1277 gcv.ts_y_origin = -sy; 1288 gcv.ts_y_origin = -sy;
… …
1332 { 1343 {
1333 /* we need to re-generate transparency pixmap in that case ! */ 1344 /* we need to re-generate transparency pixmap in that case ! */
1334 tr_flags = make_transparency_pixmap (); 1345 tr_flags = make_transparency_pixmap ();
1335 if (tr_flags == 0) 1346 if (tr_flags == 0)
1336 return false; 1347 return false;
1337 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1338 bg_flags |= BG_IS_VALID; 1348 bg_flags |= BG_IS_VALID;
1339 } 1349 }
1340# endif 1350# endif
1341 1351
1342# ifdef BG_IMAGE_FROM_FILE 1352# ifdef BG_IMAGE_FROM_FILE
1343 if ((bg_flags & BG_IS_FROM_FILE) 1353 if ((bg_flags & BG_IS_FROM_FILE)
… …
1349# endif 1359# endif
1350 1360
1351# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1361# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1352 XImage *result = NULL; 1362 XImage *result = NULL;
1353 1363
1354 if (tr_flags && !(bg_flags & BG_IS_VALID)) 1364 if (tr_flags & BG_NEEDS_TINT)
1355 { 1365 {
1356 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); 1366 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1357 } 1367 }
1358 1368
1359 if (result) 1369 if (result)
1360 { 1370 {
1361 /* our own client-side tinting */ 1371 /* our own client-side tinting */
1362 if (tr_flags & BG_NEEDS_TINT) 1372 //if (tr_flags & BG_NEEDS_TINT)
1373 if (1)
1363 { 1374 {
1364 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1375 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1365 if (bg_flags & BG_TINT_SET) 1376 if (bg_flags & BG_TINT_SET)
1366 tint.get (c); 1377 tint.get (c);
1367 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); 1378 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
… …
1372 if (gc) 1383 if (gc)
1373 { 1384 {
1374 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1385 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1375 1386
1376 XFreeGC (dpy, gc); 1387 XFreeGC (dpy, gc);
1377 bg_flags |= BG_IS_VALID;
1378 } 1388 }
1379 1389
1380 XDestroyImage (result); 1390 XDestroyImage (result);
1381 } 1391 }
1382# endif 1392# endif
… …
1423} 1433}
1424 1434
1425#endif /* HAVE_BG_PIXMAP */ 1435#endif /* HAVE_BG_PIXMAP */
1426 1436
1427#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1437#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1428/* taken from aterm-0.4.2 */ 1438/* based on code from aterm-0.4.2 */
1439
1440static inline void
1441fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1442{
1443 for (int i = 0; i <= mask >> sh; i++)
1444 {
1445 uint32_t tmp;
1446 tmp = i * high;
1447 tmp += (mask >> sh) * low;
1448 lookup[i] = (tmp / 0xffff) << sh;
1449 }
1450}
1429 1451
1430static void 1452static void
1431shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1453shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1432{ 1454{
1433 int sh_r, sh_g, sh_b; 1455 int sh_r, sh_g, sh_b;
1434 uint32_t mask_r, mask_g, mask_b; 1456 uint32_t mask_r, mask_g, mask_b;
1435 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1457 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1436 rgba low; 1458 rgba low;
1437 rgba high; 1459 rgba high;
1438 int i;
1439 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1460 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1440 1461
1441 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1462 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1442 1463
1443 /* for convenience */ 1464 /* for convenience */
… …
1525 1546
1526 low.r = low.g = low.b = 0; 1547 low.r = low.g = low.b = 0;
1527 } 1548 }
1528 1549
1529 /* fill our lookup tables */ 1550 /* fill our lookup tables */
1530 for (i = 0; i <= mask_r>>sh_r; i++) 1551 fill_lut (lookup_r, mask_r, sh_r, low.r, high.r);
1531 { 1552 fill_lut (lookup_g, mask_g, sh_g, low.g, high.g);
1532 uint32_t tmp; 1553 fill_lut (lookup_b, mask_b, sh_b, low.b, high.b);
1533 tmp = i * high.r;
1534 tmp += (mask_r>>sh_r) * low.r;
1535 lookup_r[i] = (tmp/65535)<<sh_r;
1536 }
1537 for (i = 0; i <= mask_g>>sh_g; i++)
1538 {
1539 uint32_t tmp;
1540 tmp = i * high.g;
1541 tmp += (mask_g>>sh_g) * low.g;
1542 lookup_g[i] = (tmp/65535)<<sh_g;
1543 }
1544 for (i = 0; i <= mask_b>>sh_b; i++)
1545 {
1546 uint32_t tmp;
1547 tmp = i * high.b;
1548 tmp += (mask_b>>sh_b) * low.b;
1549 lookup_b[i] = (tmp/65535)<<sh_b;
1550 }
1551 1554
1552 /* apply table to input image (replacing colors by newly calculated ones) */ 1555 /* apply table to input image (replacing colors by newly calculated ones) */
1553 if (ximage->bits_per_pixel == 32 1556 if (ximage->bits_per_pixel == 32
1554 && (ximage->depth == 24 || ximage->depth == 32) 1557 && (ximage->depth == 24 || ximage->depth == 32)
1555 && ximage->byte_order == host_byte_order) 1558 && ximage->byte_order == host_byte_order)

Diff Legend

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