[prev in list] [next in list] [prev in thread] [next in thread]
List: graphicsmagick-commit
Subject: [GM-commit] GraphicsMagick: Reduce compilation warnings when compiling for W...
From: GraphicsMagick Commits <graphicsmagick-commit () lists ! sourceforge ! net>
Date: 2016-08-21 20:40:42
Message-ID: hg.f2146002d791.1471812042.2950750188400161634 () src ! simplesystems ! org
[Download RAW message or body]
changeset f2146002d791 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=f2146002d791
summary: Reduce compilation warnings when compiling for WIN64 using Visual Studio 2015
diffstat:
VisualMagick/libxml/LIBRARY.txt | 1 +
VisualMagick/magick/LIBRARY.txt | 1 +
bzlib/bzlib.c | 6 +++---
bzlib/compress.c | 2 +-
coders/meta.c | 4 ++--
dcraw/dcraw.c | 3 +++
jbig/libjbig/jbig.c | 2 +-
jpeg/jdatadst.c | 2 +-
jpeg/jmemmgr.c | 8 ++++----
libxml/config.h | 9 +++++++++
libxml/parser.c | 2 +-
ttf/src/truetype/ttgload.c | 9 +++++++++
ttf/src/type1/t1driver.c | 9 +++++++++
13 files changed, 45 insertions(+), 13 deletions(-)
diffs (227 lines):
diff -r de6b78dfd868 -r f2146002d791 VisualMagick/libxml/LIBRARY.txt
--- a/VisualMagick/libxml/LIBRARY.txt Sun Aug 21 13:11:14 2016 -0500
+++ b/VisualMagick/libxml/LIBRARY.txt Sun Aug 21 15:40:34 2016 -0500
@@ -2,6 +2,7 @@
DEFINE = _XMLLIB_
DEFINE = _CRT_SECURE_NO_WARNINGS
DEFINE = _CRT_NONSTDC_NO_WARNINGS
+DEFINE = _WINSOCK_DEPRECATED_NO_WARNINGS
##### EXPORTSDEF = ..\..\libxml\libxml2.def
EXCLUDE = runsuite.c
EXCLUDE = runtest.c
diff -r de6b78dfd868 -r f2146002d791 VisualMagick/magick/LIBRARY.txt
--- a/VisualMagick/magick/LIBRARY.txt Sun Aug 21 13:11:14 2016 -0500
+++ b/VisualMagick/magick/LIBRARY.txt Sun Aug 21 15:40:34 2016 -0500
@@ -2,3 +2,4 @@
DEFINE = _MAGICKLIB_
DEFINE = _CRT_SECURE_NO_WARNINGS
DEFINE = _CRT_NONSTDC_NO_WARNINGS
+DEFINE = _WINSOCK_DEPRECATED_NO_WARNINGS
\ No newline at end of file
diff -r de6b78dfd868 -r f2146002d791 bzlib/bzlib.c
--- a/bzlib/bzlib.c Sun Aug 21 13:11:14 2016 -0500
+++ b/bzlib/bzlib.c Sun Aug 21 15:40:34 2016 -0500
@@ -992,7 +992,7 @@
if (bzf->strm.avail_out < BZ_MAX_UNUSED) {
n = BZ_MAX_UNUSED - bzf->strm.avail_out;
- n2 = fwrite ( (void*)(bzf->buf), sizeof(UChar),
+ n2 = (Int32) fwrite ( (void*)(bzf->buf), sizeof(UChar),
n, bzf->handle );
if (n != n2 || ferror(bzf->handle))
{ BZ_SETERR(BZ_IO_ERROR); return; };
@@ -1051,7 +1051,7 @@
if (bzf->strm.avail_out < BZ_MAX_UNUSED) {
n = BZ_MAX_UNUSED - bzf->strm.avail_out;
- n2 = fwrite ( (void*)(bzf->buf), sizeof(UChar),
+ n2 = (Int32) fwrite ( (void*)(bzf->buf), sizeof(UChar),
n, bzf->handle );
if (n != n2 || ferror(bzf->handle))
{ BZ_SETERR(BZ_IO_ERROR); return; };
@@ -1186,7 +1186,7 @@
{ BZ_SETERR(BZ_IO_ERROR); return 0; };
if (bzf->strm.avail_in == 0 && !myfeof(bzf->handle)) {
- n = fread ( bzf->buf, sizeof(UChar),
+ n = (Int32) fread ( bzf->buf, sizeof(UChar),
BZ_MAX_UNUSED, bzf->handle );
if (ferror(bzf->handle))
{ BZ_SETERR(BZ_IO_ERROR); return 0; };
diff -r de6b78dfd868 -r f2146002d791 bzlib/compress.c
--- a/bzlib/compress.c Sun Aug 21 13:11:14 2016 -0500
+++ b/bzlib/compress.c Sun Aug 21 15:40:34 2016 -0500
@@ -202,7 +202,7 @@
*ryy_j = rtmp2;
};
yy[0] = rtmp;
- j = ryy_j - &(yy[0]);
+ j = (Int32) (ryy_j - &(yy[0]));
mtfv[wr] = j+1; wr++; s->mtfFreq[j+1]++;
}
diff -r de6b78dfd868 -r f2146002d791 coders/meta.c
--- a/coders/meta.c Sun Aug 21 13:11:14 2016 -0500
+++ b/coders/meta.c Sun Aug 21 15:40:34 2016 -0500
@@ -308,7 +308,7 @@
size_t
inputlen = BUFFER_SZ;
- long
+ ssize_t
savedolen = 0L,
outputlen = 0L;
@@ -589,7 +589,7 @@
size_t
inputlen = BUFFER_SZ;
- long
+ ssize_t
savedolen = 0L,
outputlen = 0L;
diff -r de6b78dfd868 -r f2146002d791 dcraw/dcraw.c
--- a/dcraw/dcraw.c Sun Aug 21 13:11:14 2016 -0500
+++ b/dcraw/dcraw.c Sun Aug 21 15:40:34 2016 -0500
@@ -30,6 +30,9 @@
# pragma warning(disable : 4133)
# pragma warning(disable : 4146)
# pragma warning(disable : 4305)
+#if defined(WIN64)
+# pragma warning(disable : 4267) /* conversion from 'size_t' to 'foo', possible loss of data */
+#endif
#endif
#ifndef _GNU_SOURCE
diff -r de6b78dfd868 -r f2146002d791 jbig/libjbig/jbig.c
--- a/jbig/libjbig/jbig.c Sun Aug 21 13:11:14 2016 -0500
+++ b/jbig/libjbig/jbig.c Sun Aug 21 15:40:34 2016 -0500
@@ -2663,7 +2663,7 @@
*cnt += s->comment_skip;
s->comment_skip = 0;
} else {
- s->comment_skip -= len - *cnt;
+ s->comment_skip -= (unsigned long) (len - *cnt);
*cnt = len;
}
continue;
diff -r de6b78dfd868 -r f2146002d791 jpeg/jdatadst.c
--- a/jpeg/jdatadst.c Sun Aug 21 13:11:14 2016 -0500
+++ b/jpeg/jdatadst.c Sun Aug 21 15:40:34 2016 -0500
@@ -182,7 +182,7 @@
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 -r de6b78dfd868 -r f2146002d791 jpeg/jmemmgr.c
--- a/jpeg/jmemmgr.c Sun Aug 21 13:11:14 2016 -0500
+++ b/jpeg/jmemmgr.c Sun Aug 21 15:40:34 2016 -0500
@@ -304,7 +304,7 @@
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;
@@ -364,7 +364,7 @@
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];
@@ -974,7 +974,7 @@
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;
}
@@ -988,7 +988,7 @@
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;
}
}
diff -r de6b78dfd868 -r f2146002d791 libxml/config.h
--- a/libxml/config.h Sun Aug 21 13:11:14 2016 -0500
+++ b/libxml/config.h Sun Aug 21 15:40:34 2016 -0500
@@ -127,5 +127,14 @@
#define TRUE (!(FALSE))
#endif
+/* Will libxml2 ever address 64-bit compilation under Windows where sizeof(size_t) > sizeof(long)? */
+#if defined(WIN64)
+# if defined(_MSC_VER)
+# pragma warning(disable : 4267) /* conversion from 'size_t' to 'foo', possible loss of data */
+# pragma warning(disable : 4244) /* conversion from __int64' to 'foo', possible loss of data */
+# pragma warning(disable : 4312) /* conversion from 'long' to 'void *' of greater size */
+# endif
+#endif
+
#endif /* __LIBXML_WIN32_CONFIG__ */
diff -r de6b78dfd868 -r f2146002d791 libxml/parser.c
--- a/libxml/parser.c Sun Aug 21 13:11:14 2016 -0500
+++ b/libxml/parser.c Sun Aug 21 15:40:34 2016 -0500
@@ -1343,7 +1343,7 @@
const xmlChar *unused ATTRIBUTE_UNUSED) {
xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) data;
- if (((long) payload) == XML_ATTRIBUTE_CDATA) {
+ if (((size_t) payload) == XML_ATTRIBUTE_CDATA) {
xmlHashRemoveEntry2(ctxt->attsSpecial, fullname, fullattr, NULL);
}
}
diff -r de6b78dfd868 -r f2146002d791 ttf/src/truetype/ttgload.c
--- a/ttf/src/truetype/ttgload.c Sun Aug 21 13:11:14 2016 -0500
+++ b/ttf/src/truetype/ttgload.c Sun Aug 21 15:40:34 2016 -0500
@@ -36,6 +36,15 @@
#include "tterrors.h"
#include "ttsubpix.h"
+/* Mask warnings for WIN64 */
+#if defined(WIN64)
+# if defined(_MSC_VER)
+# pragma warning(disable : 4267) /* conversion from 'size_t' to 'foo', possible loss of data */
+# pragma warning(disable : 4244) /* conversion from __int64' to 'foo', possible loss of data */
+# pragma warning(disable : 4312) /* conversion from 'long' to 'void *' of greater size */
+# endif
+#endif
+
/*************************************************************************/
/* */
diff -r de6b78dfd868 -r f2146002d791 ttf/src/type1/t1driver.c
--- a/ttf/src/type1/t1driver.c Sun Aug 21 13:11:14 2016 -0500
+++ b/ttf/src/type1/t1driver.c Sun Aug 21 15:40:34 2016 -0500
@@ -27,6 +27,15 @@
#include "t1afm.h"
#endif
+/* Mask warnings for WIN64 */
+#if defined(WIN64)
+# if defined(_MSC_VER)
+# pragma warning(disable : 4267) /* conversion from 'size_t' to 'foo', possible loss of data */
+# pragma warning(disable : 4244) /* conversion from __int64' to 'foo', possible loss of data */
+# pragma warning(disable : 4312) /* conversion from 'long' to 'void *' of greater size */
+# endif
+#endif
+
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_STREAM_H
------------------------------------------------------------------------------
_______________________________________________
Graphicsmagick-commit mailing list
Graphicsmagick-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/graphicsmagick-commit
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic