sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove some debugging

Browse Source
This commit is contained in:
John Cupitt 2009-11-26 19:41:41 +00:00
parent 96c2204160
commit 734ae5fd2a
3 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
TODO
View File

@ -1,11 +1,3 @@
- windows >4gb tests
does it read a 4gb file OK?
try writing one and read it on linux
carry the 1tb external drive over
WONTFIX for 7.20 WONTFIX for 7.20
================ ================

12
libvips/iofuncs/im_mapfile.c
View File

@ -110,10 +110,6 @@ im__mmap( int fd, int writeable, size_t length, gint64 offset )
printf( "im__mmap: length = 0x%zx, offset = 0x%lx\n", length, offset ); printf( "im__mmap: length = 0x%zx, offset = 0x%lx\n", length, offset );
#endif /*DEBUG*/ #endif /*DEBUG*/
printf( "** start\n" );
printf( "length = 0x%zx\n", length );
printf( "offset = 0x%lx\n", (guint64) offset );
#ifdef OS_WIN32 #ifdef OS_WIN32
{ {
HANDLE hFile = (HANDLE) _get_osfhandle( fd ); HANDLE hFile = (HANDLE) _get_osfhandle( fd );
@ -140,12 +136,6 @@ im__mmap( int fd, int writeable, size_t length, gint64 offset )
dwFileOffsetLow = quad.LowPart; dwFileOffsetLow = quad.LowPart;
dwFileOffsetHigh = quad.HighPart; dwFileOffsetHigh = quad.HighPart;
printf( "flProtect = 0x%x\n", flProtect );
printf( "flProtect = 0x%x\n", flProtect );
printf( "dwDesiredAccess = 0x%x\n", dwDesiredAccess );
printf( "dwFileOffsetHigh = 0x%x\n", dwFileOffsetHigh );
printf( "dwFileOffsetLow = 0x%x\n", dwFileOffsetLow );
if( !(hMMFile = CreateFileMapping( hFile, if( !(hMMFile = CreateFileMapping( hFile,
NULL, flProtect, 0, 0, NULL )) ) { NULL, flProtect, 0, 0, NULL )) ) {
im_error_system( GetLastError(), "im_mapfile", im_error_system( GetLastError(), "im_mapfile",
@ -195,8 +185,6 @@ im__mmap( int fd, int writeable, size_t length, gint64 offset )
} }
#endif /*OS_WIN32*/ #endif /*OS_WIN32*/
printf( "** success\n" );
return( baseaddr ); return( baseaddr );
} }

4
libvips/iofuncs/window.c
View File

@ -225,14 +225,10 @@ im_window_set( im_window_t *window, int top, int height )
(gint64) IM_IMAGE_SIZEOF_LINE( window->im ) * top; (gint64) IM_IMAGE_SIZEOF_LINE( window->im ) * top;
length = (size_t) IM_IMAGE_SIZEOF_LINE( window->im ) * height; length = (size_t) IM_IMAGE_SIZEOF_LINE( window->im ) * height;
printf( "start = 0x%lx\n", (guint64) start );
pagestart = start - start % pagesize; pagestart = start - start % pagesize;
end = start + length; end = start + length;
pagelength = end - pagestart; pagelength = end - pagestart;
printf( "pagestart = 0x%lx\n", (guint64) pagestart );
/* Make sure we have enough file. /* Make sure we have enough file.
*/ */
if( end > window->im->file_length ) { if( end > window->im->file_length ) {