summaryrefslogtreecommitdiff
path: root/src/image.c
Commit message (Expand)AuthorAgeFilesLines
* Handle availability of MagickMergeImageLayers and MagickExportImagePixelsChong Yidong2012-06-121-53/+48
* * image.c (imagemagick_load_image): Remove unused label.Paul Eggert2012-06-111-1/+0
* Support transparency for ImageMagick images.Chong Yidong2012-06-111-56/+57
* Add option imagemagick-types-enableGlenn Morris2012-05-311-2/+4
* Merge from trunk.Paul Eggert2012-02-241-1/+1
|\
| * Increase default image size limit; don't unlimit Gnus.Paul Eggert2012-02-141-1/+1
* | Merge from trunk.Paul Eggert2012-02-101-8/+15
|\ \ | |/
| * Small imagemagick doc fixesGlenn Morris2012-02-061-0/+1
| * imagemagick-render-type fixesGlenn Morris2012-02-061-8/+14
* | Merge from trunk.Paul Eggert2012-01-091-4/+31
|\ \ | |/
| * Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-051-1/+1
| * * src/image.c (imagemagick_error): New function. Juri Linkov2011-12-161-3/+30
* | Merge from trunk.Paul Eggert2011-12-101-3/+5
|\ \ | |/
| * * src/image.c (imagemagick_load_image): Move `MagickSetResolution' downJuri Linkov2011-11-241-1/+3
| * Spelling fixes.Paul Eggert2011-11-191-1/+1
| * Spelling fixes.Paul Eggert2011-11-191-1/+1
* | Merge from trunk.Paul Eggert2011-11-181-5/+5
|\ \ | |/
| * Fix typos.Juanma Barranquero2011-11-151-3/+3
| * Spelling fixes.Paul Eggert2011-11-141-1/+1
| * Fix typos.Juanma Barranquero2011-11-141-1/+1
* | Merge from trunk.Paul Eggert2011-10-271-1/+1
|\ \ | |/
| * src/image.c, src/w32*.c, lib-src/emacsclient.c: Silence warnings under -Wall.Juanma Barranquero2011-10-271-1/+1
* | * alloc.c (pure_bytes_used_lisp, pure_bytes_used_non_lisp):Paul Eggert2011-09-211-3/+4
|/
* Fix a compilation error with MinGW GCC 3.x in tiff_handler.Eli Zaretskii2011-09-161-2/+13
* * src/image.c (gif_load): Fix calculation of bottom and right corner.Andreas Schwab2011-09-101-2/+4
* Whitespace changes.Juanma Barranquero2011-09-091-15/+15
* src/image.c (x_bitmap_pixmap): Cast to int to avoid compiler warnings.Eli Zaretskii2011-08-301-1/+2
* * image.c (parse_image_spec): Check for nonnegative, not for positive,Paul Eggert2011-08-281-15/+15
* Merge from trunk.Paul Eggert2011-08-241-25/+29
|\
| * Fix animated gif segfault and frame clearing bug.Chong Yidong2011-08-211-25/+29
| * Merge from trunk.Paul Eggert2011-08-021-3/+7
* | Simplify previous changes.Paul Eggert2011-08-161-25/+4
* | Merge from trunk.Paul Eggert2011-08-041-3/+7
|\ \
| * | * image.c (check_image_size): Use 1024x1024 if unknown frame (Bug#9189).Paul Eggert2011-07-291-3/+7
| |/
* | Adjust in response to jan.h.d's comments.Paul Eggert2011-08-041-5/+1
* | Merge from trunk.Paul Eggert2011-07-281-3/+9
|\ \ | |/
| * * image.c (x_check_image_size) [!HAVE_X_WINDOWS]: Return 1.Paul Eggert2011-07-281-3/+9
* | * image.c: Integer and memory overflow fixes.Paul Eggert2011-07-281-20/+41
* | Use ptrdiff_t for hash table indexes.Paul Eggert2011-07-181-2/+2
* | Overflow, signedness and related fixes for images.Paul Eggert2011-07-161-82/+102
|/
* * image.c: Improve checking for integer overflow.Paul Eggert2011-07-131-52/+108
* * image.c (png_load): Don't assume height * row_bytes fits in 'int'.Paul Eggert2011-07-121-1/+2
* Merge from trunk.Paul Eggert2011-07-101-3/+1
|\
| * ProtoizeAndreas Schwab2011-07-101-3/+1
* | * image.c: Integer signedness and overflow and related fixes.Paul Eggert2011-07-091-42/+43
|/
* * image.c (cache_image): Check for size arithmetic overflow.Paul Eggert2011-06-221-0/+2
* Merge from trunk.Paul Eggert2011-06-221-0/+1
|\
| * don't leak an XBM-image-sized bufferJim Meyering2011-06-221-0/+1
* | * dispextern.h (struct face.stipple):Paul Eggert2011-06-211-16/+21
* | * image.c (xpm_scan) [HAVE_NS && !HAVE_XPM]:Paul Eggert2011-06-191-13/+3