From 064032d03080c9f64ce5196a6f2664acdbeb95e4 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 3 May 2008 10:11:22 +0000 Subject: (Ffile_attributes): Don't allow the device number become negative. --- src/ChangeLog | 5 +++++ src/dired.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 0849e9ee4b7..8efef814555 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-05-03 Eli Zaretskii + + * dired.c (Ffile_attributes): Don't allow the device number become + negative. + 2008-05-02 YAMAMOTO Mitsuharu * config.in: Regenerate. diff --git a/src/dired.c b/src/dired.c index 31b7e19ddae..7936e04a54e 100644 --- a/src/dired.c +++ b/src/dired.c @@ -1048,8 +1048,11 @@ Elements of the attribute list are: /* But keep the most common cases as integers. */ values[10] = make_number (ino); - /* Likewise for device. */ - if (FIXNUM_OVERFLOW_P (s.st_dev)) + /* Likewise for device, but don't let it become negative. We used + to use FIXNUM_OVERFLOW_P here, but that won't catch large + positive numbers such as 0xFFEEDDCC. */ + if ((EMACS_INT)s.st_dev < 0 + || (EMACS_INT)s.st_dev > MOST_POSITIVE_FIXNUM) values[11] = Fcons (make_number (s.st_dev >> 16), make_number (s.st_dev & 0xffff)); else -- cgit v1.2.1 From e0e02da34cd8081fc3704d4b882213cabc55a68e Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 3 May 2008 19:04:09 +0000 Subject: Correct authorship of patch from Red Hat. --- src/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 8efef814555..c0e2fe08390 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -43,7 +43,7 @@ (USE_MAC_IMAGE_IO, LIBS_IMAGE) [HAVE_CARBON]: New defines. (LIBS_CARBON) [HAVE_CARBON]: Use LIBS_IMAGE. -2008-04-25 Chip Coldwell +2008-04-25 Dennis Gilmore (tiny change) * m/sparc.h: Additional redefinitions for GNU/Linux. -- cgit v1.2.1 From 4c756529297924c325f207cdb929056458945ae3 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Sun, 4 May 2008 00:31:59 +0000 Subject: [USE_MAC_IMAGE_IO] (image_load_image_io): Create bitmap context in native byte order. --- src/image.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/image.c b/src/image.c index eb1cae853f1..9981b21365a 100644 --- a/src/image.c +++ b/src/image.c @@ -2681,7 +2681,11 @@ image_load_image_io (f, img, type) context = CGBitmapContextCreate (ximg->data, ximg->width, ximg->height, 8, ximg->bytes_per_line, mac_cg_color_space_rgb, - kCGImageAlphaNoneSkipFirst); + kCGImageAlphaNoneSkipFirst +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040 + | kCGBitmapByteOrder32Host +#endif + ); if (has_alpha_p) { Lisp_Object specified_bg; -- cgit v1.2.1 From 0e9378b39886647401ff85c0df65e95a345a4e95 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Sun, 4 May 2008 00:32:24 +0000 Subject: (XDrawLine, XCreatePixmapFromBitmapData) [USE_MAC_IMAGE_IO]: Create bitmap context in native byte order. --- src/ChangeLog | 8 ++++++++ src/macterm.c | 12 ++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index c0e2fe08390..f5b038846e9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2008-05-04 YAMAMOTO Mitsuharu + + * image.c [USE_MAC_IMAGE_IO] (image_load_image_io): + Create bitmap context in native byte order. + + * macterm.c (XDrawLine, XCreatePixmapFromBitmapData) [USE_MAC_IMAGE_IO]: + Create bitmap context in native byte order. + 2008-05-03 Eli Zaretskii * dired.c (Ffile_attributes): Don't allow the device number become diff --git a/src/macterm.c b/src/macterm.c index 0023c8988a0..8886cdb565b 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -415,7 +415,11 @@ XDrawLine (display, p, gc, x1, y1, x2, y2) if (ximg->bits_per_pixel == 32) { color_space = mac_cg_color_space_rgb; - alpha_info = kCGImageAlphaNoneSkipFirst; + alpha_info = (kCGImageAlphaNoneSkipFirst +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040 + | kCGBitmapByteOrder32Host +#endif + ); } else { @@ -743,7 +747,11 @@ XCreatePixmapFromBitmapData (display, w, data, width, height, fg, bg, depth) context = CGBitmapContextCreate (pixmap->data, width, height, 8, pixmap->bytes_per_line, mac_cg_color_space_rgb, - kCGImageAlphaNoneSkipFirst); + kCGImageAlphaNoneSkipFirst +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040 + | kCGBitmapByteOrder32Host +#endif + ); CG_SET_FILL_COLOR (context, fg); CGContextFillRect (context, CGRectMake (0, 0, width, height)); -- cgit v1.2.1