From owner-p4-projects@FreeBSD.ORG  Wed Nov 14 05:40:04 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 641D0E9A; Wed, 14 Nov 2012 05:40:04 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 221CAE98
 for <perforce@freebsd.org>; Wed, 14 Nov 2012 05:40:04 +0000 (UTC)
 (envelope-from bz@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:4f8:fff6::2d])
 by mx1.freebsd.org (Postfix) with ESMTP id 086C68FC08
 for <perforce@freebsd.org>; Wed, 14 Nov 2012 05:40:04 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
 by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qAE5e3hr061270
 for <perforce@freebsd.org>; Wed, 14 Nov 2012 05:40:03 GMT
 (envelope-from bz@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qAE5e3sB061267
 for perforce@freebsd.org; Wed, 14 Nov 2012 05:40:03 GMT
 (envelope-from bz@freebsd.org)
Date: Wed, 14 Nov 2012 05:40:03 GMT
Message-Id: <201211140540.qAE5e3sB061267@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 bz@freebsd.org using -f
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Subject: PERFORCE change 219779 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Nov 2012 05:40:04 -0000

http://p4web.freebsd.org/@@219779?ac=10

Change 219779 by bz@bz_zenith on 2012/11/14 05:39:14

	Remove (double) casts from
		(png_int_32) < (double)((png_uint_32)0x7fffffffL)
	       which actually is
		long < (double)unsigned long
	to remove the need for __floatdidf and __gtdf2.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngset.c#2 edit

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngset.c#2 (text+ko) ====

@@ -100,10 +100,10 @@
         "Ignoring attempt to set negative chromaticity value");
       return;
    }
-   if (white_x > (double) PNG_MAX_UINT || white_y > (double) PNG_MAX_UINT ||
-         red_x > (double) PNG_MAX_UINT ||   red_y > (double) PNG_MAX_UINT ||
-       green_x > (double) PNG_MAX_UINT || green_y > (double) PNG_MAX_UINT ||
-        blue_x > (double) PNG_MAX_UINT ||  blue_y > (double) PNG_MAX_UINT)
+   if (white_x > PNG_MAX_UINT || white_y > PNG_MAX_UINT ||
+         red_x > PNG_MAX_UINT ||   red_y > PNG_MAX_UINT ||
+       green_x > PNG_MAX_UINT || green_y > PNG_MAX_UINT ||
+        blue_x > PNG_MAX_UINT ||  blue_y > PNG_MAX_UINT)
    {
       png_warning(png_ptr,
         "Ignoring attempt to set chromaticity value exceeding 21474.83");