From 48e7d7792694c0a0ab0220e5fb9a96f1fcc8f575 Mon Sep 17 00:00:00 2001
From: "Mirar (Pontus Hagland)" <pike@sort.mirar.org>
Date: Wed, 8 Jan 1997 01:58:07 +0100
Subject: [PATCH] =?UTF-8?q?tr=C3=A5dfixar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Rev: src/modules/image/matrix.c:1.10
Rev: src/modules/image/togif.c:1.23
---
 src/modules/image/matrix.c | 12 +++++++-----
 src/modules/image/togif.c  |  8 +-------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/modules/image/matrix.c b/src/modules/image/matrix.c
index fd738e25db..4712931f33 100644
--- a/src/modules/image/matrix.c
+++ b/src/modules/image/matrix.c
@@ -1,4 +1,4 @@
-/* $Id: matrix.c,v 1.9 1997/01/07 00:41:43 law Exp $ */
+/* $Id: matrix.c,v 1.10 1997/01/08 00:58:06 law Exp $ */
 
 #include "global.h"
 
@@ -157,12 +157,13 @@ void img_scale(struct image *dest,
    INT32 y,yd;
    double yn,dx,dy;
 
-   THREADS_ALLOW();
 CHRONO("scale begin");
 
    if (dest->img) { free(dest->img); dest->img=NULL; }
 
    if (!THIS->img || newx<=0 || newy<=0) return; /* no way */
+
+   THREADS_ALLOW();
    new=malloc(newx*newy*sizeof(rgbd_group) +1);
    if (!new) error("Out of memory!\n");
 
@@ -224,9 +225,10 @@ void img_scale2(struct image *dest, struct image *source)
    newx = source->xsize >> 1;
    newy = source->ysize >> 1;
    
-   THREADS_ALLOW();
    if (dest->img) { free(dest->img); dest->img=NULL; }
    if (!THIS->img || newx<=0 || newy<=0) return; /* no way */
+
+   THREADS_ALLOW();
    new=malloc(newx*newy*sizeof(rgb_group) +1);
    if (!new) error("Out of memory\n");
    MEMSET(new,0,newx*newy*sizeof(rgb_group));
@@ -527,7 +529,6 @@ static void img_skewx(struct image *src,
    rgb_group *s,*d;
    rgb_group rgb;
 
-   THREADS_ALLOW();
    if (dest->img) free(dest->img);
    if (diff<0) 
       dest->xsize=ceil(-diff)+src->xsize,x0=-diff;
@@ -540,6 +541,7 @@ static void img_skewx(struct image *src,
    if (!d) return;
    s=src->img;
 
+   THREADS_ALLOW();
    xmod=diff/src->ysize;
    rgb=dest->rgb;
 
@@ -603,7 +605,6 @@ static void img_skewy(struct image *src,
    rgb_group *s,*d;
    rgb_group rgb;
 
-   THREADS_ALLOW();
    if (dest->img) free(dest->img);
    if (diff<0) 
       dest->ysize=ceil(-diff)+src->ysize,y0=-diff;
@@ -616,6 +617,7 @@ static void img_skewy(struct image *src,
    if (!d) return;
    s=src->img;
    
+   THREADS_ALLOW();
    ymod=diff/src->xsize;
    rgb=dest->rgb;
 
diff --git a/src/modules/image/togif.c b/src/modules/image/togif.c
index 0b17c9e2b7..cfd85675e8 100644
--- a/src/modules/image/togif.c
+++ b/src/modules/image/togif.c
@@ -1,4 +1,4 @@
-/* $Id: togif.c,v 1.22 1997/01/07 00:41:47 law Exp $ */
+/* $Id: togif.c,v 1.23 1997/01/08 00:58:07 law Exp $ */
 /*
 
 togif 
@@ -254,7 +254,6 @@ CHRONO("image_encode_gif begin");
 
 CHRONO("image_encode_gif header done");
 
-THREADS_ALLOW();
    lzw_init(&lzw,bpp);
    if (!fs)
       while (i--) lzw_add(&lzw,colortable_rgb(ct,*(rgb++)));
@@ -305,7 +304,6 @@ CHRONO("image_encode_gif wrote ok");
    low_my_putchar( ';', &buf ); /* end gif file */
 
 CHRONO("image_encode_gif done");
-THREADS_DISALLOW();
 
    return low_free_buf(&buf);
 }
@@ -342,7 +340,6 @@ int image_decode_gif(struct image *dest,struct image *dest_alpha,
 
    bpp=(src[10]&7)+1;
 
-   THREADS_ALLOW();
    if (src[10]&128)
    {
       global_palette=(rgb_group*)(src+13);
@@ -437,7 +434,6 @@ int image_decode_gif(struct image *dest,struct image *dest_alpha,
       }
    }
    while (0);
-   THREADS_DISALLOW();
 
    if (arena) free(arena);
    return 1; /* ok */
@@ -704,7 +700,6 @@ CHRONO("gif add init");
 
 CHRONO("begin pack");
 
-   THREADS_ALLOW();
    lzw_init(&lzw,bpp);
    if (!fs)
       while (i--) lzw_add(&lzw,colortable_rgb(ct,*(rgb++)));
@@ -751,7 +746,6 @@ CHRONO("end pack");
    lzw_quit(&lzw);
 
    colortable_free(ct);
-   THREADS_DISALLOW();
 
 CHRONO("done");
 
-- 
GitLab