From: oes <oes@users.sourceforge.net>
Date: Fri, 8 Mar 2002 16:41:33 +0000 (+0000)
Subject: Added GIF images again
X-Git-Tag: v_2_9_12~106
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=46b21455cec9cc16ffceed066cb6dd177ccac3f1

Added GIF images again
---

diff --git a/cgi.c b/cgi.c
index 94a4ea1c..adb44195 100644
--- a/cgi.c
+++ b/cgi.c
@@ -1,4 +1,4 @@
-const char cgi_rcs[] = "$Id: cgi.c,v 1.45 2002/03/06 22:54:35 jongfoster Exp $";
+const char cgi_rcs[] = "$Id: cgi.c,v 1.46 2002/03/07 03:48:38 oes Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgi.c,v $
@@ -38,6 +38,12 @@ const char cgi_rcs[] = "$Id: cgi.c,v 1.45 2002/03/06 22:54:35 jongfoster Exp $";
  *
  * Revisions   :
  *    $Log: cgi.c,v $
+ *    Revision 1.46  2002/03/07 03:48:38  oes
+ *     - Changed built-in images from GIF to PNG
+ *       (with regard to Unisys patent issue)
+ *     - Added a 4x4 pattern PNG which is less intrusive
+ *       than the logo but also clearly marks the deleted banners
+ *
  *    Revision 1.45  2002/03/06 22:54:35  jongfoster
  *    Automated function-comment nitpicking.
  *
@@ -402,10 +408,10 @@ static const struct cgi_dispatcher cgi_dispatchers[] = {
          NULL /* Sends a robots.txt file to tell robots to go away. */ }, 
    { "send-banner",
          cgi_send_banner, 
-         NULL /* Send a built-in png image */ },
+         NULL /* Send a built-in image */ },
    { "t",
-         cgi_transparent_png, 
-         NULL /* Send a transparent png (short name) */ },
+         cgi_transparent_image, 
+         NULL /* Send a transparent image (short name) */ },
    { NULL, /* NULL Indicates end of list and default page */
          cgi_error_404,
          NULL /* Unknown CGI page */ }
@@ -415,9 +421,11 @@ static const struct cgi_dispatcher cgi_dispatchers[] = {
 /*
  * Bulit-in images for ad replacement
  *
- * Hint: You can encode your own PNGs like this:
- * cat yourfile.png | perl -e 'while (read STDIN, $c, 1) { printf("\\%.3o", unpack("C", $c)); }'
+ * Hint: You can encode your own images like this:
+ * cat your-image | perl -e 'while (read STDIN, $c, 1) { printf("\\%.3o", unpack("C", $c)); }'
  */
+
+#ifdef FEATURE_NO_GIFS
 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"
@@ -434,8 +442,6 @@ const char image_logo_data[] =
    "\300\000\000\002\127\040\324\250\204\044\102\000\000\000\000"
    "\111\105\116\104\256\102\140\202";
 
-const size_t image_logo_length = sizeof(image_logo_data) - 1;
-
 const char image_pattern_data[] =
    "\211\120\116\107\015\012\032\012\000\000\000\015\111\110\104"
    "\122\000\000\000\004\000\000\000\004\010\002\000\000\000\046"
@@ -445,8 +451,6 @@ const char image_pattern_data[] =
    "\304\011\006\234\062\000\125\200\052\251\125\174\360\223\000"
    "\000\000\000\111\105\116\104\256\102\140\202";
 
-const size_t image_pattern_length = sizeof(image_pattern_data) - 1;
-
 const char image_blank_data[] =
    "\211\120\116\107\015\012\032\012\000\000\000\015\111\110\104"
    "\122\000\000\000\002\000\000\000\002\010\002\000\000\000\375"
@@ -455,8 +459,33 @@ const char image_blank_data[] =
    "\332\143\374\377\377\377\311\223\047\031\116\234\070\361\377"
    "\377\177\000\112\335\012\257\162\103\306\335\000\000\000\000"
    "\111\105\116\104\256\102\140\202o";
+#else
+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;";
 
-const size_t image_blank_length = sizeof(image_blank_data) - 1;
+const char image_pattern_data[] =
+   "\107\111\106\070\071\141\004\000\004\000\200\000\000\310\310"
+   "\310\377\377\377\041\376\025\111\040\165\163\145\144\040\164"
+   "\157\040\142\145\040\141\040\142\141\156\156\145\162\000\054"
+   "\000\000\000\000\004\000\004\000\000\002\005\104\174\147\270"
+   "\005\000\073";
+
+const char image_blank_data[] =
+   "GIF89a\001\000\001\000\200\000\000\377\377\377\000\000"
+   "\000!\371\004\001\000\000\000\000,\000\000\000\000\001"
+   "\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;
 
 
 static struct http_response cgi_error_memory_response[1];