From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: David PONCE Newsgroups: gmane.emacs.devel Subject: Re: Consolidation of image support in new image.c file. Date: Fri, 12 Mar 2004 11:46:57 +0100 (CET) Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <1994019.1079088417309.JavaMail.www@wwinf1003> Reply-To: david.ponce@wanadoo.fr NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1079110848 30719 80.91.224.253 (12 Mar 2004 17:00:48 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 12 Mar 2004 17:00:48 +0000 (UTC) Cc: emacs-devel Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Fri Mar 12 18:00:14 2004 Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1B1q17-0002Di-00 for ; Fri, 12 Mar 2004 18:00:13 +0100 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 1B1q17-0001qL-00 for ; Fri, 12 Mar 2004 18:00:13 +0100 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.30) id 1B1km3-00008h-CV for emacs-devel@quimby.gnus.org; Fri, 12 Mar 2004 06:24:19 -0500 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30) id 1B1klE-0008SO-OE for emacs-devel@gnu.org; Fri, 12 Mar 2004 06:23:28 -0500 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30) id 1B1kkg-0008K0-H9 for emacs-devel@gnu.org; Fri, 12 Mar 2004 06:23:26 -0500 Original-Received: from [193.252.22.21] (helo=mwinf1001.wanadoo.fr) by monty-python.gnu.org with esmtp (Exim 4.30) id 1B1kBz-00041N-6o for emacs-devel@gnu.org; Fri, 12 Mar 2004 05:47:03 -0500 Original-Received: from wwinf1003 (wwinf1003 [172.22.141.30]) by mwinf1001.wanadoo.fr (SMTP Server) with ESMTP id 4DFCF1C000A4; Fri, 12 Mar 2004 11:46:57 +0100 (CET) Original-To: storm@cua.dk X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.4 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:20357 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:20357 Hi Kim, Following your change to consolidate image support I had to apply this patch to fix a link error when building Emacs "--with-gtk". This is because in that case the function `xg_set_icon' in xfns.c calls `x_find_image_file' which is now in image.c Hope it helps. Sincerely, David Index: src/dispextern.h =================================================================== RCS file: /cvsroot/emacs/emacs/src/dispextern.h,v retrieving revision 1.168 diff -c -r1.168 dispextern.h *** src/dispextern.h 11 Mar 2004 22:42:47 -0000 1.168 --- src/dispextern.h 12 Mar 2004 10:29:46 -0000 *************** *** 2618,2624 **** #endif extern void x_destroy_all_bitmaps P_ ((Display_Info *)); extern int x_create_bitmap_mask P_ ((struct frame * , int)); ! void x_kill_gs_process P_ ((Pixmap, struct frame *)); struct image_cache *make_image_cache P_ ((void)); void free_image_cache P_ ((struct frame *)); --- 2618,2624 ---- #endif extern void x_destroy_all_bitmaps P_ ((Display_Info *)); extern int x_create_bitmap_mask P_ ((struct frame * , int)); ! extern Lisp_Object x_find_image_file P_ ((Lisp_Object)); void x_kill_gs_process P_ ((Pixmap, struct frame *)); struct image_cache *make_image_cache P_ ((void)); void free_image_cache P_ ((struct frame *)); Index: src/image.c =================================================================== RCS file: /cvsroot/emacs/emacs/src/image.c,v retrieving revision 1.4 diff -c -r1.4 image.c *** src/image.c 11 Mar 2004 22:43:06 -0000 1.4 --- src/image.c 12 Mar 2004 10:29:46 -0000 *************** *** 1998,2004 **** File Handling ***********************************************************************/ - static Lisp_Object x_find_image_file P_ ((Lisp_Object)); static unsigned char *slurp_file P_ ((char *, int *)); --- 1998,2003 ---- *************** *** 2006,2012 **** x-bitmap-file-path. Value is the full name of the file found, or nil if not found. */ ! static Lisp_Object x_find_image_file (file) Lisp_Object file; { --- 2005,2011 ---- x-bitmap-file-path. Value is the full name of the file found, or nil if not found. */ ! Lisp_Object x_find_image_file (file) Lisp_Object file; { Index: src/xfns.c =================================================================== RCS file: /cvsroot/emacs/emacs/src/xfns.c,v retrieving revision 1.607 diff -c -r1.607 xfns.c *** src/xfns.c 11 Mar 2004 00:25:38 -0000 1.607 --- src/xfns.c 12 Mar 2004 10:29:47 -0000 *************** *** 761,768 **** #ifdef USE_GTK - static Lisp_Object x_find_image_file P_ ((Lisp_Object file)); - /* Set icon from FILE for frame F. By using GTK functions the icon may be any format that GdkPixbuf knows about, i.e. not just bitmaps. */ --- 761,766 ----