update bmp.c to IMAGER_NO_CONTEXT

diff --git a/bmp.c b/bmp.c
index 4f770b8080328e6a3dc111d84b84126e3a98f350..10e463cf39f8458d1e716618c911b7d16faf48e6 100644 (file)
--- a/bmp.c
+++ b/bmp.c
@@ -1,3 +1,4 @@
+#define IMAGER_NO_CONTEXT

 #include <stdarg.h>
 #include "imageri.h"
 
 #include <stdarg.h>
 #include "imageri.h"
 


@@ -76,6 +77,7 @@ Never compresses the image.
 */
 int
 i_writebmp_wiol(i_img *im, io_glue *ig) {
 */
 int
 i_writebmp_wiol(i_img *im, io_glue *ig) {

+  dIMCTXim(im);

   i_clear_error();
 
   /* pick a format */
   i_clear_error();
 
   /* pick a format */


@@ -116,8 +118,9 @@ i_readbmp_wiol(io_glue *ig, int allow_incomplete) {
   i_packed_t xsize, ysize, planes, bit_count, compression, size_image, xres, yres;
   i_packed_t clr_used, clr_important, offbits;
   i_img *im;
   i_packed_t xsize, ysize, planes, bit_count, compression, size_image, xres, yres;
   i_packed_t clr_used, clr_important, offbits;
   i_img *im;

+  dIMCTXio(ig);

 
 

-  mm_log((1, "i_readbmp_wiol(ig %p)\n", ig));
+  im_log((aIMCTX, 1, "i_readbmp_wiol(ig %p)\n", ig));

   
   i_clear_error();
 
   
   i_clear_error();
 


@@ -135,7 +138,7 @@ i_readbmp_wiol(io_glue *ig, int allow_incomplete) {
     return 0;
   }
 
     return 0;
   }
 

-  mm_log((1, " bmp header: filesize %d offbits %d xsize %d ysize %d planes %d "
+  im_log((aIMCTX, 1, " bmp header: filesize %d offbits %d xsize %d ysize %d planes %d "

           "bit_count %d compression %d size %d xres %d yres %d clr_used %d "
           "clr_important %d\n", (int)filesize, (int)offbits, (int)xsize,
          (int)ysize, (int)planes, (int)bit_count, (int)compression, 
           "bit_count %d compression %d size %d xres %d yres %d clr_used %d "
           "clr_important %d\n", (int)filesize, (int)offbits, (int)xsize,
          (int)ysize, (int)planes, (int)bit_count, (int)compression, 


@@ -143,7 +146,7 @@ i_readbmp_wiol(io_glue *ig, int allow_incomplete) {
           (int)clr_important));
 
   if (!i_int_check_image_file_limits(xsize, abs(ysize), 3, sizeof(i_sample_t))) {
           (int)clr_important));
 
   if (!i_int_check_image_file_limits(xsize, abs(ysize), 3, sizeof(i_sample_t))) {

-    mm_log((1, "i_readbmp_wiol: image size exceeds limits\n"));
+    im_log((aIMCTX, 1, "i_readbmp_wiol: image size exceeds limits\n"));

     return NULL;
   }
   
     return NULL;
   }
   


@@ -171,7 +174,7 @@ i_readbmp_wiol(io_glue *ig, int allow_incomplete) {
     break;
 
   default:
     break;
 
   default:

-    i_push_errorf(0, "unknown bit count for BMP file (%d)", (int)bit_count);
+    im_push_errorf(aIMCTX, 0, "unknown bit count for BMP file (%d)", (int)bit_count);

     return NULL;
   }
 
     return NULL;
   }
 


@@ -273,7 +276,10 @@ read_packed(io_glue *ig, char *format, ...) {
       break;
       
     default:
       break;
       
     default:

-      i_fatal(1, "Unknown read_packed format code 0x%02x", code);
+      {
+       dIMCTXio(ig);
+       im_fatal(aIMCTX, 1, "Unknown read_packed format code 0x%02x", code);
+      }

     }
   }
   return 1;
     }
   }
   return 1;


@@ -325,7 +331,10 @@ write_packed(io_glue *ig, char *format, ...) {
       break;
 
     default:
       break;
 
     default:

-      i_fatal(1, "Unknown write_packed format code 0x%02x", *format);
+      {
+       dIMCTXio(ig);
+       im_fatal(aIMCTX, 1, "Unknown write_packed format code 0x%02x", *format);
+      }

     }
     ++format;
   }
     }
     ++format;
   }


@@ -350,6 +359,7 @@ int write_bmphead(io_glue *ig, i_img *im, int bit_count, int data_size) {
   int got_xres, got_yres, aspect_only;
   int colors_used = 0;
   int offset = FILEHEAD_SIZE + INFOHEAD_SIZE;
   int got_xres, got_yres, aspect_only;
   int colors_used = 0;
   int offset = FILEHEAD_SIZE + INFOHEAD_SIZE;

+  dIMCTXim(im);

 
   if (im->xsize > SIGNMAX32 || im->ysize > SIGNMAX32) {
     i_push_error(0, "image too large to write to BMP");
 
   if (im->xsize > SIGNMAX32 || im->ysize > SIGNMAX32) {
     i_push_error(0, "image too large to write to BMP");


@@ -451,6 +461,7 @@ write_1bit_data(io_glue *ig, i_img *im) {
   int line_size = (im->xsize+7) / 8;
   int x, y;
   int unpacked_size;
   int line_size = (im->xsize+7) / 8;
   int x, y;
   int unpacked_size;

+  dIMCTXim(im);

 
   /* round up to nearest multiple of four */
   line_size = (line_size + 3) / 4 * 4;
 
   /* round up to nearest multiple of four */
   line_size = (line_size + 3) / 4 * 4;


@@ -522,6 +533,7 @@ write_4bit_data(io_glue *ig, i_img *im) {
   int line_size = (im->xsize+1) / 2;
   int x, y;
   int unpacked_size;
   int line_size = (im->xsize+1) / 2;
   int x, y;
   int unpacked_size;

+  dIMCTXim(im);

 
   /* round up to nearest multiple of four */
   line_size = (line_size + 3) / 4 * 4;
 
   /* round up to nearest multiple of four */
   line_size = (line_size + 3) / 4 * 4;


@@ -580,6 +592,7 @@ write_8bit_data(io_glue *ig, i_img *im) {
   int line_size = im->xsize;
   int y;
   int unpacked_size;
   int line_size = im->xsize;
   int y;
   int unpacked_size;

+  dIMCTXim(im);

 
   /* round up to nearest multiple of four */
   line_size = (line_size + 3) / 4 * 4;
 
   /* round up to nearest multiple of four */
   line_size = (line_size + 3) / 4 * 4;


@@ -627,6 +640,7 @@ write_24bit_data(io_glue *ig, i_img *im) {
   int y;
   int line_size = 3 * im->xsize;
   i_color bg;
   int y;
   int line_size = 3 * im->xsize;
   i_color bg;

+  dIMCTXim(im);

 
   i_get_file_background(im, &bg);
 
 
   i_get_file_background(im, &bg);
 


@@ -681,6 +695,7 @@ read_bmp_pal(io_glue *ig, i_img *im, int count) {
   int i;
   i_packed_t r, g, b, x;
   i_color c;
   int i;
   i_packed_t r, g, b, x;
   i_color c;

+  dIMCTXio(ig);

   
   for (i = 0; i < count; ++i) {
     if (!read_packed(ig, "CCCC", &b, &g, &r, &x)) {
   
   for (i = 0; i < count; ++i) {
     if (!read_packed(ig, "CCCC", &b, &g, &r, &x)) {


@@ -719,9 +734,10 @@ read_1bit_bmp(io_glue *ig, int xsize, int ysize, int clr_used,
   int bit;
   unsigned char *in;
   long base_offset;
   int bit;
   unsigned char *in;
   long base_offset;

+  dIMCTXio(ig);

 
   if (compression != BI_RGB) {
 
   if (compression != BI_RGB) {

-    i_push_errorf(0, "unknown 1-bit BMP compression (%d)", compression);
+    im_push_errorf(aIMCTX, 0, "unknown 1-bit BMP compression (%d)", compression);

     return NULL;
   }
 
     return NULL;
   }
 


@@ -847,6 +863,7 @@ read_4bit_bmp(io_glue *ig, int xsize, int ysize, int clr_used,
   int size, i;
   long base_offset;
   int starty;
   int size, i;
   long base_offset;
   int starty;

+  dIMCTXio(ig);

 
   /* line_size is going to be smaller than xsize in most cases (and
      when it's not, xsize is itself small), and hence not overflow */
 
   /* line_size is going to be smaller than xsize in most cases (and
      when it's not, xsize is itself small), and hence not overflow */


@@ -967,7 +984,7 @@ read_4bit_bmp(io_glue *ig, int xsize, int ysize, int clr_used,
          myfree(packed);
          myfree(line);
          i_push_error(0, "invalid data during decompression");
          myfree(packed);
          myfree(line);
          i_push_error(0, "invalid data during decompression");

-         mm_log((1, "read 4-bit: scanline overflow x %d + count %d vs xlimit %d (y %d)\n",
+         im_log((aIMCTX, 1, "read 4-bit: scanline overflow x %d + count %d vs xlimit %d (y %d)\n",

                  (int)x, count, (int)xlimit, (int)y));
          i_img_destroy(im);
          return NULL;
                  (int)x, count, (int)xlimit, (int)y));
          i_img_destroy(im);
          return NULL;


@@ -1017,7 +1034,7 @@ read_4bit_bmp(io_glue *ig, int xsize, int ysize, int clr_used,
            myfree(packed);
            myfree(line);
            i_push_error(0, "invalid data during decompression");
            myfree(packed);
            myfree(line);
            i_push_error(0, "invalid data during decompression");

-           mm_log((1, "read 4-bit: scanline overflow (unpacked) x %d + count %d vs xlimit %d (y %d)\n",
+           im_log((aIMCTX, 1, "read 4-bit: scanline overflow (unpacked) x %d + count %d vs xlimit %d (y %d)\n",

                  (int)x, count, (int)xlimit, (int)y));
            i_img_destroy(im);
            return NULL;
                  (int)x, count, (int)xlimit, (int)y));
            i_img_destroy(im);
            return NULL;


@@ -1077,6 +1094,7 @@ read_8bit_bmp(io_glue *ig, int xsize, int ysize, int clr_used,
   i_palidx *line;
   int line_size = xsize;
   long base_offset;
   i_palidx *line;
   int line_size = xsize;
   long base_offset;

+  dIMCTXio(ig);

 
   line_size = (line_size+3) / 4 * 4;
   if (line_size < xsize) { /* if it overflowed (unlikely, but check) */
 
   line_size = (line_size+3) / 4 * 4;
   if (line_size < xsize) { /* if it overflowed (unlikely, but check) */


@@ -1322,6 +1340,7 @@ read_direct_bmp(io_glue *ig, int xsize, int ysize, int bit_count,
   const char *compression_name;
   int bytes;
   long base_offset = FILEHEAD_SIZE + INFOHEAD_SIZE;
   const char *compression_name;
   int bytes;
   long base_offset = FILEHEAD_SIZE + INFOHEAD_SIZE;

+  dIMCTXio(ig);

   
   unpack_code[0] = *("v3V"+pix_size-2);
   unpack_code[1] = '\0';
   
   unpack_code[0] = *("v3V"+pix_size-2);
   unpack_code[1] = '\0';