From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Steven Tamm Newsgroups: gmane.emacs.devel Subject: Re: Consolidation of image support in new image.c file. Date: Wed, 10 Mar 2004 21:57:37 -0800 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <00109334-7321-11D8-80D6-00039390AB82@mac.com> References: NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 (Apple Message framework v612) Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1079140260 32430 80.91.224.253 (13 Mar 2004 01:11:00 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sat, 13 Mar 2004 01:11:00 +0000 (UTC) Cc: YAMAMOTO Mitsuharu , emacs-devel Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Sat Mar 13 02:10:51 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 1B1xfv-000223-00 for ; Sat, 13 Mar 2004 02:10:51 +0100 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 1B1xfu-0001f8-00 for ; Sat, 13 Mar 2004 02:10:50 +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 1B1rxf-0000Hl-ID for emacs-devel@quimby.gnus.org; Fri, 12 Mar 2004 14:04:47 -0500 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30) id 1B1qk4-0004X7-L4 for emacs-devel@gnu.org; Fri, 12 Mar 2004 12:46:40 -0500 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30) id 1B1bEc-0006Gg-L2 for emacs-devel@gnu.org; Thu, 11 Mar 2004 20:13:41 -0500 Original-Received: from [17.250.248.86] (helo=smtpout.mac.com) by monty-python.gnu.org with esmtp (Exim 4.30) id 1B1JCZ-0006HV-CE for emacs-devel@gnu.org; Thu, 11 Mar 2004 00:57:51 -0500 Original-Received: from mac.com (smtpin08-en2 [10.13.10.153]) by smtpout.mac.com (Xserve/MantshX 2.0) with ESMTP id i2B5vgPX005629; Wed, 10 Mar 2004 21:57:42 -0800 (PST) Original-Received: from [10.0.1.201] (c-24-4-94-157.client.comcast.net [24.4.94.157]) (authenticated bits=0) by mac.com (Xserve/smtpin08/MantshX 3.0) with ESMTP id i2B5vfr4007243; Wed, 10 Mar 2004 21:57:41 -0800 (PST) In-Reply-To: Original-To: storm@cua.dk (Kim F. Storm) X-Mailer: Apple Mail (2.612) 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:20365 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:20365 I also could not bootstrap (or make for that matter): Some code was left lying around macfns.c that defines Qjpeg and the like and sys/stat.h wasn't included in image.c for OSX. I checked in the following changes that make it compile (don't know if it works yet... still bootstrapping): *** src/macfns.c.~1.29.~ Wed Mar 10 16:27:13 2004 --- src/macfns.c Wed Mar 10 21:15:22 2004 *************** *** 4391,4412 **** set_frame_fontset_func = x_set_font; check_window_system_func = check_mac; - Qjpeg = intern ("jpeg"); - staticpro (&Qjpeg); - - Qtiff = intern ("tiff"); - staticpro (&Qtiff); - - Qgif = intern ("gif"); - staticpro (&Qgif); - - Qpng = intern ("png"); - staticpro (&Qpng); - - defsubr (&Sclear_image_cache); - defsubr (&Simage_size); - defsubr (&Simage_mask_p); - hourglass_atimer = NULL; hourglass_shown_p = 0; *** src/image.c.~1.1.~ Wed Mar 10 16:28:24 2004 --- src/image.c Wed Mar 10 21:39:19 2004 *************** *** 92,97 **** --- 92,98 ---- #include #endif #ifdef MAC_OSX + #include #include #else /* not MAC_OSX */ #include -Steven On Mar 10, 2004, at 5:40 PM, Kim F. Storm wrote: > > [This is sent to emacs-devel with CC to selected team members as the > mailing list is still too slow to be useful]. > > I have just committed changes which moves/merges/consolidates the > image support code for the X, W32, and MAC platforms into a new file > image.c. > > I have successfully tested this on X (with and without -nw). > > I have done as much code review as I can for the W32 and MAC ports, > but I cannot do any actual compilation or testing on those platforms. > So if you can test (and fix :-) it for me, I'd appreciate it. > > -- > Kim F. Storm http://www.cua.dk >