summaryrefslogtreecommitdiff
path: root/jpeg
diff options
context:
space:
mode:
authorFabien Costantini <fabien@onepost.net>2012-04-24 03:34:26 +0000
committerFabien Costantini <fabien@onepost.net>2012-04-24 03:34:26 +0000
commitd90b170c8da99402619b4fcc091aeef66a29b691 (patch)
tree8977a259f73d99835f0d0367f16cd1c3372e7b72 /jpeg
parent36c52ce810dc569e8c95acffa65a31ae63d67f83 (diff)
Fixed more warnings in VC2010 32+64 bits builds
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9395 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'jpeg')
-rw-r--r--jpeg/jdatadst.c2
-rw-r--r--jpeg/jmemmgr.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/jpeg/jdatadst.c b/jpeg/jdatadst.c
index 472d5f324..e58fe6616 100644
--- a/jpeg/jdatadst.c
+++ b/jpeg/jdatadst.c
@@ -182,7 +182,7 @@ term_mem_destination (j_compress_ptr cinfo)
my_mem_dest_ptr dest = (my_mem_dest_ptr) cinfo->dest;
*dest->outbuffer = dest->buffer;
- *dest->outsize = dest->bufsize - dest->pub.free_in_buffer;
+ *dest->outsize = (unsigned long) (dest->bufsize - dest->pub.free_in_buffer);
}
diff --git a/jpeg/jmemmgr.c b/jpeg/jmemmgr.c
index d801b322d..78387cf9b 100644
--- a/jpeg/jmemmgr.c
+++ b/jpeg/jmemmgr.c
@@ -303,7 +303,7 @@ alloc_small (j_common_ptr cinfo, int pool_id, size_t sizeofobject)
if (slop < MIN_SLOP) /* give up when it gets real small */
out_of_memory(cinfo, 2); /* jpeg_get_small failed */
}
- mem->total_space_allocated += min_request + slop;
+ mem->total_space_allocated += (long) (min_request + slop);
/* Success, initialize the new pool header and add to end of list */
hdr_ptr->hdr.next = NULL;
hdr_ptr->hdr.bytes_used = 0;
@@ -363,7 +363,7 @@ alloc_large (j_common_ptr cinfo, int pool_id, size_t sizeofobject)
SIZEOF(large_pool_hdr));
if (hdr_ptr == NULL)
out_of_memory(cinfo, 4); /* jpeg_get_large failed */
- mem->total_space_allocated += sizeofobject + SIZEOF(large_pool_hdr);
+ mem->total_space_allocated += (long) (sizeofobject + SIZEOF(large_pool_hdr));
/* Success, initialize the new pool header and add to list */
hdr_ptr->hdr.next = mem->large_list[pool_id];
@@ -973,7 +973,7 @@ free_pool (j_common_ptr cinfo, int pool_id)
lhdr_ptr->hdr.bytes_left +
SIZEOF(large_pool_hdr);
jpeg_free_large(cinfo, (void FAR *) lhdr_ptr, space_freed);
- mem->total_space_allocated -= space_freed;
+ mem->total_space_allocated -= (long) space_freed;
lhdr_ptr = next_lhdr_ptr;
}
@@ -987,7 +987,7 @@ free_pool (j_common_ptr cinfo, int pool_id)
shdr_ptr->hdr.bytes_left +
SIZEOF(small_pool_hdr);
jpeg_free_small(cinfo, (void *) shdr_ptr, space_freed);
- mem->total_space_allocated -= space_freed;
+ mem->total_space_allocated -= (long) space_freed;
shdr_ptr = next_shdr_ptr;
}
}