From 62aaea4c9110bf58e39ed76ad7d4b314e53b6776 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc@users.sourceforge.net>
Date: Thu, 3 Dec 2009 07:05:23 +0000
Subject: [PATCH] fixed some minor gcc-2.95.3 build issues

---
 magic/src/mosaic.c        |  3 ++-
 magic/src/mosaic_shaped.c | 14 ++++++++------
 magic/src/perspective.c   |  3 ++-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/magic/src/mosaic.c b/magic/src/mosaic.c
index c50d01e0d..783433d8d 100644
--- a/magic/src/mosaic.c
+++ b/magic/src/mosaic.c
@@ -350,6 +350,7 @@ static void mosaic_sharpen_pixel(void * ptr,
 void mosaic_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
   int y, x;
+  Uint32 amask;
 
   mosaic_blured = (Uint8 *) malloc(sizeof(Uint8) * (canvas->w * canvas->h));
   if (mosaic_blured == NULL)
@@ -358,7 +359,7 @@ void mosaic_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
     exit(1);
   }
 
-   Uint32 amask = ~(canvas->format->Rmask |
+  amask = ~(canvas->format->Rmask |
 		   canvas->format->Gmask |
 		   canvas->format->Bmask);
 
diff --git a/magic/src/mosaic_shaped.c b/magic/src/mosaic_shaped.c
index 1b4ca1f13..91937d8ab 100644
--- a/magic/src/mosaic_shaped.c
+++ b/magic/src/mosaic_shaped.c
@@ -190,7 +190,7 @@ static int mosaic_shaped_grey(Uint8 r1,Uint8 g1,Uint8 b1){
 
 // Do the effect for the full image
 static void do_mosaic_shaped_full(void * ptr, SDL_Surface * canvas, SDL_Surface * last ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, SDL_Rect * update_rect ATTRIBUTE_UNUSED){
-  int i, j;
+  int i, j, size;
   Uint32 mosaic_shaped_color;
   magic_api * api = (magic_api *) ptr;
 
@@ -217,7 +217,7 @@ static void do_mosaic_shaped_full(void * ptr, SDL_Surface * canvas, SDL_Surface
 		  if (mosaic_shaped_average_count > 0)
 		    {
 		      reset_counter(canvas, mosaic_shaped_counted);
-		      int size = 0;
+		      size = 0;
 		      pixel_average = SDL_MapRGB(canvas->format, mosaic_shaped_average_r / mosaic_shaped_average_count, mosaic_shaped_average_g / mosaic_shaped_average_count, mosaic_shaped_average_b / mosaic_shaped_average_count);
 		      scan_fill(api, canvas, canvas_shaped, i, j, 0, 1, size, pixel_average);
 		    }
@@ -230,10 +230,11 @@ static void do_mosaic_shaped_full(void * ptr, SDL_Surface * canvas, SDL_Surface
 static void mosaic_shaped_fill(void * ptr_to_api, int which ATTRIBUTE_UNUSED, SDL_Surface * canvas,
 	          SDL_Surface * last ATTRIBUTE_UNUSED, int x, int y)
 {
+  Uint32 mosaic_shaped_color;
+  int size;
   magic_api * api = (magic_api *) ptr_to_api;
   x = clamp(0, x, canvas->w - 1);
   y = clamp(0,y,canvas->h - 1);
-  Uint32 mosaic_shaped_color;
   mosaic_shaped_color = SDL_MapRGBA(canvas->format, mosaic_shaped_r, mosaic_shaped_g, mosaic_shaped_b, 0);
   mosaic_shaped_average_r = 0;
   mosaic_shaped_average_g = 0;
@@ -244,7 +245,7 @@ static void mosaic_shaped_fill(void * ptr_to_api, int which ATTRIBUTE_UNUSED, SD
 
   if (mosaic_shaped_average_count > 0)
     {
-      int size = 0;
+      size = 0;
       pixel_average = SDL_MapRGB(canvas->format, mosaic_shaped_average_r / mosaic_shaped_average_count, mosaic_shaped_average_g / mosaic_shaped_average_count, mosaic_shaped_average_b / mosaic_shaped_average_count);
       reset_counter(canvas, mosaic_shaped_counted);
       scan_fill(api, canvas, canvas_shaped, x, y, 0, 1, size, pixel_average);
@@ -367,6 +368,8 @@ void mosaic_shaped_switchin(magic_api * api, int which, int mode ATTRIBUTE_UNUSE
   int i, j;
   SDL_Rect  rect;
   SDL_Surface * surf_aux;
+  Uint32 amask;
+  char fname[1024];
 
   mosaic_shaped_counted = (Uint8 *) malloc(sizeof(Uint8) * (canvas->w * canvas->h));
   if (mosaic_shaped_counted == NULL)
@@ -382,7 +385,7 @@ void mosaic_shaped_switchin(magic_api * api, int which, int mode ATTRIBUTE_UNUSE
     exit(1);
   }
 
-   Uint32 amask = ~(canvas->format->Rmask |
+   amask = ~(canvas->format->Rmask |
 		   canvas->format->Gmask |
 		   canvas->format->Bmask);
 
@@ -401,7 +404,6 @@ void mosaic_shaped_switchin(magic_api * api, int which, int mode ATTRIBUTE_UNUSE
                          canvas->format->Rmask,
                          canvas->format->Gmask,
                          canvas->format->Bmask, amask);
-  char fname[1024];
   snprintf(fname, sizeof(fname), "%simages/magic/%s", api->data_directory, mosaic_shaped_pattern_filenames[which]);
 mosaic_shaped_pattern = IMG_Load(fname);
  rect.w = mosaic_shaped_pattern->w;
diff --git a/magic/src/perspective.c b/magic/src/perspective.c
index f32341492..1183e6d32 100644
--- a/magic/src/perspective.c
+++ b/magic/src/perspective.c
@@ -499,6 +499,7 @@ int perspective_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTR
 
 void perspective_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas)
 {
+  Uint32 amask;
   new_w = canvas->w;
   new_h = canvas->h;
 
@@ -512,7 +513,7 @@ void perspective_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_
   black = SDL_MapRGBA(canvas->format, 0, 0, 0, 0);
   white = SDL_MapRGBA(canvas->format, 255, 255, 255, 0);
 
-  Uint32 amask = ~(canvas->format->Rmask |
+  amask = ~(canvas->format->Rmask |
 		   canvas->format->Gmask |
 		   canvas->format->Bmask);