aboutsummaryrefslogtreecommitdiffstats
path: root/src/image.c
diff options
context:
space:
mode:
authorJuanma Barranquero2011-09-09 03:06:52 +0200
committerJuanma Barranquero2011-09-09 03:06:52 +0200
commit5e617bc2b62189768814fafd1a875e89a094d3ef (patch)
treed96d22e012035d044557abf4de0b8e30b03d61b7 /src/image.c
parent9b1c252e294bed3aef0d2f2fc5d1fa9f72df9ee8 (diff)
downloademacs-5e617bc2b62189768814fafd1a875e89a094d3ef.tar.gz
emacs-5e617bc2b62189768814fafd1a875e89a094d3ef.zip
Whitespace changes.
Diffstat (limited to 'src/image.c')
-rw-r--r--src/image.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/image.c b/src/image.c
index c5dcbb32e5d..fc79174c1e2 100644
--- a/src/image.c
+++ b/src/image.c
@@ -56,7 +56,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
56#define COLOR_TABLE_SUPPORT 1 56#define COLOR_TABLE_SUPPORT 1
57 57
58typedef struct x_bitmap_record Bitmap_Record; 58typedef struct x_bitmap_record Bitmap_Record;
59#define GET_PIXEL(ximg, x, y) XGetPixel(ximg, x, y) 59#define GET_PIXEL(ximg, x, y) XGetPixel (ximg, x, y)
60#define NO_PIXMAP None 60#define NO_PIXMAP None
61 61
62#define RGB_PIXEL_COLOR unsigned long 62#define RGB_PIXEL_COLOR unsigned long
@@ -74,7 +74,7 @@ typedef struct x_bitmap_record Bitmap_Record;
74#undef COLOR_TABLE_SUPPORT 74#undef COLOR_TABLE_SUPPORT
75 75
76typedef struct w32_bitmap_record Bitmap_Record; 76typedef struct w32_bitmap_record Bitmap_Record;
77#define GET_PIXEL(ximg, x, y) GetPixel(ximg, x, y) 77#define GET_PIXEL(ximg, x, y) GetPixel (ximg, x, y)
78#define NO_PIXMAP 0 78#define NO_PIXMAP 0
79 79
80#define RGB_PIXEL_COLOR COLORREF 80#define RGB_PIXEL_COLOR COLORREF
@@ -106,7 +106,7 @@ Lisp_Object Qlibpng_version;
106 106
107typedef struct ns_bitmap_record Bitmap_Record; 107typedef struct ns_bitmap_record Bitmap_Record;
108 108
109#define GET_PIXEL(ximg, x, y) XGetPixel(ximg, x, y) 109#define GET_PIXEL(ximg, x, y) XGetPixel (ximg, x, y)
110#define NO_PIXMAP 0 110#define NO_PIXMAP 0
111 111
112#define RGB_PIXEL_COLOR unsigned long 112#define RGB_PIXEL_COLOR unsigned long
@@ -115,7 +115,7 @@ typedef struct ns_bitmap_record Bitmap_Record;
115#define PIX_MASK_RETAIN 0 115#define PIX_MASK_RETAIN 0
116#define PIX_MASK_DRAW 1 116#define PIX_MASK_DRAW 1
117 117
118#define FRAME_X_VISUAL FRAME_NS_DISPLAY_INFO(f)->visual 118#define FRAME_X_VISUAL FRAME_NS_DISPLAY_INFO (f)->visual
119#define x_defined_color(f, name, color_def, alloc) \ 119#define x_defined_color(f, name, color_def, alloc) \
120 ns_defined_color (f, name, color_def, alloc, 0) 120 ns_defined_color (f, name, color_def, alloc, 0)
121#define FRAME_X_SCREEN(f) 0 121#define FRAME_X_SCREEN(f) 0
@@ -1106,8 +1106,8 @@ image_ascent (struct image *img, struct face *face, struct glyph_slice *slice)
1106 because a typical font is `top-heavy' (due to the presence 1106 because a typical font is `top-heavy' (due to the presence
1107 uppercase letters), so the image placement should err towards 1107 uppercase letters), so the image placement should err towards
1108 being top-heavy too. It also just generally looks better. */ 1108 being top-heavy too. It also just generally looks better. */
1109 ascent = (height + FONT_BASE(face->font) 1109 ascent = (height + FONT_BASE (face->font)
1110 - FONT_DESCENT(face->font) + 1) / 2; 1110 - FONT_DESCENT (face->font) + 1) / 2;
1111#endif /* HAVE_NTGUI */ 1111#endif /* HAVE_NTGUI */
1112 } 1112 }
1113 else 1113 else
@@ -5545,7 +5545,7 @@ init_png_functions (Lisp_Object libraries)
5545/* In libpng version 1.5, the jmpbuf member is hidden. (Bug#7908) */ 5545/* In libpng version 1.5, the jmpbuf member is hidden. (Bug#7908) */
5546#define PNG_LONGJMP(ptr) (fn_png_longjmp ((ptr), 1)) 5546#define PNG_LONGJMP(ptr) (fn_png_longjmp ((ptr), 1))
5547#define PNG_JMPBUF(ptr) \ 5547#define PNG_JMPBUF(ptr) \
5548 (*fn_png_set_longjmp_fn((ptr), longjmp, sizeof (jmp_buf))) 5548 (*fn_png_set_longjmp_fn ((ptr), longjmp, sizeof (jmp_buf)))
5549#endif 5549#endif
5550 5550
5551/* Error and warning handlers installed when the PNG library 5551/* Error and warning handlers installed when the PNG library
@@ -5966,9 +5966,9 @@ png_load (struct frame *f, struct image *img)
5966static int 5966static int
5967png_load (struct frame *f, struct image *img) 5967png_load (struct frame *f, struct image *img)
5968{ 5968{
5969 return ns_load_image(f, img, 5969 return ns_load_image (f, img,
5970 image_spec_value (img->spec, QCfile, NULL), 5970 image_spec_value (img->spec, QCfile, NULL),
5971 image_spec_value (img->spec, QCdata, NULL)); 5971 image_spec_value (img->spec, QCdata, NULL));
5972} 5972}
5973#endif /* HAVE_NS */ 5973#endif /* HAVE_NS */
5974 5974
@@ -6115,7 +6115,7 @@ jpeg_resync_to_restart_wrapper (j_decompress_ptr cinfo, int desired)
6115 6115
6116#else 6116#else
6117 6117
6118#define fn_jpeg_CreateDecompress(a,b,c) jpeg_create_decompress(a) 6118#define fn_jpeg_CreateDecompress(a,b,c) jpeg_create_decompress (a)
6119#define fn_jpeg_start_decompress jpeg_start_decompress 6119#define fn_jpeg_start_decompress jpeg_start_decompress
6120#define fn_jpeg_finish_decompress jpeg_finish_decompress 6120#define fn_jpeg_finish_decompress jpeg_finish_decompress
6121#define fn_jpeg_destroy_decompress jpeg_destroy_decompress 6121#define fn_jpeg_destroy_decompress jpeg_destroy_decompress
@@ -7623,7 +7623,7 @@ imagemagick_load_image (struct frame *f, struct image *img,
7623 return 0; 7623 return 0;
7624 } 7624 }
7625 7625
7626 if (MagickGetNumberImages(ping_wand) > 1) 7626 if (MagickGetNumberImages (ping_wand) > 1)
7627 img->lisp_data = 7627 img->lisp_data =
7628 Fcons (Qcount, 7628 Fcons (Qcount,
7629 Fcons (make_number (MagickGetNumberImages (ping_wand)), 7629 Fcons (make_number (MagickGetNumberImages (ping_wand)),
@@ -7648,7 +7648,7 @@ imagemagick_load_image (struct frame *f, struct image *img,
7648 if (im_image == NULL) 7648 if (im_image == NULL)
7649 goto imagemagick_no_wand; 7649 goto imagemagick_no_wand;
7650 image_wand = NewMagickWandFromImage (im_image); 7650 image_wand = NewMagickWandFromImage (im_image);
7651 DestroyImage(im_image); 7651 DestroyImage (im_image);
7652 } 7652 }
7653 else 7653 else
7654 { 7654 {
@@ -7769,7 +7769,7 @@ imagemagick_load_image (struct frame *f, struct image *img,
7769#ifdef COLOR_TABLE_SUPPORT 7769#ifdef COLOR_TABLE_SUPPORT
7770 free_color_table (); 7770 free_color_table ();
7771#endif 7771#endif
7772 image_error("Imagemagick X bitmap allocation failure", Qnil, Qnil); 7772 image_error ("Imagemagick X bitmap allocation failure", Qnil, Qnil);
7773 goto imagemagick_error; 7773 goto imagemagick_error;
7774 } 7774 }
7775 7775
@@ -7823,7 +7823,7 @@ imagemagick_load_image (struct frame *f, struct image *img,
7823#ifdef COLOR_TABLE_SUPPORT 7823#ifdef COLOR_TABLE_SUPPORT
7824 free_color_table (); 7824 free_color_table ();
7825#endif 7825#endif
7826 image_error("Imagemagick X bitmap allocation failure", Qnil, Qnil); 7826 image_error ("Imagemagick X bitmap allocation failure", Qnil, Qnil);
7827 goto imagemagick_error; 7827 goto imagemagick_error;
7828 } 7828 }
7829 7829