Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-28 11:25:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed more warnings in VC2010 32+64 bits builds

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9395 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Fabien Costantini
2012-04-24 03:34:26 +00:00
parent 36c52ce810
commit d90b170c8d
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FL/Fl_Native_File_Chooser.H
+1 -1
View File
@@ -164,7 +164,7 @@ private:
void set_single_pathname(const char *s); void set_single_pathname(const char *s);
void add_pathname(const char *s); void add_pathname(const char *s);
void FreePIDL(ITEMIDLIST *pidl); void FreePIDL(LPITEMIDLIST pidl);
void ClearOFN(); void ClearOFN();
void ClearBINF(); void ClearBINF();
void Win2Unix(char *s); void Win2Unix(char *s);
jpeg/jdatadst.c
+1 -1
View File
@@ -182,7 +182,7 @@ term_mem_destination (j_compress_ptr cinfo)
my_mem_dest_ptr dest = (my_mem_dest_ptr) cinfo->dest; my_mem_dest_ptr dest = (my_mem_dest_ptr) cinfo->dest;
*dest->outbuffer = dest->buffer; *dest->outbuffer = dest->buffer;
*dest->outsize = dest->bufsize - dest->pub.free_in_buffer; *dest->outsize = (unsigned long) (dest->bufsize - dest->pub.free_in_buffer);
} }
jpeg/jmemmgr.c
+4 -4
View File
@@ -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 */ if (slop < MIN_SLOP) /* give up when it gets real small */
out_of_memory(cinfo, 2); /* jpeg_get_small failed */ 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 */ /* Success, initialize the new pool header and add to end of list */
hdr_ptr->hdr.next = NULL; hdr_ptr->hdr.next = NULL;
hdr_ptr->hdr.bytes_used = 0; 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)); SIZEOF(large_pool_hdr));
if (hdr_ptr == NULL) if (hdr_ptr == NULL)
out_of_memory(cinfo, 4); /* jpeg_get_large failed */ 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 */ /* Success, initialize the new pool header and add to list */
hdr_ptr->hdr.next = mem->large_list[pool_id]; 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 + lhdr_ptr->hdr.bytes_left +
SIZEOF(large_pool_hdr); SIZEOF(large_pool_hdr);
jpeg_free_large(cinfo, (void FAR *) lhdr_ptr, space_freed); 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; lhdr_ptr = next_lhdr_ptr;
} }
@@ -987,7 +987,7 @@ free_pool (j_common_ptr cinfo, int pool_id)
shdr_ptr->hdr.bytes_left + shdr_ptr->hdr.bytes_left +
SIZEOF(small_pool_hdr); SIZEOF(small_pool_hdr);
jpeg_free_small(cinfo, (void *) shdr_ptr, space_freed); 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; shdr_ptr = next_shdr_ptr;
} }
} }
src/Fl_Native_File_Chooser_WIN32.cxx
+2 -2
View File
@@ -224,7 +224,7 @@ void Fl_Native_File_Chooser::add_pathname(const char *s) {
} }
// FREE A PIDL (Pointer to IDentity List) // 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; IMalloc *imalloc = NULL;
if ( SUCCEEDED(SHGetMalloc(&imalloc)) ) { if ( SUCCEEDED(SHGetMalloc(&imalloc)) ) {
imalloc->Free(pidl); imalloc->Free(pidl);
@@ -516,7 +516,7 @@ int Fl_Native_File_Chooser::showdir() {
else _binf.lParam = 0; else _binf.lParam = 0;
_binf.lpfn = Dir_CB; _binf.lpfn = Dir_CB;
// OPEN BROWSER // OPEN BROWSER
ITEMIDLIST *pidl = SHBrowseForFolder(&_binf); LPITEMIDLIST pidl = SHBrowseForFolder(&_binf);
// CANCEL? // CANCEL?
if ( pidl == NULL ) return(1); if ( pidl == NULL ) return(1);