+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/*
+ * Callbacks for sources that are a fixed size buffer
+ */
+
+/*
+=item buffer_read(ig, buf, count)
+
+Does the reading from a buffer source
+
+ ig - io_glue object
+ buf - buffer to return data in
+ count - number of bytes to read into buffer max
+
+=cut
+*/
+
+static
+ssize_t
+buffer_read(io_glue *ig, void *buf, size_t count) {
+ io_ex_buffer *ieb = ig->exdata;
+ char *cbuf = buf;
+
+ IOL_DEB( printf("buffer_read: fd = %d, ier->cpos = %ld, buf = %p, count = %d\n", fd, (long) ier->cpos, buf, count) );
+
+ if ( ieb->cpos+count > ig->source.buffer.len ) {
+ mm_log((1,"buffer_read: short read: cpos=%d, len=%d, count=%d\n", ieb->cpos, ig->source.buffer.len));
+ count = ig->source.buffer.len - ieb->cpos;
+ }
+
+ memcpy(buf, ig->source.buffer.data+ieb->cpos, count);
+ ieb->cpos += count;
+ IOL_DEB( printf("buffer_read: rc = %d, count = %d\n", rc, count) );
+ return count;
+}
+
+
+/*
+=item buffer_write(ig, buf, count)
+
+Does nothing, returns -1
+
+ ig - io_glue object
+ buf - buffer that contains data
+ count - number of bytes to write
+
+=cut
+*/
+
+static
+ssize_t
+buffer_write(io_glue *ig, const void *buf, size_t count) {
+ mm_log((1, "buffer_write called, this method should never be called.\n"));
+ return -1;
+}
+
+
+/*
+=item buffer_close(ig)
+
+Closes a source that can be seeked on. Not sure if this should be an actual close
+or not. Does nothing for now. Should be fixed.
+
+ ig - data source
+
+=cut
+*/
+
+static
+void
+buffer_close(io_glue *ig) {
+ mm_log((1, "buffer_close(ig %p)\n", ig));
+ /* FIXME: Do stuff here */
+}
+
+
+/* buffer_seek(ig, offset, whence)
+
+Implements seeking for a buffer source.
+
+ ig - data source
+ offset - offset into stream
+ whence - whence argument a la lseek
+
+=cut
+*/
+
+static
+off_t
+buffer_seek(io_glue *ig, off_t offset, int whence) {
+ io_ex_buffer *ieb = ig->exdata;
+ off_t reqpos = offset
+ + (whence == SEEK_CUR)*ieb->cpos
+ + (whence == SEEK_END)*ig->source.buffer.len;
+
+ if (reqpos > ig->source.buffer.len) {
+ mm_log((1, "seeking out of readable range\n"));
+ return (off_t)-1;
+ }
+
+ ieb->cpos = reqpos;
+ IOL_DEB( printf("buffer_seek(ig %p, offset %ld, whence %d)\n", ig, (long) offset, whence) );
+
+ return reqpos;
+ /* FIXME: How about implementing this offset handling stuff? */
+}
+
+
+
+
+
/*
* Callbacks for sources that are a chain of variable sized buffers
*/
void
io_destroy_bufchain(io_ex_bchain *ieb) {
- io_blink *cp = ieb->head;
+ io_blink *cp;
+ mm_log((1, "io_destroy_bufchain(ieb %p)\n", ieb));
+ cp = ieb->head;
+
while(cp) {
io_blink *t = cp->next;
- free(cp);
+ myfree(cp);
cp = t;
}
}
*/
void
-io_obj_setp_buffer(io_obj *io, void *p, size_t len) {
- io->buffer.type = BUFFER;
- io->buffer.c = (char*) p;
- io->buffer.len = len;
+io_obj_setp_buffer(io_obj *io, char *p, size_t len, closebufp closecb, void *closedata) {
+ io->buffer.type = BUFFER;
+ io->buffer.data = p;
+ io->buffer.len = len;
+ io->buffer.closecb = closecb;
+ io->buffer.closedata = closedata;
}
/*
-=item io_obj_setp_cbuf(io, p)
+=item io_obj_setp_buchain(io)
Sets an io_object for reading/writing from a buffer source
}
break;
case CBSEEK:
- default:
{
io_ex_rseek *ier = mymalloc(sizeof(io_ex_rseek));
ig->seekcb = realseek_seek;
ig->closecb = realseek_close;
}
+ break;
+ case BUFFER:
+ {
+ io_ex_buffer *ieb = mymalloc(sizeof(io_ex_buffer));
+ ieb->offset = 0;
+ ieb->cpos = 0;
+
+ ig->exdata = ieb;
+ ig->readcb = buffer_read;
+ ig->writecb = buffer_write;
+ ig->seekcb = buffer_seek;
+ ig->closecb = buffer_close;
+ }
+ break;
+ default:
}
}
io_glue *
io_new_bufchain() {
- io_glue *ig = mymalloc(sizeof(io_glue));
+ io_glue *ig;
+ mm_log((1, "io_new_bufchain()\n"));
+ ig = mymalloc(sizeof(io_glue));
io_obj_setp_bufchain(&ig->source);
return ig;
}
+/*
+=item io_new_buffer(data, len)
+
+Returns a new io_glue object that has the source defined as reading
+from specified buffer. Note that the buffer is not copied.
+
+ data - buffer to read from
+ len - length of buffer
+=cut
+*/
+
+io_glue *
+io_new_buffer(char *data, size_t len, closebufp closecb, void *closedata) {
+ io_glue *ig;
+ mm_log((1, "io_new_buffer(data %p, len %d, closecb %p, closedata %p)\n", data, len, closecb, closedata));
+ ig = mymalloc(sizeof(io_glue));
+ memset(ig, 0, sizeof(*ig));
+ io_obj_setp_buffer(&ig->source, data, len, closecb, closedata);
+ return ig;
+}
/*
io_glue *
io_new_fd(int fd) {
- io_glue *ig = mymalloc(sizeof(io_glue));
+ io_glue *ig;
+ mm_log((1, "io_new_fd(fd %d)\n", fd));
+ ig = mymalloc(sizeof(io_glue));
memset(ig, 0, sizeof(*ig));
#ifdef _MSC_VER
io_obj_setp_cb(&ig->source, (void*)fd, _read, _write, _lseek);
#else
io_obj_setp_cb(&ig->source, (void*)fd, read, write, lseek);
#endif
+ mm_log((1, "(%p) <- io_new_fd\n", ig));
return ig;
}
{
io_ex_bchain *ieb = ig->exdata;
io_destroy_bufchain(ieb);
+ myfree(ieb);
}
break;
case CBSEEK:
io_ex_rseek *ier = ig->exdata;
myfree(ier);
}
-
+ break;
+ case BUFFER:
+ {
+ io_ex_buffer *ieb = ig->exdata;
+ if (ig->source.buffer.closecb) {
+ mm_log((1,"calling close callback %p for io_buffer\n", ig->source.buffer.closecb));
+ ig->source.buffer.closecb(ig->source.buffer.closedata);
+ }
+ myfree(ieb);
+ }
+ break;
}
myfree(ig);
}
typedef void (*closep)(struct _io_glue *ig);
typedef ssize_t(*sizep) (struct _io_glue *ig);
+typedef void (*closebufp)(void *p);
/* Callbacks we get */
off_t gpos; /* Global position in stream */
} io_ex_bchain;
+typedef struct {
+ off_t offset; /* Offset of the source - not used */
+ off_t cpos; /* Offset within the current */
+} io_ex_buffer;
+
+
/* Structures to describe data sources */
typedef struct {
io_type type; /* Must be first parameter */
char *name; /* Data source name */
- char *c;
+ char *data;
size_t len;
+ closebufp closecb; /* free memory mapped segment or decrement refcount */
+ void *closedata;
} io_buffer;
typedef struct {
sizep sizecb;
} io_glue;
-void io_obj_setp_buffer (io_obj *io, void *p, size_t len);
+void io_obj_setp_buffer(io_obj *io, char *p, size_t len, closebufp closecb, void *closedata);
void io_obj_setp_cb (io_obj *io, void *p, readl readcb, writel writecb, seekl seekcb);
void io_glue_commit_types(io_glue *ig);
void io_glue_gettypes (io_glue *ig, int reqmeth);
/* XS functions */
io_glue *io_new_fd(int fd);
io_glue *io_new_bufchain(void);
+io_glue *io_new_buffer(char *data, size_t len, closebufp closecb, void *closedata);
size_t io_slurp(io_glue *ig, unsigned char **c);
void io_glue_DESTROY(io_glue *ig);
--- /dev/null
+BEGIN { $|=1; print "1..7\n"; }
+END { print "not ok 1\n" unless $loaded; };
+use Imager qw(:all);
+++$loaded;
+print "ok 1\n";
+init_log("testout/t07iolayer.log", 1);
+
+
+undef($/);
+# start by testing io buffer
+
+$data="P2\n2 2\n255\n 255 0\n0 255\n";
+$IO = Imager::io_new_buffer($data);
+$im = Imager::i_readpnm_wiol($IO, -1);
+
+print "ok 2\n";
+
+
+open(FH, ">testout/t07.ppm") or die $!;
+binmode(FH);
+$fd = fileno(FH);
+$IO2 = Imager::io_new_fd( $fd );
+Imager::i_writeppm_wiol($im, $IO2);
+close(FH);
+undef($im);
+
+
+
+open(FH, "<testimg/penguin-base.ppm");
+$data = <FH>;
+close(FH);
+$IO3 = Imager::io_new_buffer($data);
+#undef($data);
+$im = Imager::i_readpnm_wiol($IO3, -1);
+
+print "ok 3\n";
+
+
+open(FH, "<testimg/penguin-base.ppm") or die $!;
+binmode(FH);
+$fd = fileno(FH);
+$IO4 = Imager::io_new_fd( $fd );
+$im2 = Imager::i_readpnm_wiol($IO4, -1);
+close(FH);
+undef($IO4);
+
+print "ok 4\n";
+
+Imager::i_img_diff($im, $im2) ? print "not ok 5\n" : print "ok 5\n";
+undef($im2);
+
+
+$IO5 = Imager::io_new_bufchain();
+Imager::i_writeppm_wiol($im, $IO5);
+$data2 = Imager::io_slurp($IO5);
+undef($IO5);
+
+print "ok 6\n";
+
+$IO6 = Imager::io_new_buffer($data2);
+$im3 = Imager::i_readpnm_wiol($IO6, -1);
+
+Imager::i_img_diff($im, $im3) ? print "not ok 7\n" : print "ok 7\n";
+
+
+
+
projects / imager.git / commitdiff