cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
Andrey Kiselev 2004-09-08 18:01:29 +00:00
parent 570f55bb0c
commit 1016e7081c
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libtiff/tif_lzw.c
View File

@ -1,4 +1,4 @@
/* $Id: tif_lzw.c,v 1.21 2004-07-24 19:01:15 dron Exp $ */ /* $Id: tif_lzw.c,v 1.22 2004-09-08 18:01:29 dron Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -415,7 +415,7 @@ LZWDecode(TIFF* tif, tidata_t op0, tsize_t occ0, tsample_t s)
NextCode(tif, sp, bp, code, GetNextCode); NextCode(tif, sp, bp, code, GetNextCode);
if (code == CODE_EOI) if (code == CODE_EOI)
break; break;
*op++ = code, occ--; *op++ = (char)code, occ--;
oldcodep = sp->dec_codetab + code; oldcodep = sp->dec_codetab + code;
continue; continue;
} }
@ -501,7 +501,7 @@ LZWDecode(TIFF* tif, tidata_t op0, tsize_t occ0, tsample_t s)
} }
op += len, occ -= len; op += len, occ -= len;
} else } else
*op++ = code, occ--; *op++ = (char)code, occ--;
} }
tif->tif_rawcp = (tidata_t) bp; tif->tif_rawcp = (tidata_t) bp;
@ -1076,3 +1076,5 @@ bad:
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/ */
#endif /* LZW_SUPPORT */ #endif /* LZW_SUPPORT */
/* vim: set ts=8 sts=8 sw=8 noet: */

4
libtiff/tif_open.c
View File

@ -1,4 +1,4 @@
/* $Id: tif_open.c,v 1.19 2004-09-01 18:43:11 dron Exp $ */ /* $Id: tif_open.c,v 1.20 2004-09-08 18:01:29 dron Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -428,7 +428,7 @@ const char *
TIFFSetFileName(TIFF* tif, const char *name) TIFFSetFileName(TIFF* tif, const char *name)
{ {
const char* old_name = tif->tif_name; const char* old_name = tif->tif_name;
tif->tif_name = name; tif->tif_name = (char *)name;
return (old_name); return (old_name);
} }

13
nmake.opt
View File

@ -1,4 +1,4 @@
# $Id: nmake.opt,v 1.5 2004-07-03 16:01:29 dron Exp $ # $Id: nmake.opt,v 1.6 2004-09-08 18:04:40 dron Exp $
# #
# Copyright (C) 2004, Andrey Kiselev <dron@remotesensing.org> # Copyright (C) 2004, Andrey Kiselev <dron@remotesensing.org>
# #
@ -98,18 +98,23 @@ EXTRASAMPLE_AS_ALPHA_SUPPORT = 1
CHECK_JPEG_YCBCR_SUBSAMPLING = 1 CHECK_JPEG_YCBCR_SUBSAMPLING = 1
# #
########### There is nothing to edit below this line normally. ########### # Compiler specific options. You may probably want to adjust compilation
# parameters in CFLAGS variable. Refer to your compiler documentation
# for the option reference.
# #
MAKE = nmake /nologo MAKE = nmake /nologo
CC = cl /nologo CC = cl /nologo
AR = lib /nologo AR = lib /nologo
LD = link /nologo LD = link /nologo
CFLAGS = /W3 $(INCL) $(WINMODE) $(EXTRAFLAGS) CFLAGS = /W3 /MD $(INCL) $(WINMODE) $(EXTRAFLAGS)
EXTRAFLAGS = EXTRAFLAGS =
LIBS = LIBS =
#
########### There is nothing to edit below this line normally. ###########
#
# Set the native cpu bit order # Set the native cpu bit order
EXTRAFLAGS = -DFILLODER_LSB2MSB $(EXTRAFLAGS) EXTRAFLAGS = -DFILLODER_LSB2MSB $(EXTRAFLAGS)

4
tools/tiffcp.c
View File

@ -1,4 +1,4 @@
/* $Id: tiffcp.c,v 1.25 2004-09-02 14:46:27 dron Exp $ */ /* $Id: tiffcp.c,v 1.26 2004-09-08 18:03:31 dron Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -296,7 +296,7 @@ main(int argc, char* argv[])
} }
TIFFClose( out ); TIFFClose( out );
exit( 0 ); return (0);
} }