X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2Fio-libjpeg.c;h=74af24acccc1d95fceba24b91554ac35be29b1ec;hb=0db6e10eac28f38bfc3b325b13ad95107c58ce1e;hp=8725610d330e5f035c00d61aa48c562c1a5c0e17;hpb=d860af7503208ba51f64733452f0ebf6fede56e9;p=libucw.git diff --git a/images/io-libjpeg.c b/images/io-libjpeg.c index 8725610d..74af24ac 100644 --- a/images/io-libjpeg.c +++ b/images/io-libjpeg.c @@ -9,13 +9,13 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/mempool.h" -#include "ucw/fastbuf.h" -#include "images/images.h" -#include "images/error.h" -#include "images/color.h" -#include "images/io-main.h" +#include +#include +#include +#include +#include +#include +#include #include #include @@ -446,7 +446,7 @@ libjpeg_read_data(struct image_io *io) # define IMAGE_WALK_COL_STEP 2 # define IMAGE_WALK_DO_ROW_START do{ src = buf; jpeg_read_scanlines(&i->cinfo, (JSAMPLE **)&src, 1); }while(0) # define IMAGE_WALK_DO_STEP do{ walk_pos[0] = *src++; walk_pos[1] = 255; }while(0) -# include "images/image-walk.h" +# include } break; case 4: /* * -> *+Alpha or aligned * */ @@ -460,7 +460,7 @@ libjpeg_read_data(struct image_io *io) # define IMAGE_WALK_COL_STEP 4 # define IMAGE_WALK_DO_ROW_START do{ src = buf; jpeg_read_scanlines(&i->cinfo, (JSAMPLE **)&src, 1); }while(0) # define IMAGE_WALK_DO_STEP do{ *(u32 *)walk_pos = *(u32 *)src; walk_pos[3] = 255; src += 3; }while(0) -# include "images/image-walk.h" +# include } break; default: @@ -577,7 +577,7 @@ libjpeg_write(struct image_io *io) # define IMAGE_WALK_COL_STEP 2 # define IMAGE_WALK_DO_ROW_END do{ dest = buf; jpeg_write_scanlines(&i.cinfo, (JSAMPLE **)&dest, 1); }while(0) # define IMAGE_WALK_DO_STEP do{ *dest++ = walk_pos[0]; }while(0) -# include "images/image-walk.h" +# include break; } case 4: /* *+Alpha or aligned * -> * */ @@ -591,7 +591,7 @@ libjpeg_write(struct image_io *io) # define IMAGE_WALK_COL_STEP 4 # define IMAGE_WALK_DO_ROW_END do{ dest = buf; jpeg_write_scanlines(&i.cinfo, (JSAMPLE **)&dest, 1); }while(0) # define IMAGE_WALK_DO_STEP do{ *dest++ = walk_pos[0]; *dest++ = walk_pos[1]; *dest++ = walk_pos[2]; }while(0) -# include "images/image-walk.h" +# include break; } default: