summaryrefslogtreecommitdiff
path: root/src/image.c
Commit message (Collapse)AuthorAgeFilesLines
* ProtoizeAndreas Schwab2011-07-101-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * src/buffer.c (mmap_init, mmap_find, mmap_free_1, mmap_enlarge) (mmap_set_vars, mmap_alloc, mmap_free, mmap_realloc): Protoize. * src/data.c (fmod): Likewise. * src/dispnew.c (swap_glyphs_in_rows): Likewise. * src/emacs.c (memory_warning_signal): Likewise. * src/floatfns.c (float_error): Likewise. * src/font.c (check_gstring, check_otf_features, otf_tag_symbol) (otf_open, font_otf_capability, generate_otf_features) (font_otf_DeviceTable, font_otf_ValueRecord, font_otf_Anchor): Likewise. * src/image.c (pbm_read_file): Likewise. * src/indent.c (string_display_width): Likewise. * src/intervals.c (check_for_interval, search_for_interval) (inc_interval_count, count_intervals, root_interval) (adjust_intervals_for_insertion, make_new_interval): Likewise. * src/lread.c (defalias): Likewise. * src/regex.c (set_image_of_range_1, set_image_of_range) (regex_grow_registers): Likewise. * src/sysdep.c (strerror): Likewise. * src/termcap.c (valid_filename_p, tprint, main): Likewise. * src/tparam.c (main): Likewise. * src/unexhp9k800.c (run_time_remap, save_data_space) (update_file_ptrs, read_header, write_header, calculate_checksum) (copy_file, copy_rest, display_header): Likewise. * src/widget.c (mark_shell_size_user_specified, create_frame_gcs): Likewise. * src/xdisp.c (check_it): Likewise. * src/xfaces.c (register_color, unregister_color, unregister_colors): Likewise. * src/xfns.c (print_fontset_result): Likewise. * src/xrdb.c (member, fatal, main): Likewise.
* * 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
| | | | | | | | * image.c (xbm_load): Free the image buffer after using it.
* | * dispextern.h (struct face.stipple):Paul Eggert2011-06-211-16/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * image.c (x_bitmap_height, x_bitmap_width, x_bitmap_pixmap) (x_bitmap_mask, x_allocate_bitmap_record) (x_create_bitmap_from_data, x_create_bitmap_from_file) (x_destroy_bitmap, x_destroy_all_bitmaps, x_create_bitmap_mask) (x_create_bitmap_from_xpm_data): * nsterm.h (struct ns_display_info.bitmaps_size, .bitmaps_last): * w32term.h (struct w32_display_info.icon_bitmap_id, .bitmaps_size) (.bitmaps_last): * xfaces.c (load_pixmap): * xterm.c (x_bitmap_icon, x_wm_set_icon_pixmap): * xterm.h (struct x_display_info.icon_bitmap_id, .bitmaps_size) (.bitmaps_last, struct x_output.icon_bitmap): Use ptrdiff_t, not int, for bitmap indexes. (x_allocate_bitmap_record): Check for size overflow. * dispextern.h, lisp.h: Adjust to API changes elsewhere.
* | * image.c (xpm_scan) [HAVE_NS && !HAVE_XPM]:Paul Eggert2011-06-191-13/+3
| | | | | | | | Don't assume string length fits in int.
* | * image.c (xbm_image_p): Don't assume stated width and height fit in int.Paul Eggert2011-06-181-2/+2
|/
* Handle gif subimage animation delay correctly.Chong Yidong2011-06-111-83/+62
| | | | | | | | | | | * lisp/image.el (image-animated-p): Return animation delay in seconds. Avoid bit manipulation in Lisp; use `delay' entry in the metadata. (image-animate-timeout): Remove DELAY argument. Use image-animated-p to get animation delay for each frame. (image-animate): Caller changed. * src/image.c (gif_load): Add animation frame delay to the metadata. (syms_of_image): Use DEFSYM. New symbol `delay'.
* * src/image.c (imagemagick_load_image): Fix type mismatch.Andreas Schwab2011-06-111-3/+3
| | | | (Fimagemagick_types): Likewise.
* Cruft removal in struct image.Chong Yidong2011-06-101-32/+29
| | | | | | | | | | * src/dispextern.h (struct image): Replace data member, whose int_val and ptr_val fields were not used by anything, with a single lisp_val object. * src/image.c (Fimage_metadata, make_image, mark_image, tiff_load) (gif_clear_image, gif_load, imagemagick_load_image) (gs_clear_image, gs_load): Callers changed.
* * image.c (PixelGetMagickColor): Declare if ImageMagick headers don't.Paul Eggert2011-06-101-0/+8
|
* Make identifiers static if they are not used in other modules.Paul Eggert2011-06-101-2/+2
| | | | | | | | * data.c (Qcompiled_function, Qframe, Qvector): * image.c (QimageMagick, Qsvg): * minibuf.c (Qmetadata): * window.c (resize_window_check, resize_root_window): Now static. * window.h (resize_window_check, resize_root_window): Remove decls.
* * image.c (imagemagick_load_image): Don't use garbage pointer image_wand.Paul Eggert2011-06-101-11/+7
|
* * image.c: Fix minor problems reported by GCC 4.6.0.Paul Eggert2011-06-101-21/+16
| | | | | | | | | | (gif_load, svg_load_image): Rename locals to avoid shadowing. (imagemagick_load_image): Fix pointer signedness problem by changing last arg from unsigned char * to char *. All uses changed. Also, fix a local for similar reasons. Remove unused locals. Remove locals to avoid shadowing. (fn_rsvg_handle_free): Remove; unused. (svg_load, svg_load_image): Fix pointer signedness problem.
* * image.c (gif_load): Fix omitted cast error introduced by 2011-06-06 change.Chong Yidong2011-06-101-1/+1
|
* * src/image.c (gif_load): Implement gif89a spec "no disposal" method.Chong Yidong2011-06-061-107/+125
|
* * image.c: Use ptrdiff_t, not int, for sizes.Paul Eggert2011-06-051-10/+9
| | | | | | | (slurp_file): Switch from int to ptrdiff_t. All uses changed. (slurp_file): Check that file size fits in both size_t (for malloc) and ptrdiff_t (for sanity and safety).
* Remove arbitrary limit of 2**31 entries in hash tables.Paul Eggert2011-05-301-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * category.c (hash_get_category_set): Use 'EMACS_UINT' and 'EMACS_INT' for hashes and hash indexes, instead of 'unsigned' and 'int'. * ccl.c (ccl_driver): Likewise. * charset.c (Fdefine_charset_internal): Likewise. * charset.h (struct charset.hash_index): Likewise. * composite.c (get_composition_id, gstring_lookup_cache): (composition_gstring_put_cache): Likewise. * composite.h (struct composition.hash_index): Likewise. * dispextern.h (struct image.hash): Likewise. * fns.c (next_almost_prime, larger_vector, cmpfn_eql): (cmpfn_equal, cmpfn_user_defined, hashfn_eq, hashfn_eql): (hashfn_equal, hashfn_user_defined, make_hash_table): (maybe_resize_hash_table, hash_lookup, hash_put): (hash_remove_from_table, hash_clear, sweep_weak_table, SXHASH_COMBINE): (sxhash_string, sxhash_list, sxhash_vector, sxhash_bool_vector): (Fsxhash, Fgethash, Fputhash, Fmaphash): Likewise. * image.c (make_image, search_image_cache, lookup_image): (xpm_put_color_table_h): Likewise. * lisp.h (struct Lisp_Hash_Table): Likewise, for 'count', 'cmpfn', and 'hashfn' members. * minibuf.c (Ftry_completion, Fall_completions, Ftest_completion): Likewise. * print.c (print): Likewise. * alloc.c (allocate_vectorlike): Check for overflow in vector size calculations. * ccl.c (ccl_driver): Check for overflow when converting EMACS_INT to int. * fns.c, image.c: Remove unnecessary static decls that would otherwise need to be updated by these changes. * fns.c (make_hash_table, maybe_resize_hash_table): Check for integer overflow with large hash tables. (make_hash_table, maybe_resize_hash_table, Fmake_hash_table): Prefer the faster XFLOAT_DATA to XFLOATINT where either will do. (SXHASH_REDUCE): New macro. (sxhash_string, sxhash_list, sxhash_vector, sxhash_bool_vector): Use it instead of discarding useful hash info with large hash values. (sxhash_float): New function. (sxhash): Use it. No more need for "& INTMASK" due to above changes. * lisp.h (FIXNUM_BITS): New macro, useful for SXHASH_REDUCE etc. (MOST_NEGATIVE_FIXNUM, MOST_POSITIVE_FIXNUM, INTMASK): Rewrite to use FIXNUM_BITS, as this simplifies things. (next_almost_prime, larger_vector, sxhash, hash_lookup, hash_put): Adjust signatures to match updated version of code. (consing_since_gc): Now EMACS_INT, since a single hash table can use more than INT_MAX bytes.
* Merge from trunk.Paul Eggert2011-05-291-52/+42
|\
| * Doc fixes for imagemagick support code.Chong Yidong2011-05-291-52/+42
| | | | | | | | | | | | | | | | * lisp/image.el (imagemagick-types-inhibit) (imagemagick-register-types): Doc fix. * src/image.c: Various fixes to ImageMagick code comments. (Fimagemagick_types): Doc fix.
* | [ChangeLog]Paul Eggert2011-05-281-1/+1
|/ | | | | | | | | | | | | | | | | | | | Use 'inline', not 'INLINE'. * configure.in, autogen/config.in (INLINE): Remove. [lib-src/ChangeLog] Use 'inline', not 'INLINE'. * etags.c (hash): Now inline unconditionally. * make-docfile.c (put_char): inline, not INLINE. [nt/ChangeLog] Use 'inline', not 'INLINE'. * config.nt (INLINE): Remove. [src/ChangeLog] Use 'inline', not 'INLINE'. * alloc.c, fontset.c (INLINE): Remove. * alloc.c, bidi.c, charset.c, coding.c, dispnew.c, fns.c, image.c: * intervals.c, keyboard.c, process.c, syntax.c, textprop.c, w32term.c: * xdisp.c, xfaces.c, xterm.c: Replace all uses of INLINE with inline. * gmalloc.c (register_heapinfo): Use inline unconditionally. * lisp.h (LISP_MAKE_RVALUE): Use inline, not __inline__.
* * dispextern.h (struct image): Don't assume time_t <= unsigned long.Paul Eggert2011-05-121-1/+1
| | | | * image.c (clear_image_cache): Likewise.
* src/image.c (Finit_image_library): Return t for built-in image types (bug#8640).Juanma Barranquero2011-05-101-4/+6
|
* Merge from mainline.Paul Eggert2011-05-051-1/+1
|\
| * src/gnutls.c, src/image.c: Make function pointers static.Juanma Barranquero2011-05-061-1/+1
| |
* | * image.c (Finit_image_library) [!HAVE_NTGUI]: Omit unused local.Paul Eggert2011-05-051-3/+1
|/
* Fix previous change: the library cache is defined in w32.c.Juanma Barranquero2011-05-041-1/+6
| | | | | * image.c (CACHE_IMAGE_TYPE) [!HAVE_NTGUI]: Define to noop. (Finit_image_library): Wrap Vlibrary_cache on "#ifdef HAVE_NTGUI".
* Implement dynamic loading of GnuTLS on Windows.Juanma Barranquero2011-05-041-38/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/term/w32-win.el (dynamic-library-alist): Add `gnutls'. * nt/INSTALL: Clarify GnuTLS support. * src/callproc.c, src/emacs.c: Include lisp.h before src/w32.h, not after. * src/gnutls.c (Qgnutls_dll): Define. (DEF_GNUTLS_FN, LOAD_GNUTLS_FN): New macros. (gnutls_*): Declare function pointers. (init_gnutls_functions): New function to initialize function pointers. (emacs_gnutls_handshake, Fgnutls_error_string, Fgnutls_deinit) (emacs_gnutls_global_init, Fgnutls_bye): Use function pointers. (emacs_gnutls_record_check_pending, emacs_gnutls_transport_set_errno): Wrappers for gnutls_record_check_pending and gnutls_transport_set_errno. (emacs_gnutls_write, emacs_gnutls_read) (emacs_gnutls_handle_error, Fgnutls_error_fatalp) (Fgnutls_available_p): New function. (Fgnutls_boot): Call Fgnutls_available_p. Use function pointers. (syms_of_gnutls) <Qgnutls_dll>: Initialize and staticpro it. (syms_of_gnutls) <Sgnutls_available_p>: defsubr it. * src/gnutls.h (GNUTLS_EMACS_ERROR_NOT_LOADED): New macro. (emacs_gnutls_write, emacs_gnutls_read): Mark as extern. (emacs_gnutls_record_check_pending, emacs_gnutls_transport_set_errno): Declare. * src/w32.c (QCloaded_from, Vlibrary_cache): Define. (w32_delayed_load): Move from image.c. When loading a library, record its filename in the :loaded-from property of the library id. (globals_of_w32) <QCloaded_from, Vlibrary_cache>: Initialize and staticpro them. (emacs_gnutls_pull, emacs_gnutls_push): Call emacs_gnutls_* functions. * src/image.c: Include w32.h. (Vimage_type_cache): Delete. (syms_of_image) <Vimage_type_cache>: Don't initialize and staticpro it. (CACHE_IMAGE_TYPE, Finit_image_library): Use Vlibrary_cache instead. (w32_delayed_load): Move to w32.c. * src/process.c: Include lisp.h before src/w32.h, not after. (wait_reading_process_output): Call emacs_gnutls_record_check_pending instead of gnutls_record_check_pending. * src/w32.h (VlibraryCache, QCloaded_from, w32_delayed_load): Declare.
* * lisp.h: (XVECTOR_SIZE): Remove. All uses replaced with ASIZE.Paul Eggert2011-04-251-2/+2
| | | | | (ASIZE): Now contains previous implementation of XVECTOR_SIZE instead of invoking XVECTOR_SIZE.
* lisp.h: Fix a problem with aliasing and vector headers.Paul Eggert2011-04-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GCC 4.6.0 optimizes based on type-based alias analysis. For example, if b is of type struct buffer * and v of type struct Lisp_Vector *, then gcc -O2 was incorrectly assuming that &b->size != &v->size, and therefore "v->size = 1; b->size = 2; return v->size;" must therefore return 1. This assumption is incorrect for Emacs, since it type-puns struct Lisp_Vector * with many other types. To fix this problem, this patch adds a new type struct vector_header that documents the constraints on layout of vectors and pseudovectors, and helps optimizing compilers not get fooled by Emacs's type punning. It also adds the macros XSETTYPED_PVECTYPE XSETTYPED_PSEUDOVECTOR, TYPED_PSEUDOVECTORP, for similar reasons. * lisp.h (XVECTOR_SIZE): New convenience macro. All previous uses of XVECTOR (foo)->size replaced to use this macro, to avoid the hassle of writing XVECTOR (foo)->header.size. (XVECTOR_HEADER_SIZE): New macro, for use in XSETPSEUDOVECTOR. (XSETTYPED_PVECTYPE): New macro, specifying the name of the size member. (XSETPVECTYPE): Rewrite in terms of new macro. (XSETPVECTYPESIZE): New macro, specifying both type and size. This is a bit clearer, and further avoids the possibility of undesirable aliasing. (XSETTYPED_PSEUDOVECTOR): New macro, specifying the size. (XSETPSEUDOVECTOR): Rewrite in terms of XSETTYPED_PSEUDOVECTOR and XVECTOR_HEADER_SIZE. (XSETSUBR): Rewrite in terms of XSETTYPED_PSEUDOVECTOR and XSIZE, since Lisp_Subr is a special case (no "next" field). (ASIZE): Rewrite in terms of XVECTOR_SIZE. (struct vector_header): New type. (TYPED_PSEUDOVECTORP): New macro, also specifying the C type of the object, to help avoid aliasing. (PSEUDOVECTORP): Rewrite in terms of TYPED_PSEUDOVECTORP. (SUBRP): Likewise, since Lisp_Subr is a special case. * lisp.h (struct Lisp_Vector, struct Lisp_Char_Table): (struct Lisp_Sub_Char_Table, struct Lisp_Bool_Vector): (struct Lisp_Hash_Table): Combine first two members into a single struct vector_header member. All uses of "size" and "next" members changed to be "header.size" and "header.next". * buffer.h (struct buffer): Likewise. * font.h (struct font_spec, struct font_entity, struct font): Likewise. * frame.h (struct frame): Likewise. * process.h (struct Lisp_Process): Likewise. * termhooks.h (struct terminal): Likewise. * window.c (struct save_window_data, struct saved_window): Likewise. * window.h (struct window): Likewise. * alloc.c (allocate_buffer, Fmake_bool_vector, allocate_pseudovector): Use XSETPVECTYPESIZE, not XSETPVECTYPE, to avoid aliasing problems. * buffer.c (init_buffer_once): Likewise. * lread.c (defsubr): Use XSETTYPED_PVECTYPE, since Lisp_Subr is a special case. * process.c (Fformat_network_address): Use local var for size, for brevity.
* * lisp.h (INFUN): Remove. Suggested by Dan Nicolaescu inPaul Eggert2011-04-141-1/+1
| | | | | <http://lists.gnu.org/archive/html/emacs-devel/2011-04/msg00393.html>. All uses spelled out.
* Undo the DEFUN->DEFUE change.Paul Eggert2011-04-131-3/+3
|
* * image.c: Make symbols static if they're not exported.Paul Eggert2011-04-131-4/+4
| | | | | | | * dispextern.h (x_create_bitmap_from_xpm_data): Do not declare if USE_GTK. * image.c (x_create_bitmap_from_xpm_data): Do not define if USE_GTK. (xpm_color_cache, ct_table, ct_colors_allocated): Now static.
* Declare Lisp_Object Q* variables to be 'static' if not exproted.Paul Eggert2011-04-101-13/+17
| | | | | | | | | | | | | | | | | This makes it easier for human readers (and static analyzers) to see whether these variables are used from other modules. * alloc.c, buffer.c, bytecode.c, callint.c, casetab.c, category.c: * ccl.c, character.c, charset.c, cmds.c, coding.c, composite.c: * data.c, dbusbind.c, dired.c, editfns.c, eval.c, fileio.c, fns.c: * font.c, frame.c, fringe.c, ftfont.c, image.c, keyboard.c, keymap.c: * lread.c, macros.c, minibuf.c, print.c, process.c, search.c: * sound.c, syntax.c, textprop.c, window.c, xdisp.c, xfaces.c, xfns.c: * xmenu.c, xselect.c: Declare Q* vars static if they are not used in other modules. * ccl.h, character.h, charset.h, coding.h, composite.h, font.h: * frame.h, intervals.h, keyboard.h, lisp.h, process.h, syntax.h: Remove decls of unexported vars. * keyboard.h (EVENT_HEAD_UNMODIFIED): Remove now-unused macro.
* Make Emacs functions such as Fatom 'static' by default.Paul Eggert2011-04-101-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it easier for human readers (and static analyzers) to see whether these functions can be called from other modules. DEFUN now defines a static function. To make the function external so that it can be used in other C modules, use the new macro DEFUE. * lisp.h (DEFINE_FUNC): New macro, with the old contents of DEFUN. (DEFUN): Rewrite in terms of DEFINE_FUNC. It now generates a static function definition. Use DEFUE if you want an extern one. (DEFUE, INFUN): New macros. (Funibyte_char_to_multibyte, Fsyntax_table_p, Finit_image_library): (Feval_region, Fbacktrace, Ffetch_bytecode, Fswitch_to_buffer): (Ffile_executable_p, Fmake_symbolic_link, Fcommand_execute): (Fget_process, Fdocumentation_property, Fbyte_code, Ffile_attributes): Remove decls, since these functions are now static. (Funintern, Fget_internal_run_time): New decls, since these functions were already external. * alloc.c, buffer.c, callint.c, callproc.c, casefiddle.c, casetab.c: * ccl.c, character.c, chartab.c, cmds.c, coding.c, data.c, dispnew.c: * doc.c, editfns.c, emacs.c, eval.c, fileio.c, filelock.c, floatfns.c: * fns.c, font.c, fontset.c, frame.c, image.c, indent.c: * keyboard.c, keymap.c, lread.c: * macros.c, marker.c, menu.c, minibuf.c, print.c, process.c, search.c: * syntax.c, term.c, terminal.c, textprop.c, undo.c: * window.c, xdisp.c, xfaces.c, xfns.c, xmenu.c, xsettings.c: Mark functions with DEFUE instead of DEFUN, if they are used in other modules. * buffer.c (Fset_buffer_major_mode, Fdelete_overlay): New forward decls for now-static functions. * buffer.h (Fdelete_overlay): Remove decl. * callproc.c (Fgetenv_internal): Mark as internal. * composite.c (Fremove_list_of_text_properties): Remove decl. (Fcomposition_get_gstring): New forward static decl. * composite.h (Fcomposite_get_gstring): Remove decl. * dired.c (Ffile_attributes): New forward static decl. * doc.c (Fdocumntation_property): New forward static decl. * eval.c (Ffetch_bytecode): New forward static decl. (Funintern): Remove extern decl; now in .h file where it belongs. * fileio.c (Fmake_symbolic_link): New forward static decl. * image.c (Finit_image_library): New forward static decl. * insdel.c (Fcombine_after_change_execute): Make forward decl static. * intervals.h (Fprevious_property_change): (Fremove_list_of_text_properties): Remove decls. * keyboard.c (Fthis_command_keys): Remove decl. (Fcommand_execute): New forward static decl. * keymap.c (Flookup_key): New forward static decl. (Fcopy_keymap): Now static. * keymap.h (Flookup_key): Remove decl. * process.c (Fget_process): New forward static decl. (Fprocess_datagram_address): Mark as internal. * syntax.c (Fsyntax_table_p): New forward static decl. (skip_chars): Remove duplicate decl. * textprop.c (Fprevious_property_change): New forward static decl. * window.c (Fset_window_fringes, Fset_window_scroll_bars): Now internal. (Fset_window_margins, Fset_window_vscroll): New forward static decls. * window.h (Fset_window_vscroll, Fset_window_margins): Remove decls.
* Cleanups to the ImageMagick code and docstrings.Chong Yidong2011-04-091-37/+27
| | | | | | | | | | | | | * lisp/image-mode.el (image-toggle-display-image): Signal an error if not in Image mode. (image-transform-mode, image-transform-resize) (image-transform-set-rotation): Doc fix. (image-transform-set-resize): Deleted. (image-transform-set-scale, image-transform-fit-to-height) (image-transform-fit-to-width): Handle image-toggle-display-image and image-transform-resize directly. * src/image.c (Fimagemagick_types): Doc fix, and comment cleanup.
* * image.c (tiff_error_handler, tiff_warning_handler): Mark asPaul Eggert2011-04-051-2/+6
| | | | | | printf-like functions. (tiff_load): Add casts to remove these marks before passing them to system-supplied API.
* * image.c (xbm_load): Use parse_p, for gcc -Werror=unused-but-set-variable.Paul Eggert2011-04-011-0/+1
|
* * image.c (lookup_image): Remove var that is set but not used.Paul Eggert2011-04-011-3/+0
|
* Merge from trunkStefan Monnier2011-03-311-4/+3
|\
| * Merge from atest branch.Paul Eggert2011-03-271-3/+3
| |\
| | * * image.c (tiff_load): Fix off-by-one image count (Bug#8336).Paul Eggert2011-03-241-3/+3
| | |
| * | nt/*.c, src/*.c: Remove unused variables.Juanma Barranquero2011-03-251-1/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nt/addpm.c (main): Remove unused variable `retval'. * nt/preprep.c (main): Remove unused variable `ptr'. * src/dispextern.h (glyph_matric): Use #if GLYPH_DEBUG, not #ifdef. * src/fileio.c (check_executable) [DOS_NT]: Remove unused variables `len' and `suffix'. (Fset_file_selinux_context) [HAVE_LIBSELINUX]: Move here declaration of variables specific to SELinux and computation of `encoded_absname'. * src/image.c (XPutPixel): Remove unused variable `height'. * src/keyboard.c (make_lispy_event): Remove unused variable `hpos'. * src/unexw32.c (get_section_info): Remove unused variable `section'. * src/w32.c (stat): Remove unused variables `drive_root' and `devtype'. (system_process_attributes): Remove unused variable `sess'. (sys_read): Remove unused variable `err'. * src/w32fns.c (top): Wrap variables with #if GLYPH_DEBUG, not #ifdef. (w32_wnd_proc): Remove unused variable `isdead'. (unwind_create_frame): Use #if GLYPH_DEBUG, not #ifdef. (Fx_server_max_request_size): Remove unused variable `dpyinfo'. (x_create_tip_frame): Remove unused variable `tem'. * src/w32inevt.c (w32_console_read_socket): Remove unused variable `no_events'. * src/w32term.c (x_draw_composite_glyph_string_foreground): Remove unused variable `width'.
* | Merge from trunkStefan Monnier2011-03-211-33/+31
|\ \ | |/
| * * image.c (my_png_error, my_error_exit): Mark with NO_RETURN.Paul Eggert2011-03-131-0/+2
| |
| * * image.c (four_corners_best): Mark locals as initialized.Paul Eggert2011-03-121-3/+3
| | | | | | | | | | (gif_load): Initialize transparent_p to zero (Bug#8238). Mark another local as initialized.
| * * image.c: (clear_image_cache, xbm_read_bitmap_data, x_detect_edges):Paul Eggert2011-03-111-18/+18
| | | | | | | | (jpeg_load, gif_load): Rename locals to avoid shadowing.
| * * image.c (gif_load): Fix pointer signedness.Paul Eggert2011-03-111-1/+1
| |
| * * image.c (x_edge_detection): Remove unnecessary cast thatPaul Eggert2011-03-101-1/+1
| | | | | | | | gcc -Wbad-function-cast diagnoses.
| * * image.c (xpm_load): Redo to avoid "discards qualifiers" gcc warning.Paul Eggert2011-03-101-4/+5
| |
View Lorry Controller Status