Author: fabien
Date: 2012-04-23 20:34:26 -0700 (Mon, 23 Apr 2012)
New Revision: 9395
Log:
Fixed more warnings in VC2010 32+64 bits builds
Modified:
branches/branch-1.3/FL/Fl_Native_File_Chooser.H
branches/branch-1.3/jpeg/jdatadst.c
branches/branch-1.3/jpeg/jmemmgr.c
branches/branch-1.3/src/Fl_Native_File_Chooser_WIN32.cxx
Modified: branches/branch-1.3/FL/Fl_Native_File_Chooser.H
===================================================================
--- branches/branch-1.3/FL/Fl_Native_File_Chooser.H 2012-04-24 02:44:21 UTC
(rev 9394)
+++ branches/branch-1.3/FL/Fl_Native_File_Chooser.H 2012-04-24 03:34:26 UTC
(rev 9395)
@@ -164,7 +164,7 @@
void set_single_pathname(const char *s);
void add_pathname(const char *s);
- void FreePIDL(ITEMIDLIST *pidl);
+ void FreePIDL(LPITEMIDLIST pidl);
void ClearOFN();
void ClearBINF();
void Win2Unix(char *s);
Modified: branches/branch-1.3/jpeg/jdatadst.c
===================================================================
--- branches/branch-1.3/jpeg/jdatadst.c 2012-04-24 02:44:21 UTC (rev 9394)
+++ branches/branch-1.3/jpeg/jdatadst.c 2012-04-24 03:34:26 UTC (rev 9395)
@@ -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);
}
Modified: branches/branch-1.3/jpeg/jmemmgr.c
===================================================================
--- branches/branch-1.3/jpeg/jmemmgr.c 2012-04-24 02:44:21 UTC (rev 9394)
+++ branches/branch-1.3/jpeg/jmemmgr.c 2012-04-24 03:34:26 UTC (rev 9395)
@@ -303,7 +303,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;
@@ -363,7 +363,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];
@@ -973,7 +973,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;
}
@@ -987,7 +987,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;
}
}
Modified: branches/branch-1.3/src/Fl_Native_File_Chooser_WIN32.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Native_File_Chooser_WIN32.cxx 2012-04-24
02:44:21 UTC (rev 9394)
+++ branches/branch-1.3/src/Fl_Native_File_Chooser_WIN32.cxx 2012-04-24
03:34:26 UTC (rev 9395)
@@ -224,7 +224,7 @@
}
// FREE A PIDL (Pointer to IDentity List)
-void Fl_Native_File_Chooser::FreePIDL(ITEMIDLIST *pidl) {
+void Fl_Native_File_Chooser::FreePIDL(LPITEMIDLIST pidl) {
IMalloc *imalloc = NULL;
if ( SUCCEEDED(SHGetMalloc(&imalloc)) ) {
imalloc->Free(pidl);
@@ -516,7 +516,7 @@
else _binf.lParam = 0;
_binf.lpfn = Dir_CB;
// OPEN BROWSER
- ITEMIDLIST *pidl = SHBrowseForFolder(&_binf);
+ LPITEMIDLIST pidl = SHBrowseForFolder(&_binf);
// CANCEL?
if ( pidl == NULL ) return(1);
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
