#undef LOCAL_DEBUG
-#include "lib/lib.h"
-#include "lib/mempool.h"
-#include "lib/fastbuf.h"
-#include "images/images.h"
-#include "images/error.h"
-#include "images/color.h"
-#include "images/io-main.h"
+#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 <png.h>
#include <setjmp.h>
static png_voidp
libpng_malloc(png_structp png_ptr, png_size_t size)
{
- DBG("libpng_malloc(size=%u)", (uns)size);
+ DBG("libpng_malloc(size=%u)", (uint)size);
return mp_alloc(png_get_mem_ptr(png_ptr), size);
}
static void
libpng_read_fn(png_structp png_ptr, png_bytep data, png_size_t length)
{
- DBG("libpng_read_fn(len=%u)", (uns)length);
+ DBG("libpng_read_fn(len=%u)", (uint)length);
if (unlikely(bread((struct fastbuf *)png_get_io_ptr(png_ptr), (byte *)data, length) < length))
png_error(png_ptr, "Incomplete data");
}
static void
libpng_write_fn(png_structp png_ptr, png_bytep data, png_size_t length)
{
- DBG("libpng_write_fn(len=%u)", (uns)length);
+ DBG("libpng_write_fn(len=%u)", (uint)length);
bwrite((struct fastbuf *)png_get_io_ptr(png_ptr), (byte *)data, length);
}
return 0;
}
- uns read_flags = io->flags;
-
+ uint read_flags = io->flags;
+
/* Apply transformations */
if (rd->bit_depth == 16)
png_set_strip_16(rd->png_ptr);
read_flags = (read_flags & IMAGE_CHANNELS_FORMAT) | IMAGE_ALPHA;
else
png_set_strip_alpha(rd->png_ptr);
- }
+ }
break;
case PNG_COLOR_TYPE_RGB:
if ((read_flags & IMAGE_COLOR_SPACE) == COLOR_SPACE_GRAYSCALE)
struct image *img = rdi.image;
byte *pixels = img->pixels;
png_bytep rows[img->rows];
- for (uns r = 0; r < img->rows; r++, pixels += img->row_size)
+ for (uint r = 0; r < img->rows; r++, pixels += img->row_size)
rows[r] = (png_bytep)pixels;
png_read_image(rd->png_ptr, rows);
png_read_end(rd->png_ptr, rd->end_ptr);
/* Write pixels */
byte *pixels = img->pixels;
png_bytep rows[img->rows];
- for (uns r = 0; r < img->rows; r++, pixels += img->row_size)
+ for (uint r = 0; r < img->rows; r++, pixels += img->row_size)
rows[r] = (png_bytep)pixels;
png_write_image(png_ptr, rows);
png_write_end(png_ptr, info_ptr);