comparison src/image.c @ 82318:7bec7031afab

Minor cleanup.

82317:c668fe19825b

{
  struct image *img;
  struct image_cache *c = FRAME_X_IMAGE_CACHE (f);
  int i = hash % IMAGE_CACHE_BUCKETS_SIZE;

  /* If the image spec does not specify a background color, the cached
     image must have the same background color as the current frame.
     The foreground color must also match, for the sake of monochrome
     images.

     for color images, or if the image spec specifies :foreground;
     similarly we could ignore the background color matching condition
     for formats that don't use transparency (such as jpeg), or if the
     image spec specifies :background.  However, the extra memory
     usage is probably negligible in practice, so we don't bother.  */
  if (!c) return NULL;

  for (img = c->buckets[i]; img; img = img->next)
    if (img->hash == hash
	&& !NILP (Fequal (img->spec, spec))
	/* If the image spec specifies a background, it doesn't matter
	   what the frame background is.  */
	&& img->frame_foreground == FRAME_FOREGROUND_PIXEL (f)
	&& img->frame_background == FRAME_BACKGROUND_PIXEL (f))
      break;
  return img;
}

	      fn_png_set_background (png_ptr, &user_bg,
				     PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);
	    }
	}
      /* The commented-out code checked if the png specifies a default
	 background color, and uses that.  Since we rely on the
	 current frame background, it is actually OK for us to ignore
	 this part.

      else if (fn_png_get_bKGD (png_ptr, info_ptr, &image_bg))
	fn_png_set_background (png_ptr, image_bg,
			       PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
	*/

82318:7bec7031afab

{
  struct image *img;
  struct image_cache *c = FRAME_X_IMAGE_CACHE (f);
  int i = hash % IMAGE_CACHE_BUCKETS_SIZE;

  if (!c) return NULL;

  /* If the image spec does not specify a background color, the cached
     image must have the same background color as the current frame.
     The foreground color must also match, for the sake of monochrome
     images.

     for color images, or if the image spec specifies :foreground;
     similarly we could ignore the background color matching condition
     for formats that don't use transparency (such as jpeg), or if the
     image spec specifies :background.  However, the extra memory
     usage is probably negligible in practice, so we don't bother.  */

  for (img = c->buckets[i]; img; img = img->next)
    if (img->hash == hash
	&& !NILP (Fequal (img->spec, spec))
	&& img->frame_foreground == FRAME_FOREGROUND_PIXEL (f)
	&& img->frame_background == FRAME_BACKGROUND_PIXEL (f))
      break;
  return img;
}

	      fn_png_set_background (png_ptr, &user_bg,
				     PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);
	    }
	}
      /* The commented-out code checked if the png specifies a default
	 background color, and uses that.  Since we use the current
	 frame background, it is OK for us to ignore this.

      else if (fn_png_get_bKGD (png_ptr, info_ptr, &image_bg))
	fn_png_set_background (png_ptr, image_bg,
			       PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
	*/