|
|
935db6e |
diff -up devil-1.7.8/src-IL/src/il_jp2.c~ devil-1.7.8/src-IL/src/il_jp2.c
|
|
|
935db6e |
--- devil-1.7.8/src-IL/src/il_jp2.c~ 2009-03-08 08:10:09.000000000 +0100
|
|
|
935db6e |
+++ devil-1.7.8/src-IL/src/il_jp2.c 2016-12-04 14:03:14.853568085 +0100
|
|
|
a77acaa |
@@ -314,22 +314,18 @@ ILboolean iLoadJp2Internal(jas_stream_t
|
|
|
a77acaa |
|
|
|
a77acaa |
|
|
|
a77acaa |
|
|
|
a77acaa |
-static int iJp2_file_read(jas_stream_obj_t *obj, char *buf, int cnt)
|
|
|
a77acaa |
+static ssize_t iJp2_file_read(void *obj, char *buf, size_t cnt)
|
|
|
a77acaa |
{
|
|
|
a77acaa |
- obj;
|
|
|
a77acaa |
return iread(buf, 1, cnt);
|
|
|
a77acaa |
}
|
|
|
a77acaa |
|
|
|
a77acaa |
-static int iJp2_file_write(jas_stream_obj_t *obj, char *buf, int cnt)
|
|
|
a77acaa |
+static ssize_t iJp2_file_write(void *obj, const char *buf, size_t cnt)
|
|
|
a77acaa |
{
|
|
|
a77acaa |
- obj;
|
|
|
a77acaa |
return iwrite(buf, 1, cnt);
|
|
|
a77acaa |
}
|
|
|
a77acaa |
|
|
|
a77acaa |
-static long iJp2_file_seek(jas_stream_obj_t *obj, long offset, int origin)
|
|
|
a77acaa |
+static long iJp2_file_seek(void *obj, long offset, int origin)
|
|
|
a77acaa |
{
|
|
|
a77acaa |
- obj;
|
|
|
a77acaa |
-
|
|
|
a77acaa |
// We could just pass origin to iseek, but this is probably more portable.
|
|
|
a77acaa |
switch (origin)
|
|
|
a77acaa |
{
|
|
|
a77acaa |
@@ -343,9 +339,8 @@ static long iJp2_file_seek(jas_stream_ob
|
|
|
a77acaa |
return 0; // Failed
|
|
|
a77acaa |
}
|
|
|
a77acaa |
|
|
|
a77acaa |
-static int iJp2_file_close(jas_stream_obj_t *obj)
|
|
|
a77acaa |
+static int iJp2_file_close(void *obj)
|
|
|
a77acaa |
{
|
|
|
a77acaa |
- obj;
|
|
|
a77acaa |
return 0; // We choose when we want to close the file.
|
|
|
a77acaa |
}
|
|
|
a77acaa |
|
|
|
935db6e |
@@ -459,7 +459,7 @@ static void jas_stream_initbuf(jas_strea
|
|
|
935db6e |
/* The buffer must be large enough to accommodate maximum
|
|
|
935db6e |
putback. */
|
|
|
935db6e |
assert(bufsize > JAS_STREAM_MAXPUTBACK);
|
|
|
935db6e |
- stream->bufbase_ = JAS_CAST(uchar *, buf);
|
|
|
935db6e |
+ stream->bufbase_ = JAS_CAST(unsigned char *, buf);
|
|
|
935db6e |
stream->bufsize_ = bufsize - JAS_STREAM_MAXPUTBACK;
|
|
|
935db6e |
}
|
|
|
935db6e |
} else {
|