From 85075982fad8fb5107a6b2651aeef855ba8bace7 Mon Sep 17 00:00:00 2001
From: oes <oes@users.sourceforge.net>
Date: Fri, 8 Mar 2002 16:47:50 +0000
Subject: [PATCH] Added choice beween GIF and PNG built-in images

---
 cgisimple.c | 24 ++++++++++++++++++------
 filters.c   | 15 +++++++++++----
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/cgisimple.c b/cgisimple.c
index d3e38912..67d27650 100644
--- a/cgisimple.c
+++ b/cgisimple.c
@@ -1,4 +1,4 @@
-const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.15 2002/03/06 22:54:35 jongfoster Exp $";
+const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.16 2002/03/07 03:48:38 oes Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgisimple.c,v $
@@ -36,6 +36,12 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.15 2002/03/06 22:54:35 jongfo
  *
  * Revisions   :
  *    $Log: cgisimple.c,v $
+ *    Revision 1.16  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.15  2002/03/06 22:54:35  jongfoster
  *    Automated function-comment nitpicking.
  *
@@ -380,7 +386,7 @@ jb_err cgi_send_banner(struct client_state *csp,
       return JB_ERR_MEMORY;
    }
 
-   if (enlist(rsp->headers, "Content-Type: image/png"))
+   if (enlist(rsp->headers, "Content-Type: " BUILTIN_IMAGE_MIMETYPE))
    {
       return JB_ERR_MEMORY;
    }
@@ -394,9 +400,9 @@ jb_err cgi_send_banner(struct client_state *csp,
 
 /*********************************************************************
  *
- * Function    :  cgi_transparent_png
+ * Function    :  cgi_transparent_image
  *
- * Description :  CGI function that sends a 1x1 transparent PNG.
+ * Description :  CGI function that sends a 1x1 transparent image.
  *
  * Parameters  :
  *          1  :  csp = Current client state (buffers, headers, etc...)
@@ -409,7 +415,7 @@ jb_err cgi_send_banner(struct client_state *csp,
  *                JB_ERR_MEMORY on out-of-memory error.  
  *
  *********************************************************************/
-jb_err cgi_transparent_png(struct client_state *csp,
+jb_err cgi_transparent_image(struct client_state *csp,
                            struct http_response *rsp,
                            const struct map *parameters)
 {
@@ -421,7 +427,7 @@ jb_err cgi_transparent_png(struct client_state *csp,
       return JB_ERR_MEMORY;
    }
 
-   if (enlist(rsp->headers, "Content-Type: image/png"))
+   if (enlist(rsp->headers, "Content-Type: " BUILTIN_IMAGE_MIMETYPE))
    {
       return JB_ERR_MEMORY;
    }
@@ -1071,6 +1077,12 @@ static jb_err show_defines(struct map *exports)
    if (!err) err = map_conditional(exports, "FEATURE_KILL_POPUPS", 0);
 #endif /* ndef FEATURE_KILL_POPUPS */
 
+#ifdef FEATURE_NO_GIFS
+   if (!err) err = map_conditional(exports, "FEATURE_NO_GIFS", 1);
+#else /* ifndef FEATURE_NO_GIFS */
+   if (!err) err = map_conditional(exports, "FEATURE_NO_GIFS", 0);
+#endif /* ndef FEATURE_NO_GIFS */
+
 #ifdef FEATURE_PTHREAD
    if (!err) err = map_conditional(exports, "FEATURE_PTHREAD", 1);
 #else /* ifndef FEATURE_PTHREAD */
diff --git a/filters.c b/filters.c
index 7e37c9b4..b703e1de 100644
--- a/filters.c
+++ b/filters.c
@@ -1,4 +1,4 @@
-const char filters_rcs[] = "$Id: filters.c,v 1.43 2002/01/22 23:51:59 jongfoster Exp $";
+const char filters_rcs[] = "$Id: filters.c,v 1.44 2002/03/07 03:49:31 oes Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/filters.c,v $
@@ -38,6 +38,13 @@ const char filters_rcs[] = "$Id: filters.c,v 1.43 2002/01/22 23:51:59 jongfoster
  *
  * Revisions   :
  *    $Log: filters.c,v $
+ *    Revision 1.44  2002/03/07 03:49:31  oes
+ *     - Fixed compiler warnings etc
+ *     - 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.43  2002/01/22 23:51:59  jongfoster
  *    Replacing strsav() with the safer string_append().
  *
@@ -671,7 +678,7 @@ struct http_response *block_url(struct client_state *csp)
          }
          rsp->content_length = image_logo_length;
 
-         if (enlist_unique_header(rsp->headers, "Content-Type", "image/png"))
+         if (enlist_unique_header(rsp->headers, "Content-Type", BUILTIN_IMAGE_MIMETYPE))
          {
             free_http_response(rsp);
             return cgi_error_memory();
@@ -688,7 +695,7 @@ struct http_response *block_url(struct client_state *csp)
          }
          rsp->content_length = image_blank_length;
 
-         if (enlist_unique_header(rsp->headers, "Content-Type", "image/png"))
+         if (enlist_unique_header(rsp->headers, "Content-Type", BUILTIN_IMAGE_MIMETYPE))
          {
             free_http_response(rsp);
             return cgi_error_memory();
@@ -705,7 +712,7 @@ struct http_response *block_url(struct client_state *csp)
          }
          rsp->content_length = image_pattern_length;
 
-         if (enlist_unique_header(rsp->headers, "Content-Type", "image/png"))
+         if (enlist_unique_header(rsp->headers, "Content-Type", BUILTIN_IMAGE_MIMETYPE))
          {
             free_http_response(rsp);
             return cgi_error_memory();
-- 
2.39.2