comparison src/image.c @ 54920:38cb79e68369

(PNG_BG_COLOR_SHIFT): Remove. (png_load): Fix calculation of transparent background color on X and W32 platforms.

54919:80ffc816e4e9

#define COLOR_TABLE_SUPPORT 1

typedef struct x_bitmap_record Bitmap_Record;
#define GET_PIXEL(ximg, x, y) XGetPixel(ximg, x, y)
#define NO_PIXMAP None
#define PNG_BG_COLOR_SHIFT 0

#define RGB_PIXEL_COLOR unsigned long

#define PIX_MASK_RETAIN(f) 0
#define PIX_MASK_DRAW(f) 1

#undef COLOR_TABLE_SUPPORT

typedef struct w32_bitmap_record Bitmap_Record;
#define GET_PIXEL(ximg, x, y) GetPixel(ximg, x, y)
#define NO_PIXMAP 0
#define PNG_BG_COLOR_SHIFT 0

#define RGB_PIXEL_COLOR COLORREF

#define PIX_MASK_RETAIN(f) 0
#define PIX_MASK_DRAW(f) 1

#define ZPixmap 0 		/* arbitrary */
typedef struct mac_bitmap_record Bitmap_Record;

#define GET_PIXEL(ximg, x, y) XGetPixel(ximg, x, y)
#define NO_PIXMAP 0
#define PNG_BG_COLOR_SHIFT 8

#define RGB_PIXEL_COLOR unsigned long

#define FRAME_X_VISUAL(f) FRAME_X_DISPLAY_INFO (f)->visual
#define x_defined_color mac_defined_color

/* Return the `background' field of IMG.  If IMG doesn't have one yet,
   it is guessed heuristically.  If non-zero, XIMG is an existing
   XImage object (or device context with the image selected on W32) to
   use for the heuristic.  */ 

RGB_PIXEL_COLOR
image_background (img, f, ximg)
     struct image *img;
     struct frame *f;

      img->background = four_corners_best (ximg, img->width, img->height);

      if (free_ximg)
	Destroy_Image (ximg, prev);
      
      img->background_valid = 1;
    }

  return img->background;
}

	  img->background = background;
	  img->background_valid = 1;
	  non_default_colors = 1;
	}

      Create_Pixmap_From_Bitmap_Data (f, img, data, 
				      foreground, background,
				      non_default_colors);
      xfree (data);

      if (img->pixmap == NO_PIXMAP)

      pb = (b >> (16 - dpyinfo->blue_bits))  << dpyinfo->blue_offset;

      /* Assemble the pixel color.  */
      return pr | pg | pb;
    }
  
  for (p = ct_table[i]; p; p = p->next)
    if (p->r == r && p->g == g && p->b == b)
      break;

  if (p == NULL)

  /* Put the image into a pixmap.  */
  x_put_x_image (f, ximg, img->pixmap, width, height);
  x_destroy_x_image (ximg);

  /* X and W32 versions did it here, MAC version above.  ++kfs
     img->width = width;   
     img->height = height; */

  UNGCPRO;
  xfree (contents);
  return 1;

	  if (x_defined_color (f, SDATA (specified_bg), &color, 0))
	    {
	      png_color_16 user_bg;

	      bzero (&user_bg, sizeof user_bg);
	      user_bg.red = color.red >> PNG_BG_COLOR_SHIFT;
	      user_bg.green = color.green >> PNG_BG_COLOR_SHIFT;
	      user_bg.blue = color.blue >> PNG_BG_COLOR_SHIFT;

	      fn_png_set_background (png_ptr, &user_bg,
				     PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);
	    }
	}

	  color.pixel = FRAME_BACKGROUND_PIXEL (f);
	  x_query_color (f, &color);

	  bzero (&frame_background, sizeof frame_background);
	  frame_background.red = color.red;
	  frame_background.green = color.green;
	  frame_background.blue = color.blue;
#endif /* HAVE_X_WINDOWS */

#ifdef HAVE_NTGUI
	  COLORREF color;
	  png_color_16 frame_background;
	  color = FRAME_BACKGROUND_PIXEL (f);
#if 0 /* W32 TODO : Colormap support.  */
	  x_query_color (f, &color);
#endif
	  bzero (&frame_background, sizeof frame_background);
	  frame_background.red = 256 * GetRValue (color);
	  frame_background.green = 256 * GetGValue (color);
	  frame_background.blue = 256 * GetBValue (color);
#endif /* HAVE_NTGUI */

#ifdef MAC_OS
	  unsigned long color;
	  png_color_16 frame_background;

54920:38cb79e68369

#define COLOR_TABLE_SUPPORT 1

typedef struct x_bitmap_record Bitmap_Record;
#define GET_PIXEL(ximg, x, y) XGetPixel(ximg, x, y)
#define NO_PIXMAP None

#define RGB_PIXEL_COLOR unsigned long

#define PIX_MASK_RETAIN(f) 0
#define PIX_MASK_DRAW(f) 1

#undef COLOR_TABLE_SUPPORT

typedef struct w32_bitmap_record Bitmap_Record;
#define GET_PIXEL(ximg, x, y) GetPixel(ximg, x, y)
#define NO_PIXMAP 0

#define RGB_PIXEL_COLOR COLORREF

#define PIX_MASK_RETAIN(f) 0
#define PIX_MASK_DRAW(f) 1

#define ZPixmap 0 		/* arbitrary */
typedef struct mac_bitmap_record Bitmap_Record;

#define GET_PIXEL(ximg, x, y) XGetPixel(ximg, x, y)
#define NO_PIXMAP 0

#define RGB_PIXEL_COLOR unsigned long

#define FRAME_X_VISUAL(f) FRAME_X_DISPLAY_INFO (f)->visual
#define x_defined_color mac_defined_color

/* Return the `background' field of IMG.  If IMG doesn't have one yet,
   it is guessed heuristically.  If non-zero, XIMG is an existing
   XImage object (or device context with the image selected on W32) to
   use for the heuristic.  */

RGB_PIXEL_COLOR
image_background (img, f, ximg)
     struct image *img;
     struct frame *f;

      img->background = four_corners_best (ximg, img->width, img->height);

      if (free_ximg)
	Destroy_Image (ximg, prev);

      img->background_valid = 1;
    }

  return img->background;
}

	  img->background = background;
	  img->background_valid = 1;
	  non_default_colors = 1;
	}

      Create_Pixmap_From_Bitmap_Data (f, img, data,
				      foreground, background,
				      non_default_colors);
      xfree (data);

      if (img->pixmap == NO_PIXMAP)

      pb = (b >> (16 - dpyinfo->blue_bits))  << dpyinfo->blue_offset;

      /* Assemble the pixel color.  */
      return pr | pg | pb;
    }

  for (p = ct_table[i]; p; p = p->next)
    if (p->r == r && p->g == g && p->b == b)
      break;

  if (p == NULL)

  /* Put the image into a pixmap.  */
  x_put_x_image (f, ximg, img->pixmap, width, height);
  x_destroy_x_image (ximg);

  /* X and W32 versions did it here, MAC version above.  ++kfs
     img->width = width;
     img->height = height; */

  UNGCPRO;
  xfree (contents);
  return 1;

	  if (x_defined_color (f, SDATA (specified_bg), &color, 0))
	    {
	      png_color_16 user_bg;

	      bzero (&user_bg, sizeof user_bg);
	      user_bg.red = color.red >> 8;
	      user_bg.green = color.green >> 8;
	      user_bg.blue = color.blue >> 8;

	      fn_png_set_background (png_ptr, &user_bg,
				     PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);
	    }
	}

	  color.pixel = FRAME_BACKGROUND_PIXEL (f);
	  x_query_color (f, &color);

	  bzero (&frame_background, sizeof frame_background);
	  frame_background.red = color.red >> 8;
	  frame_background.green = color.green >> 8;
	  frame_background.blue = color.blue >> 8;
#endif /* HAVE_X_WINDOWS */

#ifdef HAVE_NTGUI
	  COLORREF color;
	  png_color_16 frame_background;
	  color = FRAME_BACKGROUND_PIXEL (f);
#if 0 /* W32 TODO : Colormap support.  */
	  x_query_color (f, &color);
#endif
	  bzero (&frame_background, sizeof frame_background);
	  frame_background.red = GetRValue (color);
	  frame_background.green = GetGValue (color);
	  frame_background.blue = GetBValue (color);
#endif /* HAVE_NTGUI */

#ifdef MAC_OS
	  unsigned long color;
	  png_color_16 frame_background;