Revision: 37539
http://brlcad.svn.sourceforge.net/brlcad/?rev=37539&view=rev
Author: bob1961
Date: 2010-02-04 00:02:57 +0000 (Thu, 04 Feb 2010)
Log Message:
-----------
Quell a few warnings when compiling for 64-bit Windows.
Modified Paths:
--------------
brlcad/trunk/src/other/libpng/pngpread.c
brlcad/trunk/src/other/libpng/pngrutil.c
brlcad/trunk/src/other/libpng/pngset.c
brlcad/trunk/src/other/libpng/pngwio.c
brlcad/trunk/src/other/libpng/pngwutil.c
Modified: brlcad/trunk/src/other/libpng/pngpread.c
===================================================================
--- brlcad/trunk/src/other/libpng/pngpread.c 2010-02-03 23:41:40 UTC (rev
37538)
+++ brlcad/trunk/src/other/libpng/pngpread.c 2010-02-04 00:02:57 UTC (rev
37539)
@@ -526,7 +526,7 @@
png_calculate_crc(png_ptr, png_ptr->save_buffer_ptr, save_size);
- png_ptr->skip_length -= save_size;
+ png_ptr->skip_length -= (png_uint_32)save_size;
png_ptr->buffer_size -= save_size;
png_ptr->save_buffer_size -= save_size;
png_ptr->save_buffer_ptr += save_size;
@@ -542,7 +542,7 @@
png_calculate_crc(png_ptr, png_ptr->current_buffer_ptr, save_size);
- png_ptr->skip_length -= save_size;
+ png_ptr->skip_length -= (png_uint_32)save_size;
png_ptr->buffer_size -= save_size;
png_ptr->current_buffer_size -= save_size;
png_ptr->current_buffer_ptr += save_size;
@@ -707,7 +707,7 @@
png_calculate_crc(png_ptr, png_ptr->save_buffer_ptr, save_size);
if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
png_process_IDAT_data(png_ptr, png_ptr->save_buffer_ptr, save_size);
- png_ptr->idat_size -= save_size;
+ png_ptr->idat_size -= (png_uint_32)save_size;
png_ptr->buffer_size -= save_size;
png_ptr->save_buffer_size -= save_size;
png_ptr->save_buffer_ptr += save_size;
@@ -730,7 +730,7 @@
if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
png_process_IDAT_data(png_ptr, png_ptr->current_buffer_ptr, save_size);
- png_ptr->idat_size -= save_size;
+ png_ptr->idat_size -= (png_uint_32)save_size;
png_ptr->buffer_size -= save_size;
png_ptr->current_buffer_size -= save_size;
png_ptr->current_buffer_ptr += save_size;
@@ -1277,9 +1277,8 @@
png_charp tmp;
tmp = text;
- text = (png_charp)png_malloc(png_ptr, text_size +
- (png_uint_32)(png_ptr->zbuf_size
- - png_ptr->zstream.avail_out + 1));
+ text = (png_charp)png_malloc(png_ptr, (png_uint_32)(text_size +
+ png_ptr->zbuf_size - png_ptr->zstream.avail_out +
1));
png_memcpy(text, tmp, text_size);
png_free(png_ptr, tmp);
png_memcpy(text + text_size, png_ptr->zbuf,
Modified: brlcad/trunk/src/other/libpng/pngrutil.c
===================================================================
--- brlcad/trunk/src/other/libpng/pngrutil.c 2010-02-03 23:41:40 UTC (rev
37538)
+++ brlcad/trunk/src/other/libpng/pngrutil.c 2010-02-04 00:02:57 UTC (rev
37539)
@@ -251,7 +251,7 @@
if (text == NULL)
{
text_size = prefix_size + png_sizeof(msg) + 1;
- text = (png_charp)png_malloc_warn(png_ptr, text_size);
+ text = (png_charp)png_malloc_warn(png_ptr,
(png_uint_32)text_size);
if (text == NULL)
{
png_free(png_ptr, png_ptr->chunkdata);
@@ -277,7 +277,7 @@
{
text_size = prefix_size +
png_ptr->zbuf_size - png_ptr->zstream.avail_out;
- text = (png_charp)png_malloc_warn(png_ptr, text_size + 1);
+ text = (png_charp)png_malloc_warn(png_ptr,
(png_uint_32)text_size + 1);
if (text == NULL)
{
png_free(png_ptr, png_ptr->chunkdata);
@@ -347,7 +347,7 @@
text_size = prefix_size;
if (text == NULL)
{
- text = (png_charp)png_malloc_warn(png_ptr, text_size+1);
+ text = (png_charp)png_malloc_warn(png_ptr, (png_uint_32)text_size+1);
if (text == NULL)
{
png_free(png_ptr, png_ptr->chunkdata);
@@ -1067,7 +1067,7 @@
png_decompress_chunk(png_ptr, compression_type,
slength, prefix_length, &data_length);
- profile_length = data_length - prefix_length;
+ profile_length = (png_uint_32)(data_length - prefix_length);
if ( prefix_length > data_length || profile_length < 4)
{
@@ -1166,7 +1166,7 @@
new_palette.depth = *entry_start++;
entry_size = (new_palette.depth == 8 ? 6 : 10);
- data_length = (slength - (entry_start - (png_bytep)png_ptr->chunkdata));
+ data_length = (int)(slength - (entry_start -
(png_bytep)png_ptr->chunkdata));
/* integrity-check the data length */
if (data_length % entry_size)
@@ -3187,9 +3187,9 @@
if (row_bytes + 64 > png_ptr->old_big_row_buf_size)
{
png_free(png_ptr, png_ptr->big_row_buf);
- png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr, row_bytes+64);
+ png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr,
(png_uint_32)row_bytes+64);
png_ptr->row_buf = png_ptr->big_row_buf+32;
- png_ptr->old_big_row_buf_size = row_bytes+64;
+ png_ptr->old_big_row_buf_size = (png_uint_32)row_bytes+64;
}
#ifdef PNG_MAX_MALLOC_64K
Modified: brlcad/trunk/src/other/libpng/pngset.c
===================================================================
--- brlcad/trunk/src/other/libpng/pngset.c 2010-02-03 23:41:40 UTC (rev
37538)
+++ brlcad/trunk/src/other/libpng/pngset.c 2010-02-04 00:02:57 UTC (rev
37539)
@@ -347,7 +347,7 @@
if (png_ptr == NULL || info_ptr == NULL)
return;
- length = png_strlen(purpose) + 1;
+ length = (png_uint_32)png_strlen(purpose) + 1;
png_debug1(3, "allocating purpose for info (%lu bytes)",
(unsigned long)length);
info_ptr->pcal_purpose = (png_charp)png_malloc_warn(png_ptr, length);
@@ -364,7 +364,7 @@
info_ptr->pcal_type = (png_byte)type;
info_ptr->pcal_nparams = (png_byte)nparams;
- length = png_strlen(units) + 1;
+ length = (png_uint_32)png_strlen(units) + 1;
png_debug1(3, "allocating units for info (%lu bytes)",
(unsigned long)length);
info_ptr->pcal_units = (png_charp)png_malloc_warn(png_ptr, length);
@@ -391,7 +391,7 @@
for (i = 0; i < nparams; i++)
{
- length = png_strlen(params[i]) + 1;
+ length = (png_uint_32)png_strlen(params[i]) + 1;
png_debug2(3, "allocating parameter %d for info (%lu bytes)", i,
(unsigned long)length);
info_ptr->pcal_params[i] = (png_charp)png_malloc_warn(png_ptr, length);
@@ -654,7 +654,7 @@
if (png_ptr == NULL || info_ptr == NULL || name == NULL || profile == NULL)
return;
- length = png_strlen(name)+1;
+ length = (png_uint_32)png_strlen(name)+1;
new_iccp_name = (png_charp)png_malloc_warn(png_ptr, length);
if (new_iccp_name == NULL)
{
@@ -971,7 +971,7 @@
png_sPLT_tp from = entries + i;
png_uint_32 length;
- length = png_strlen(from->name) + 1;
+ length = (png_uint_32)png_strlen(from->name) + 1;
to->name = (png_charp)png_malloc_warn(png_ptr, length);
if (to->name == NULL)
{
Modified: brlcad/trunk/src/other/libpng/pngwio.c
===================================================================
--- brlcad/trunk/src/other/libpng/pngwio.c 2010-02-03 23:41:40 UTC (rev
37538)
+++ brlcad/trunk/src/other/libpng/pngwio.c 2010-02-04 00:02:57 UTC (rev
37539)
@@ -50,7 +50,7 @@
if ( !WriteFile((HANDLE)(png_ptr->io_ptr), data, length, &check, NULL) )
check = 0;
#else
- check = fwrite(data, 1, length, (png_FILE_p)(png_ptr->io_ptr));
+ check = (png_uint_32)fwrite(data, 1, length, (png_FILE_p)(png_ptr->io_ptr));
#endif
if (check != length)
png_error(png_ptr, "Write Error");
Modified: brlcad/trunk/src/other/libpng/pngwutil.c
===================================================================
--- brlcad/trunk/src/other/libpng/pngwutil.c 2010-02-03 23:41:40 UTC (rev
37538)
+++ brlcad/trunk/src/other/libpng/pngwutil.c 2010-02-04 00:02:57 UTC (rev
37539)
@@ -180,7 +180,7 @@
if (compression == PNG_TEXT_COMPRESSION_NONE)
{
comp->input = text;
- comp->input_len = text_len;
+ comp->input_len = (int)text_len;
return((int)text_len);
}
@@ -1553,7 +1553,7 @@
null terminator for the last parameter. */
for (i = 0; i < nparams; i++)
{
- params_len[i] = png_strlen(params[i]) + (i == nparams - 1 ? 0 : 1);
+ params_len[i] = (png_uint_32)png_strlen(params[i]) + (i == nparams - 1 ?
0 : 1);
png_debug2(3, "pCAL parameter %d length = %lu", i,
(unsigned long) params_len[i]);
total_len += (png_size_t)params_len[i];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
