changeset 1964:7c7ff4d0202b

clearer MSG for suspicious image size I saw a MSG with size 0x[something], and of course I thought it was complaining that a size was given in hex notation.
author corvid <corvid@lavabit.com>
date Mon, 04 Apr 2011 17:56:15 +0000
parents 159ae640c8b1
children 58c7f6c80d2f
files dw/fltkimgbuf.cc src/gif.c src/html.cc src/jpeg.c src/png.c
diffstat 5 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/dw/fltkimgbuf.cc	Sun Apr 03 21:25:53 2011 +0200
+++ b/dw/fltkimgbuf.cc	Mon Apr 04 17:56:15 2011 +0000
@@ -193,7 +193,7 @@
     */
    if (width <= 0 || height <= 0 ||
        width > IMAGE_MAX_AREA / height) {
-      MSG("FltkImgbuf::getScaledBuf: suspicious image size request %dx%d\n",
+      MSG("FltkImgbuf::getScaledBuf: suspicious image size request %d x %d\n",
            width, height);
       ref ();
       return this;
--- a/src/gif.c	Sun Apr 03 21:25:53 2011 +0200
+++ b/src/gif.c	Mon Apr 04 17:56:15 2011 +0000
@@ -804,7 +804,7 @@
    /* check max image size */
    if (gif->Width <= 0 || gif->Height <= 0 ||
        gif->Width > IMAGE_MAX_AREA / gif->Height) {
-      MSG("Gif_do_img_desc: suspicious image size request %ux%u\n",
+      MSG("Gif_do_img_desc: suspicious image size request %u x %u\n",
           gif->Width, gif->Height);
       gif->state = 999;
       return 0;
--- a/src/html.cc	Sun Apr 03 21:25:53 2011 +0200
+++ b/src/html.cc	Mon Apr 04 17:56:15 2011 +0000
@@ -2044,7 +2044,7 @@
       dFree(width_ptr);
       dFree(height_ptr);
       width_ptr = height_ptr = NULL;
-      MSG("a_Html_image_new: suspicious image size request %dx%d\n", w, h);
+      MSG("a_Html_image_new: suspicious image size request %d x %d\n", w, h);
    } else {
       if (CSS_LENGTH_TYPE(l_w) != CSS_LENGTH_TYPE_AUTO)
          html->styleEngine->setNonCssHint (CSS_PROPERTY_WIDTH,
--- a/src/jpeg.c	Sun Apr 03 21:25:53 2011 +0200
+++ b/src/jpeg.c	Mon Apr 04 17:56:15 2011 +0000
@@ -291,7 +291,7 @@
          if (jpeg->cinfo.image_width <= 0 || jpeg->cinfo.image_height <= 0 ||
              jpeg->cinfo.image_width >
              IMAGE_MAX_AREA / jpeg->cinfo.image_height) {
-            MSG("Jpeg_write: suspicious image size request %ux%u\n",
+            MSG("Jpeg_write: suspicious image size request %u x %u\n",
                 (uint_t)jpeg->cinfo.image_width,
                 (uint_t)jpeg->cinfo.image_height);
             jpeg->state = DILLO_JPEG_ERROR;
--- a/src/png.c	Sun Apr 03 21:25:53 2011 +0200
+++ b/src/png.c	Mon Apr 04 17:56:15 2011 +0000
@@ -137,7 +137,7 @@
    /* check max image size */
    if (png->width == 0 || png->height == 0 ||
        png->width > IMAGE_MAX_AREA / png->height) {
-      MSG("Png_datainfo_callback: suspicious image size request %lux%lu\n",
+      MSG("Png_datainfo_callback: suspicious image size request %lu x %lu\n",
           (ulong_t) png->width, (ulong_t) png->height);
       Png_error_handling(png_ptr, "Aborting...");
       return; /* not reached */