From: Emden Gansner <erg@research.att.com>
Date: Fri, 25 May 2012 21:56:23 +0000 (-0400)
Subject: Backed out changeset 3ab8934555d7
X-Git-Tag: LAST_LIBGRAPH~32^2~408^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=137923afc2f358db97519d4ba6eb12a727c4a4e4;p=graphviz

Backed out changeset 3ab8934555d7
---

diff --git a/lib/label/rectangle.c b/lib/label/rectangle.c
index 305d7fe69..4364c99e6 100644
--- a/lib/label/rectangle.c
+++ b/lib/label/rectangle.c
@@ -116,6 +116,7 @@ void PrintRect(Rect_t * r)
 /*-----------------------------------------------------------------------------
 | Calculate the n-dimensional area of a rectangle
 -----------------------------------------------------------------------------*/
+void agerror(char *);
 
 #if SIZEOF_LONG_LONG > SIZEOF_INT
 unsigned int RectArea(Rect_t * r)
@@ -134,7 +135,7 @@ unsigned int RectArea(Rect_t * r)
     for (i = 0; i < NUMDIMS; i++) {
       long long a_test = area * r->boundary[i + NUMDIMS] - r->boundary[i];
       if( a_test > UINT_MAX) {
-	fprintf(stderr, "label: area too large for rtree\n");
+	agerror("label: area too large for rtree\n");
 	return UINT_MAX;
       }
       area = a_test;
@@ -158,7 +159,7 @@ unsigned int RectArea(Rect_t * r)
       unsigned int b = r->boundary[i + NUMDIMS] - r->boundary[i];
       a *= b;
       if( (a / b ) != area) {
-	fprintf(stderr, "label: area too large for rtree\n");
+	agerror("label: area too large for rtree\n");
 	return UINT_MAX;
       }
       area = a;
@@ -227,7 +228,7 @@ int Overlap(Rect_t * r, Rect_t * s)
 int Contained(Rect_t * r, Rect_t * s)
 {
     register int i, j, result;
-    assert(r && s);
+    assert((int) r && (int) s);
 
     /* undefined rect is contained in any other */
     if (Undefined(r))