From patchwork Tue Feb 5 14:21:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mans Rullgard X-Patchwork-Id: 14552 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 304DE23F99 for ; Tue, 5 Feb 2013 14:21:23 +0000 (UTC) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com [209.85.217.170]) by fiordland.canonical.com (Postfix) with ESMTP id E8028A18AF8 for ; Tue, 5 Feb 2013 14:21:22 +0000 (UTC) Received: by mail-lb0-f170.google.com with SMTP id ge1so267076lbb.1 for ; Tue, 05 Feb 2013 06:21:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=XFPpa+yAFjLiquuemdy6I6979fx8VCaI/9nWxt262ho=; b=nIfywdqOrA/qLdPGFSWyao6Qf2B5OsEtAgWBc6v6JP576Uw9isSkw34qoVJXDWYTNn aljFyRmUgByQWyulEKe1O57xhTtP63W158XeUXd3n+cwoAuSnki7PigGj+5IgxBZvPmy yDJlCJKg8vkXWzr1mmfCnSY5tp+3QufMjXZZLnZLHkPyPOo0H1wbVrSx7y0T/efSkvkk 8zFx+THEhXx1Cjo588zTqTlViooJGioOm6C1Hx1whaUCCP45ATR8c4brx6laREOCh2tu 1oXAeu6yd3qJSLDClGG/bbhbL3kd8EhfLuwx6p+ZfSM8yU3AZMw6cxdKPP05ZZ64sfJq rGzQ== X-Received: by 10.112.42.168 with SMTP id p8mr229917lbl.103.1360074082535; Tue, 05 Feb 2013 06:21:22 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.112.91.146 with SMTP id ce18csp135613lbb; Tue, 5 Feb 2013 06:21:20 -0800 (PST) X-Received: by 10.194.78.207 with SMTP id d15mr42639641wjx.52.1360074079850; Tue, 05 Feb 2013 06:21:19 -0800 (PST) Received: from unicorn.mansr.com (unicorn.mansr.com. [78.86.181.103]) by mx.google.com with ESMTP id by15si7319246wjb.97.2013.02.05.06.21.19; Tue, 05 Feb 2013 06:21:19 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of mru@mansr.com designates 78.86.181.103 as permitted sender) client-ip=78.86.181.103; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of mru@mansr.com designates 78.86.181.103 as permitted sender) smtp.mail=mru@mansr.com Received: by unicorn.mansr.com (Postfix, from userid 51770) id 11A4B15389; Tue, 5 Feb 2013 14:21:19 +0000 (GMT) From: Mans Rullgard To: png-mng-implement@lists.sourceforge.net Cc: patches@linaro.org Subject: [PATCH 1/2] pngpriv: remove stray ifdef/endif directives Date: Tue, 5 Feb 2013 14:21:10 +0000 Message-Id: <1360074071-27671-1-git-send-email-mans.rullgard@linaro.org> X-Mailer: git-send-email 1.8.1.2 X-Gm-Message-State: ALoCoQnWWY1cgKOTQ89rmDgKc0oeWZhIE104wb//8MEBifBvNd659Df6sLDsreHm7NBrUEMk8iFu --- pngpriv.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/pngpriv.h b/pngpriv.h index 37c08ec..ebea8b8 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -539,7 +539,6 @@ /* Given a value 'linear' in the range 0..255*65535 calculate the 8-bit sRGB * encoded value with maximum error 0.646365. Note that the input is not a * 16-bit value; it has been multiplied by 255! */ -#endif /* PNG_SIMPLIFIED_READ/WRITE */ /* Added to libpng-1.6.0: scale a 16-bit value in the range 0..65535 to 0..255 * by dividing by 257 *with rounding*. This macro is exact for the given range. @@ -691,7 +690,6 @@ typedef const png_uint_16p * png_const_uint_16pp; /* Added to libpng-1.5.7: sRGB conversion tables */ #if defined PNG_SIMPLIFIED_READ_SUPPORTED ||\ defined PNG_SIMPLIFIED_WRITE_SUPPORTED -#ifdef PNG_SIMPLIFIED_READ_SUPPORTED PNG_INTERNAL_DATA(const png_uint_16, png_sRGB_table, [256]); /* Convert from an sRGB encoded value 0..255 to a 16-bit linear value, * 0..65535. This table gives the closest 16-bit answers (no errors).