From 6c723975b33e361a962e86a79e34084eda9c3302 Mon Sep 17 00:00:00 2001
From: Per Hedbor <ph@opera.com>
Date: Mon, 2 Dec 1996 17:49:40 +0100
Subject: [PATCH] foo
Rev: src/modules/image/quant.c:1.15
Rev: src/modules/image/togif.c:1.20
---
src/modules/image/quant.c | 18 ++++++++++++------
src/modules/image/togif.c | 4 ++--
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/modules/image/quant.c b/src/modules/image/quant.c
index b60fcaf89b..9060f9ec1e 100644
--- a/src/modules/image/quant.c
+++ b/src/modules/image/quant.c
@@ -1,4 +1,4 @@
-/* $Id: quant.c,v 1.14 1996/12/01 04:08:20 law Exp $ */
+/* $Id: quant.c,v 1.15 1996/12/02 16:49:39 per Exp $ */
/*
@@ -35,15 +35,21 @@ David K
#include <sys/resource.h>
#define CHRONO(X) chrono(X)
-void chrono(char *x)
+static void chrono(char *x)
{
struct rusage r;
+ static struct rusage rold;
getrusage(RUSAGE_SELF,&r);
- fprintf(stderr,"%s: %ld.%06ld %ld.%06ld %ld.%06ld\n",x,
+ fprintf(stderr,"%s: %ld.%06ld - %ld.%06ld\n",x,
r.ru_utime.tv_sec,r.ru_utime.tv_usec,
- r.ru_stime.tv_sec,r.ru_stime.tv_usec,
- r.ru_stime.tv_sec+r.ru_utime.tv_sec,
- r.ru_stime.tv_usec+r.ru_utime.tv_usec);
+
+ ((r.ru_utime.tv_usec-rold.ru_utime.tv_usec<0)?-1:0)
+ +r.ru_utime.tv_sec-rold.ru_utime.tv_sec,
+ ((r.ru_utime.tv_usec-rold.ru_utime.tv_usec<0)?1000000:0)
+ + r.ru_utime.tv_usec-rold.ru_utime.tv_usec
+ );
+
+ rold=r;
}
#else
#define CHRONO(X)
diff --git a/src/modules/image/togif.c b/src/modules/image/togif.c
index 0f5916aaef..02455d2413 100644
--- a/src/modules/image/togif.c
+++ b/src/modules/image/togif.c
@@ -1,4 +1,4 @@
-/* $Id: togif.c,v 1.19 1996/12/01 04:08:21 law Exp $ */
+/* $Id: togif.c,v 1.20 1996/12/02 16:49:40 per Exp $ */
/*
togif
@@ -506,7 +506,7 @@ void image_togif_fs(INT32 args)
struct colortable *ct=NULL;
if (args>0 && sp[-args].type==T_ARRAY)
- ct=colortable_from_array(sp[-args].u.array,"image->togif()\n");
+ ct=colortable_from_array(sp[-args].u.array,"image->togif_fs()\n");
else if (args>0 && args!=3 && sp[-args].type==T_INT)
ct=colortable_quant(THIS,min(256,max(2,sp[-args].u.integer)));
--
GitLab