From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Claudio Bley Newsgroups: gmane.emacs.devel Subject: [PATCH v2 0/5] fixes for w32 and NetPBM Date: Wed, 30 Oct 2013 13:42:50 +0100 Message-ID: <878uxbylo5.wl%claudio.bley@gmail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII X-Trace: ger.gmane.org 1383136983 13801 80.91.229.3 (30 Oct 2013 12:43:03 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 30 Oct 2013 12:43:03 +0000 (UTC) To: Emacs-devel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Oct 30 13:43:08 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VbV76-0007XM-BO for ged-emacs-devel@m.gmane.org; Wed, 30 Oct 2013 13:43:08 +0100 Original-Received: from localhost ([::1]:52202 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VbV75-00062j-Ur for ged-emacs-devel@m.gmane.org; Wed, 30 Oct 2013 08:43:07 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57515) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VbV6y-0005vu-Tg for emacs-devel@gnu.org; Wed, 30 Oct 2013 08:43:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VbV6s-0002lI-2Y for emacs-devel@gnu.org; Wed, 30 Oct 2013 08:43:00 -0400 Original-Received: from mail-ee0-x22b.google.com ([2a00:1450:4013:c00::22b]:41257) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VbV6r-0002l1-RC for emacs-devel@gnu.org; Wed, 30 Oct 2013 08:42:53 -0400 Original-Received: by mail-ee0-f43.google.com with SMTP id b47so609024eek.16 for ; Wed, 30 Oct 2013 05:42:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=date:message-id:from:to:subject:user-agent:mime-version :content-type; bh=IY29PXUemlIRoPFsHewYlo28X5xsgkZjoRZ1CjM52x4=; b=aMoA45vvKkzk3HXRPHU0jlxJldCDxsAcwPEcwEQ1DfuMsQj7TG4nl7pgf7Zd6zSVUn gF/bzg0gun0YP8FftZGRQSqThltnF0P6bpjaRMcVEq4hCd5Ce8uhb4uateP39fqTahuv KmdqtENvJ0WvtDXjRYVZIJzLv4uKadjAuMlDsiP1CS2FLd3bGsjfQryyEPvCJgRNCb43 YgkSNG72rAIQiQD30p1wMOeG7lIeu8VoQeKnNVFdJ3kwSgJGEisGpAcShTL2tgDxXrit +zfmd3YBWZsCKtm0E9Gdx3yXMfo+n28mhSwdS+fL0O9VHnP4hOOA5z1bIiC8Rzj45Cq7 8/wQ== X-Received: by 10.14.7.131 with SMTP id 3mr2512eep.151.1383136972588; Wed, 30 Oct 2013 05:42:52 -0700 (PDT) Original-Received: from CLAUDIO-PC.localdomain.de (178-24-125-95-dynip.superkabel.de. [178.24.125.95]) by mx.google.com with ESMTPSA id m54sm83094899eex.2.2013.10.30.05.42.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Oct 2013 05:42:51 -0700 (PDT) User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.3.50 (i686-pc-mingw32) MULE/6.0 (HANACHIRUSATO) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c00::22b X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:164693 Archived-At: This is version 2 of http://lists.gnu.org/archive/html/emacs-devel/2013-10/msg00772.html Changes since v1: - reworded commit message of patch #1 stating that different major versions of jpeglib are indeed binary incompatible - simplified logic of patch #2, using the name libpngXY.dll and libpngXY-XY.dll for versions >= 1.4.0 as per Eli's request Claudio Bley (5): w32: define new jpeglib-version var in order to load the correct DLL at runtime w32: add support for recent PNG library version >= 1.5 w32: add support for default library names for libtiff Fix parsing of NetPBM file comments Fix file magic for pbm files with comments lisp/image.el | 5 +++- lisp/term/w32-win.el | 17 ++++++++++---- src/image.c | 65 +++++++++++++++++++++++++++++++++++----------------- 3 files changed, 61 insertions(+), 26 deletions(-) -- 1.8.4.msysgit.0