From 2fd9e77391df631c1c0d3cf52466cd3e94df83d5 Mon Sep 17 00:00:00 2001 From: jongfoster Date: Sun, 24 Mar 2002 16:18:15 +0000 Subject: [PATCH] Removing old logo --- cgi.c | 38 ++++---------------------------------- cgi.h | 7 ++++--- cgisimple.c | 12 +++++------- 3 files changed, 13 insertions(+), 44 deletions(-) diff --git a/cgi.c b/cgi.c index f63cca37..85baf635 100644 --- a/cgi.c +++ b/cgi.c @@ -1,4 +1,4 @@ -const char cgi_rcs[] = "$Id: cgi.c,v 1.52 2002/03/24 15:23:33 jongfoster Exp $"; +const char cgi_rcs[] = "$Id: cgi.c,v 1.53 2002/03/24 16:06:00 oes Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgi.c,v $ @@ -38,6 +38,9 @@ const char cgi_rcs[] = "$Id: cgi.c,v 1.52 2002/03/24 15:23:33 jongfoster Exp $"; * * Revisions : * $Log: cgi.c,v $ + * Revision 1.53 2002/03/24 16:06:00 oes + * Correct transparency for checkerboard PNG. Thanks, Magnus! + * * Revision 1.52 2002/03/24 15:23:33 jongfoster * Name changes * @@ -454,25 +457,6 @@ static const struct cgi_dispatcher cgi_dispatchers[] = { #ifdef FEATURE_NO_GIFS -/* - * "Junkbuster" logo, as a PNG. - */ -const char image_logo_data[] = - "\211\120\116\107\015\012\032\012\000\000\000\015\111\110\104" - "\122\000\000\000\104\000\000\000\013\001\003\000\000\000\374" - "\323\271\110\000\000\000\004\147\101\115\101\000\000\261\217" - "\013\374\141\005\000\000\000\006\120\114\124\105\310\310\310" - "\000\000\000\062\100\100\345\000\000\000\001\164\122\116\123" - "\000\100\346\330\146\000\000\000\001\142\113\107\104\000\210" - "\005\035\110\000\000\000\126\111\104\101\124\170\332\143\140" - "\200\003\066\006\146\066\006\006\011\124\326\331\315\146\147" - "\316\333\174\116\000\262\156\247\347\334\234\071\373\001\220" - "\065\373\130\316\035\311\331\015\020\326\161\311\337\014\014" - "\151\147\147\247\345\034\236\331\014\144\335\235\155\236\173" - "\163\366\154\006\006\233\334\331\162\307\316\363\174\106\330" - "\300\000\000\002\127\040\324\250\204\044\102\000\000\000\000" - "\111\105\116\104\256\102\140\202"; - /* * Checkerboard pattern, as a PNG. */ @@ -500,19 +484,6 @@ const char image_blank_data[] = "\000\000\000\000\111\105\116\104\256\102\140\202"; #else -/* - * "Junkbuster" logo, as a GIF. - */ -const char image_logo_data[] = - "GIF89aD\000\013\000\360\000\000\000\000\000\377\377\377!" - "\371\004\001\000\000\001\000,\000\000\000\000D\000\013\000" - "\000\002a\214\217\251\313\355\277\000\200G&K\025\316hC\037" - "\200\234\230Y\2309\235S\230\266\206\372J\253<\3131\253\271" - "\270\215\342\254\013\203\371\202\264\334P\207\332\020o\266" - "N\215I\332=\211\312\3513\266:\026AK)\364\370\365aobr\305" - "\372\003S\275\274k2\354\254z\347?\335\274x\306^9\374\276" - "\037Q\000\000;"; - /* * Checkerboard pattern, as a GIF. */ @@ -532,7 +503,6 @@ const char image_blank_data[] = "\000\001\000\000\002\002D\001\000;"; #endif -const size_t image_logo_length = sizeof(image_logo_data) - 1; const size_t image_pattern_length = sizeof(image_pattern_data) - 1; const size_t image_blank_length = sizeof(image_blank_data) - 1; diff --git a/cgi.h b/cgi.h index 6d808a31..cc3ba0cf 100644 --- a/cgi.h +++ b/cgi.h @@ -1,6 +1,6 @@ #ifndef CGI_H_INCLUDED #define CGI_H_INCLUDED -#define CGI_H_VERSION "$Id: cgi.h,v 1.21 2002/03/07 03:48:38 oes Exp $" +#define CGI_H_VERSION "$Id: cgi.h,v 1.22 2002/03/24 13:25:43 swa Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgi.h,v $ @@ -38,6 +38,9 @@ * * Revisions : * $Log: cgi.h,v $ + * Revision 1.22 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.21 2002/03/07 03:48:38 oes * - Changed built-in images from GIF to PNG * (with regard to Unisys patent issue) @@ -188,8 +191,6 @@ extern char *dump_map(const struct map *the_map); /* * Ad replacement images. */ -extern const char image_logo_data[]; -extern const size_t image_logo_length; extern const char image_pattern_data[]; extern const size_t image_pattern_length; extern const char image_blank_data[]; diff --git a/cgisimple.c b/cgisimple.c index d81c1b35..d210b7af 100644 --- a/cgisimple.c +++ b/cgisimple.c @@ -1,4 +1,4 @@ -const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.20 2002/03/24 13:25:43 swa Exp $"; +const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.21 2002/03/24 15:23:33 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $ @@ -36,6 +36,9 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.20 2002/03/24 13:25:43 swa Ex * * Revisions : * $Log: cgisimple.c,v $ + * Revision 1.21 2002/03/24 15:23:33 jongfoster + * Name changes + * * Revision 1.20 2002/03/24 13:25:43 swa * name change related issues * @@ -401,7 +404,7 @@ jb_err cgi_send_banner(struct client_state *csp, if (imagetype == 'a') /* auto */ { - /* Default to logo */ + /* Default to pattern */ imagetype = 'p'; #ifdef FEATURE_IMAGE_BLOCKING if ((csp->action->flags & ACTION_IMAGE_BLOCKER) != 0) @@ -428,11 +431,6 @@ jb_err cgi_send_banner(struct client_state *csp, rsp->content_length = image_blank_length; } - else if (imagetype == 'l') /* logo */ - { - rsp->body = bindup(image_logo_data, image_logo_length); - rsp->content_length = image_logo_length; - } else /* pattern */ { rsp->body = bindup(image_pattern_data, image_pattern_length); -- 2.39.2