diff options
author | Bob Friesenhahn <bfriesen@simple.dallas.tx.us> | 2010-03-10 18:56:48 +0000 |
---|---|---|
committer | Bob Friesenhahn <bfriesen@simple.dallas.tx.us> | 2010-03-10 18:56:48 +0000 |
commit | 4e0d97f83c5feae523e45a026f2669e3752aeddc (patch) | |
tree | c5ab32f7bee9ed6dd1509983ec624d3165159d60 | |
parent | 70aaa84ae7a747df25783a932af8950fdadb9c2a (diff) | |
download | libtiff-git-4e0d97f83c5feae523e45a026f2669e3752aeddc.tar.gz |
* libtiff/tif_aux.c (_TIFFCheckRealloc): Improve error message so
that it is clearly a memory allocation error message, and also
includes the size of the allocation request.
85 files changed, 680 insertions, 80 deletions
@@ -1,3 +1,9 @@ +2010-03-10 Bob Friesenhahn <bfriesen@simple.dallas.tx.us> + + * libtiff/tif_aux.c (_TIFFCheckRealloc): Improve error message so + that it is clearly a memory allocation error message, and also + includes the size of the allocation request. + 2010-02-22 Lee Howard <faxguy@howardsilvan.com> * libtiff/tif_jpeg.c: Do not generate a JPEGTables tag when creating diff --git a/libtiff/mkg3states.c b/libtiff/mkg3states.c index 05fab99a..1df9ccc5 100644 --- a/libtiff/mkg3states.c +++ b/libtiff/mkg3states.c @@ -1,4 +1,4 @@ -/* "$Id: mkg3states.c,v 1.10 2007-02-22 11:27:17 dron Exp $ */ +/* "$Id: mkg3states.c,v 1.11 2010-03-10 18:56:48 bfriesen Exp $ */ /* * Copyright (c) 1991-1997 Sam Leffler @@ -442,3 +442,10 @@ main(int argc, char* argv[]) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/mkspans.c b/libtiff/mkspans.c index b62e81ce..cc07c863 100644 --- a/libtiff/mkspans.c +++ b/libtiff/mkspans.c @@ -1,4 +1,4 @@ -/* $Id: mkspans.c,v 1.3 2007-02-21 14:20:32 dron Exp $ */ +/* $Id: mkspans.c,v 1.4 2010-03-10 18:56:48 bfriesen Exp $ */ /* * Copyright (c) 1991-1997 Sam Leffler @@ -73,3 +73,10 @@ main() } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/t4.h b/libtiff/t4.h index e6ff955c..b908f54f 100644 --- a/libtiff/t4.h +++ b/libtiff/t4.h @@ -1,4 +1,4 @@ -/* $Id: t4.h,v 1.2 2007-06-26 10:30:12 joris Exp $ */ +/* $Id: t4.h,v 1.3 2010-03-10 18:56:48 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -283,3 +283,10 @@ extern const tableentry TIFFFaxWhiteCodes[]; extern const tableentry TIFFFaxBlackCodes[]; #endif #endif /* _T4_ */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_aux.c b/libtiff/tif_aux.c index e81fdf04..eeaa0099 100644 --- a/libtiff/tif_aux.c +++ b/libtiff/tif_aux.c @@ -1,4 +1,4 @@ -/* $Id: tif_aux.c,v 1.24 2009-11-30 18:19:15 fwarmerdam Exp $ */ +/* $Id: tif_aux.c,v 1.25 2010-03-10 18:56:48 bfriesen Exp $ */ /* * Copyright (c) 1991-1997 Sam Leffler @@ -48,7 +48,9 @@ _TIFFCheckRealloc(TIFF* tif, void* buffer, if (cp == NULL) TIFFErrorExt(tif->tif_clientdata, tif->tif_name, - "No space %s", what); + "Failed to allocate memory for %s " + "(%ld elements of %ld bytes each)", + what,(long) nmemb, (long) elem_size); return cp; } @@ -320,4 +322,10 @@ _TIFFUInt64ToDouble(uint64 ui64) } /* vim: set ts=8 sts=8 sw=8 noet: */ - +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_close.c b/libtiff/tif_close.c index 5570db4a..13d2bab5 100644 --- a/libtiff/tif_close.c +++ b/libtiff/tif_close.c @@ -1,4 +1,4 @@ -/* $Id: tif_close.c,v 1.18 2008-03-28 01:10:39 bfriesen Exp $ */ +/* $Id: tif_close.c,v 1.19 2010-03-10 18:56:48 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -131,3 +131,10 @@ TIFFClose(TIFF* tif) /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_codec.c b/libtiff/tif_codec.c index 522391d7..ffcda6c8 100644 --- a/libtiff/tif_codec.c +++ b/libtiff/tif_codec.c @@ -1,4 +1,4 @@ -/* $Id: tif_codec.c,v 1.13 2008-05-25 03:10:56 fwarmerdam Exp $ */ +/* $Id: tif_codec.c,v 1.14 2010-03-10 18:56:48 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -152,3 +152,10 @@ TIFFIsCODECConfigured(uint16 scheme) return 0; } +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_color.c b/libtiff/tif_color.c index 87d5d0e8..56ae36c8 100644 --- a/libtiff/tif_color.c +++ b/libtiff/tif_color.c @@ -1,4 +1,4 @@ -/* $Id: tif_color.c,v 1.17 2009-11-30 12:22:26 fwarmerdam Exp $ */ +/* $Id: tif_color.c,v 1.18 2010-03-10 18:56:48 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -273,3 +273,10 @@ TIFFYCbCrToRGBInit(TIFFYCbCrToRGB* ycbcr, float *luma, float *refBlackWhite) #undef FIX /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_compress.c b/libtiff/tif_compress.c index baf2a2b8..20e72fd0 100644 --- a/libtiff/tif_compress.c +++ b/libtiff/tif_compress.c @@ -1,4 +1,4 @@ -/* $Id: tif_compress.c,v 1.21 2007-06-27 16:09:58 joris Exp $ */ +/* $Id: tif_compress.c,v 1.22 2010-03-10 18:56:48 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -295,3 +295,10 @@ TIFFGetConfiguredCODECs() } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_config.vc.h b/libtiff/tif_config.vc.h index bcd33c09..72a49b08 100644 --- a/libtiff/tif_config.vc.h +++ b/libtiff/tif_config.vc.h @@ -45,3 +45,10 @@ #endif #define lfind _lfind +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_config.wince.h b/libtiff/tif_config.wince.h index 63b34604..94e92bbf 100644 --- a/libtiff/tif_config.wince.h +++ b/libtiff/tif_config.wince.h @@ -1,4 +1,4 @@ -/* $Id: tif_config.wince.h,v 1.2 2008-05-26 19:05:51 fwarmerdam Exp $ */ +/* $Id: tif_config.wince.h,v 1.3 2010-03-10 18:56:48 bfriesen Exp $ */ /* * TIFF library configuration header for Windows CE platform. @@ -62,3 +62,10 @@ #endif +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_dir.c b/libtiff/tif_dir.c index c2cfe048..5d0c3606 100644 --- a/libtiff/tif_dir.c +++ b/libtiff/tif_dir.c @@ -1,4 +1,4 @@ -/* $Id: tif_dir.c,v 1.101 2009-11-30 18:19:16 fwarmerdam Exp $ */ +/* $Id: tif_dir.c,v 1.102 2010-03-10 18:56:48 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -1517,3 +1517,10 @@ TIFFUnlinkDirectory(TIFF* tif, uint16 dirn) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_dir.h b/libtiff/tif_dir.h index 5360618c..a6e66c87 100644 --- a/libtiff/tif_dir.h +++ b/libtiff/tif_dir.h @@ -1,4 +1,4 @@ -/* $Id: tif_dir.h,v 1.51 2009-11-30 18:19:16 fwarmerdam Exp $ */ +/* $Id: tif_dir.h,v 1.52 2010-03-10 18:56:48 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -270,3 +270,10 @@ extern TIFFField* _TIFFCreateAnonField(TIFF *, uint32, TIFFDataType); /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_dirinfo.c b/libtiff/tif_dirinfo.c index 5e847012..6623e40a 100644 --- a/libtiff/tif_dirinfo.c +++ b/libtiff/tif_dirinfo.c @@ -1,4 +1,4 @@ -/* $Id: tif_dirinfo.c,v 1.106 2009-11-30 18:19:16 fwarmerdam Exp $ */ +/* $Id: tif_dirinfo.c,v 1.107 2010-03-10 18:56:48 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -969,3 +969,10 @@ TIFFFindFieldInfo(TIFF* tif, uint32 tag, TIFFDataType dt) /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c index 81f3e3c8..5d9d0b9d 100644 --- a/libtiff/tif_dirread.c +++ b/libtiff/tif_dirread.c @@ -1,4 +1,4 @@ -/* $Id: tif_dirread.c,v 1.155 2009-10-29 20:04:07 bfriesen Exp $ */ +/* $Id: tif_dirread.c,v 1.156 2010-03-10 18:56:48 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -5432,3 +5432,10 @@ ChopUpSingleUncompressedStrip(TIFF* tif) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c index c4a792dd..ff31c727 100644 --- a/libtiff/tif_dirwrite.c +++ b/libtiff/tif_dirwrite.c @@ -1,4 +1,4 @@ -/* $Id: tif_dirwrite.c,v 1.71 2009-01-23 06:21:29 fwarmerdam Exp $ */ +/* $Id: tif_dirwrite.c,v 1.72 2010-03-10 18:56:48 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -2782,3 +2782,10 @@ _TIFFRewriteField(TIFF* tif, uint16 tag, TIFFDataType in_datatype, return 1; } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_dumpmode.c b/libtiff/tif_dumpmode.c index 98ece39c..c668964f 100644 --- a/libtiff/tif_dumpmode.c +++ b/libtiff/tif_dumpmode.c @@ -1,4 +1,4 @@ -/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dumpmode.c,v 1.12 2007-07-19 13:25:43 dron Exp $ */ +/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dumpmode.c,v 1.13 2010-03-10 18:56:48 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -134,3 +134,10 @@ TIFFInitDumpMode(TIFF* tif, int scheme) tif->tif_seek = DumpModeSeek; return (1); } +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_error.c b/libtiff/tif_error.c index 71036459..0bc8b878 100644 --- a/libtiff/tif_error.c +++ b/libtiff/tif_error.c @@ -1,4 +1,4 @@ -/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_error.c,v 1.4 2005-12-23 01:18:59 joris Exp $ */ +/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_error.c,v 1.5 2010-03-10 18:56:48 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -71,3 +71,10 @@ TIFFErrorExt(thandle_t fd, const char* module, const char* fmt, ...) va_end(ap); } +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_extension.c b/libtiff/tif_extension.c index fb3e2686..10afd416 100644 --- a/libtiff/tif_extension.c +++ b/libtiff/tif_extension.c @@ -1,4 +1,4 @@ -/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_extension.c,v 1.6 2007-06-26 12:31:26 joris Exp $ */ +/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_extension.c,v 1.7 2010-03-10 18:56:48 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -109,3 +109,10 @@ void TIFFSetClientInfo( TIFF *tif, void *data, const char *name ) tif->tif_clientinfo = link; } +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_fax3.c b/libtiff/tif_fax3.c index 1bc67315..18a090d6 100644 --- a/libtiff/tif_fax3.c +++ b/libtiff/tif_fax3.c @@ -1,4 +1,4 @@ -/* $Id: tif_fax3.c,v 1.69 2010-02-22 21:14:10 faxguy Exp $ */ +/* $Id: tif_fax3.c,v 1.70 2010-03-10 18:56:48 bfriesen Exp $ */ /* * Copyright (c) 1990-1997 Sam Leffler @@ -1569,3 +1569,10 @@ TIFFInitCCITTRLEW(TIFF* tif, int scheme) #endif /* CCITT_SUPPORT */ /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_fax3.h b/libtiff/tif_fax3.h index db64b943..581c122e 100644 --- a/libtiff/tif_fax3.h +++ b/libtiff/tif_fax3.h @@ -1,4 +1,4 @@ -/* $Id: tif_fax3.h,v 1.6 2007-06-26 10:30:13 joris Exp $ */ +/* $Id: tif_fax3.h,v 1.7 2010-03-10 18:56:48 bfriesen Exp $ */ /* * Copyright (c) 1990-1997 Sam Leffler @@ -523,3 +523,10 @@ eol2d: \ CLEANUP_RUNS(); \ } while (0) #endif /* _FAX3_ */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_fax3sm.c b/libtiff/tif_fax3sm.c index 08ce1ad6..822191ec 100644 --- a/libtiff/tif_fax3sm.c +++ b/libtiff/tif_fax3sm.c @@ -1251,3 +1251,10 @@ {8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3}, {8,3,4},{8,2,2} }; +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_flush.c b/libtiff/tif_flush.c index 3bd14ba9..81956284 100644 --- a/libtiff/tif_flush.c +++ b/libtiff/tif_flush.c @@ -1,4 +1,4 @@ -/* $Id: tif_flush.c,v 1.7 2008-12-21 20:31:33 fwarmerdam Exp $ */ +/* $Id: tif_flush.c,v 1.8 2010-03-10 18:56:48 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -109,3 +109,10 @@ TIFFFlushData(TIFF* tif) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_getimage.c b/libtiff/tif_getimage.c index a392a65d..b57f7977 100644 --- a/libtiff/tif_getimage.c +++ b/libtiff/tif_getimage.c @@ -1,4 +1,4 @@ -/* $Id: tif_getimage.c,v 1.74 2009-11-30 12:22:26 fwarmerdam Exp $ */ +/* $Id: tif_getimage.c,v 1.75 2010-03-10 18:56:48 bfriesen Exp $ */ /* * Copyright (c) 1991-1997 Sam Leffler @@ -2786,3 +2786,10 @@ TIFFReadRGBATile(TIFF* tif, uint32 col, uint32 row, uint32 * raster) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_jbig.c b/libtiff/tif_jbig.c index 32073caf..37878f6e 100644 --- a/libtiff/tif_jbig.c +++ b/libtiff/tif_jbig.c @@ -1,4 +1,4 @@ -/* $Id: tif_jbig.c,v 1.14 2008-10-21 13:16:59 dron Exp $ */ +/* $Id: tif_jbig.c,v 1.15 2010-03-10 18:56:48 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -204,3 +204,10 @@ int TIFFInitJBIG(TIFF* tif, int scheme) /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_jpeg.c b/libtiff/tif_jpeg.c index 13d8ce7a..d7cb5862 100644 --- a/libtiff/tif_jpeg.c +++ b/libtiff/tif_jpeg.c @@ -1,4 +1,4 @@ -/* $Id: tif_jpeg.c,v 1.87 2010-02-22 19:10:07 faxguy Exp $ */ +/* $Id: tif_jpeg.c,v 1.88 2010-03-10 18:56:48 bfriesen Exp $ */ /* * Copyright (c) 1994-1997 Sam Leffler @@ -2303,3 +2303,10 @@ here hopefully is harmless. /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_jpeg_12.c b/libtiff/tif_jpeg_12.c index d6737eb6..87aaa19e 100644 --- a/libtiff/tif_jpeg_12.c +++ b/libtiff/tif_jpeg_12.c @@ -56,3 +56,10 @@ int TIFFReInitJPEG_12( TIFF *tif, int scheme, int is_encode ) #endif /* defined(JPEG_DUAL_MODE_8_12) */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_luv.c b/libtiff/tif_luv.c index 5d7fad65..5253c6b1 100644 --- a/libtiff/tif_luv.c +++ b/libtiff/tif_luv.c @@ -1,4 +1,4 @@ -/* $Id: tif_luv.c,v 1.33 2009-06-30 13:51:52 fwarmerdam Exp $ */ +/* $Id: tif_luv.c,v 1.34 2010-03-10 18:56:48 bfriesen Exp $ */ /* * Copyright (c) 1997 Greg Ward Larson @@ -1674,3 +1674,10 @@ bad: #endif /* LOGLUV_SUPPORT */ /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_lzw.c b/libtiff/tif_lzw.c index 106435e0..5d1048e4 100644 --- a/libtiff/tif_lzw.c +++ b/libtiff/tif_lzw.c @@ -1,4 +1,4 @@ -/* $Id: tif_lzw.c,v 1.42 2009-11-01 00:16:49 bfriesen Exp $ */ +/* $Id: tif_lzw.c,v 1.43 2010-03-10 18:56:48 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -1158,3 +1158,10 @@ bad: #endif /* LZW_SUPPORT */ /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_next.c b/libtiff/tif_next.c index 96547549..524e127c 100644 --- a/libtiff/tif_next.c +++ b/libtiff/tif_next.c @@ -1,4 +1,4 @@ -/* $Id: tif_next.c,v 1.12 2008-01-01 15:41:22 fwarmerdam Exp $ */ +/* $Id: tif_next.c,v 1.13 2010-03-10 18:56:48 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -151,3 +151,10 @@ TIFFInitNeXT(TIFF* tif, int scheme) #endif /* NEXT_SUPPORT */ /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_ojpeg.c b/libtiff/tif_ojpeg.c index c7841d66..32920a6a 100644 --- a/libtiff/tif_ojpeg.c +++ b/libtiff/tif_ojpeg.c @@ -1,4 +1,4 @@ -/* $Id: tif_ojpeg.c,v 1.46 2009-09-03 20:45:22 bfriesen Exp $ */ +/* $Id: tif_ojpeg.c,v 1.47 2010-03-10 18:56:48 bfriesen Exp $ */ /* WARNING: The type of JPEG encapsulation defined by the TIFF Version 6.0 specification is now totally obsolete and deprecated for new applications and @@ -2453,3 +2453,10 @@ OJPEGLibjpegJpegSourceMgrTermSource(jpeg_decompress_struct* cinfo) #endif +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_open.c b/libtiff/tif_open.c index b3e50705..90d78795 100644 --- a/libtiff/tif_open.c +++ b/libtiff/tif_open.c @@ -1,4 +1,4 @@ -/* $Id: tif_open.c,v 1.43 2007-09-27 17:38:57 joris Exp $ */ +/* $Id: tif_open.c,v 1.44 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -714,3 +714,10 @@ TIFFGetUnmapFileProc(TIFF* tif) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_packbits.c b/libtiff/tif_packbits.c index d796b405..a79abe86 100644 --- a/libtiff/tif_packbits.c +++ b/libtiff/tif_packbits.c @@ -1,4 +1,4 @@ -/* $Id: tif_packbits.c,v 1.19 2007-10-01 12:43:49 joris Exp $ */ +/* $Id: tif_packbits.c,v 1.20 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -285,3 +285,10 @@ TIFFInitPackBits(TIFF* tif, int scheme) #endif /* PACKBITS_SUPPORT */ /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_pixarlog.c b/libtiff/tif_pixarlog.c index 8007ad5d..28ed4a95 100644 --- a/libtiff/tif_pixarlog.c +++ b/libtiff/tif_pixarlog.c @@ -1,4 +1,4 @@ -/* $Id: tif_pixarlog.c,v 1.32 2009-10-31 23:42:27 bfriesen Exp $ */ +/* $Id: tif_pixarlog.c,v 1.33 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1996-1997 Sam Leffler @@ -1414,3 +1414,10 @@ bad: #endif /* PIXARLOG_SUPPORT */ /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_predict.c b/libtiff/tif_predict.c index 1000429e..f93c6645 100644 --- a/libtiff/tif_predict.c +++ b/libtiff/tif_predict.c @@ -1,4 +1,4 @@ -/* $Id: tif_predict.c,v 1.31 2009-01-23 15:52:39 fwarmerdam Exp $ */ +/* $Id: tif_predict.c,v 1.32 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -755,3 +755,10 @@ TIFFPredictorCleanup(TIFF* tif) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_predict.h b/libtiff/tif_predict.h index f52da9e8..dc7144c6 100644 --- a/libtiff/tif_predict.h +++ b/libtiff/tif_predict.h @@ -1,4 +1,4 @@ -/* $Id: tif_predict.h,v 1.7 2007-11-02 19:43:55 fwarmerdam Exp $ */ +/* $Id: tif_predict.h,v 1.8 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1995-1997 Sam Leffler @@ -68,3 +68,10 @@ extern int TIFFPredictorCleanup(TIFF*); #endif /* _TIFFPREDICT_ */ /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_print.c b/libtiff/tif_print.c index 4b199649..571e584e 100644 --- a/libtiff/tif_print.c +++ b/libtiff/tif_print.c @@ -1,4 +1,4 @@ -/* $Id: tif_print.c,v 1.48 2009-08-24 16:51:14 bfriesen Exp $ */ +/* $Id: tif_print.c,v 1.49 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -669,3 +669,10 @@ _TIFFprintAsciiTag(FILE* fd, const char* name, const char* value) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c index 6ea79c36..0a60c957 100644 --- a/libtiff/tif_read.c +++ b/libtiff/tif_read.c @@ -1,4 +1,4 @@ -/* $Id: tif_read.c,v 1.29 2007-11-23 20:49:43 fwarmerdam Exp $ */ +/* $Id: tif_read.c,v 1.30 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -821,3 +821,10 @@ _TIFFSwab64BitData(TIFF* tif, uint8* buf, tmsize_t cc) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_strip.c b/libtiff/tif_strip.c index 8e70dc5a..78d7db2c 100644 --- a/libtiff/tif_strip.c +++ b/libtiff/tif_strip.c @@ -1,4 +1,4 @@ -/* $Id: tif_strip.c,v 1.31 2009-06-26 20:55:55 fwarmerdam Exp $ */ +/* $Id: tif_strip.c,v 1.32 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1991-1997 Sam Leffler @@ -398,3 +398,10 @@ TIFFRasterScanlineSize(TIFF* tif) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_swab.c b/libtiff/tif_swab.c index 6bfe0bfc..f37e33f1 100644 --- a/libtiff/tif_swab.c +++ b/libtiff/tif_swab.c @@ -1,4 +1,4 @@ -/* $Id: tif_swab.c,v 1.12 2007-06-27 16:09:58 joris Exp $ */ +/* $Id: tif_swab.c,v 1.13 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -301,3 +301,10 @@ TIFFReverseBits(uint8* cp, tmsize_t n) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_thunder.c b/libtiff/tif_thunder.c index 52211142..dcb1a777 100644 --- a/libtiff/tif_thunder.c +++ b/libtiff/tif_thunder.c @@ -1,4 +1,4 @@ -/* $Id: tif_thunder.c,v 1.9 2007-07-19 15:50:28 dron Exp $ */ +/* $Id: tif_thunder.c,v 1.10 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -174,3 +174,10 @@ TIFFInitThunderScan(TIFF* tif, int scheme) #endif /* THUNDER_SUPPORT */ /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_tile.c b/libtiff/tif_tile.c index 7949697f..463e647e 100644 --- a/libtiff/tif_tile.c +++ b/libtiff/tif_tile.c @@ -1,4 +1,4 @@ -/* $Id: tif_tile.c,v 1.20 2007-06-27 16:09:58 joris Exp $ */ +/* $Id: tif_tile.c,v 1.21 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1991-1997 Sam Leffler @@ -315,3 +315,10 @@ _TIFFDefaultTileSize(TIFF* tif, uint32* tw, uint32* th) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_unix.c b/libtiff/tif_unix.c index 04af7ef0..7c5cc50f 100644 --- a/libtiff/tif_unix.c +++ b/libtiff/tif_unix.c @@ -1,4 +1,4 @@ -/* $Id: tif_unix.c,v 1.21 2007-07-18 13:46:41 dron Exp $ */ +/* $Id: tif_unix.c,v 1.22 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -309,3 +309,10 @@ TIFFErrorHandler _TIFFerrorHandler = unixErrorHandler; /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_version.c b/libtiff/tif_version.c index 53cbf92c..f92c843d 100644 --- a/libtiff/tif_version.c +++ b/libtiff/tif_version.c @@ -1,4 +1,4 @@ -/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_version.c,v 1.2 2000-11-13 14:42:38 warmerda Exp $ */ +/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_version.c,v 1.3 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1992-1997 Sam Leffler * Copyright (c) 1992-1997 Silicon Graphics, Inc. @@ -31,3 +31,10 @@ TIFFGetVersion(void) { return (TIFFVersion); } +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_vms.c b/libtiff/tif_vms.c index 770f9c8d..e1fe275c 100644 --- a/libtiff/tif_vms.c +++ b/libtiff/tif_vms.c @@ -1,4 +1,4 @@ -/* $Id: tif_vms.c,v 1.10 2007-11-23 10:01:38 dron Exp $ */ +/* $Id: tif_vms.c,v 1.11 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -591,3 +591,10 @@ TIFFCvtNativeToIEEEDouble(TIFF* tif, u_int n, double* f) } } #endif +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_warning.c b/libtiff/tif_warning.c index 65a3bc98..423b636e 100644 --- a/libtiff/tif_warning.c +++ b/libtiff/tif_warning.c @@ -1,4 +1,4 @@ -/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_warning.c,v 1.2 2005-12-23 01:18:59 joris Exp $ */ +/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_warning.c,v 1.3 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -72,3 +72,10 @@ TIFFWarningExt(thandle_t fd, const char* module, const char* fmt, ...) } +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_win32.c b/libtiff/tif_win32.c index 2110d5d3..766be15f 100644 --- a/libtiff/tif_win32.c +++ b/libtiff/tif_win32.c @@ -1,4 +1,4 @@ -/* $Id: tif_win32.c,v 1.35 2008-06-17 18:47:03 fwarmerdam Exp $ */ +/* $Id: tif_win32.c,v 1.36 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -422,3 +422,10 @@ TIFFErrorHandler _TIFFerrorHandler = Win32ErrorHandler; #endif /* ndef _WIN32_WCE */ /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_wince.c b/libtiff/tif_wince.c index fe7fda91..26eef487 100644 --- a/libtiff/tif_wince.c +++ b/libtiff/tif_wince.c @@ -1,4 +1,4 @@ -/* $Id: tif_wince.c,v 1.2 2007-06-26 10:41:28 joris Exp $ */ +/* $Id: tif_wince.c,v 1.3 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -284,3 +284,10 @@ TIFFErrorHandler _TIFFerrorHandler = Win32ErrorHandler; /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_write.c b/libtiff/tif_write.c index 59944b5e..585973e0 100644 --- a/libtiff/tif_write.c +++ b/libtiff/tif_write.c @@ -1,4 +1,4 @@ -/* $Id: tif_write.c,v 1.34 2009-06-03 23:47:22 fwarmerdam Exp $ */ +/* $Id: tif_write.c,v 1.35 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -738,3 +738,10 @@ TIFFSetWriteOffset(TIFF* tif, toff_t off) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tif_zip.c b/libtiff/tif_zip.c index 7d512b6b..e521c3be 100644 --- a/libtiff/tif_zip.c +++ b/libtiff/tif_zip.c @@ -1,4 +1,4 @@ -/* $Id: tif_zip.c,v 1.28 2007-11-02 00:25:25 fwarmerdam Exp $ */ +/* $Id: tif_zip.c,v 1.29 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1995-1997 Sam Leffler @@ -453,3 +453,10 @@ bad: #endif /* ZIP_SUPORT */ /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tiff.h b/libtiff/tiff.h index dc020f99..4c95eda6 100644 --- a/libtiff/tiff.h +++ b/libtiff/tiff.h @@ -1,4 +1,4 @@ -/* $Id: tiff.h,v 1.64 2007-07-10 11:52:02 dron Exp $ */ +/* $Id: tiff.h,v 1.65 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -636,3 +636,10 @@ typedef enum { #endif /* _TIFF_ */ /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tiffconf.vc.h b/libtiff/tiffconf.vc.h index b05a745d..680f839f 100644 --- a/libtiff/tiffconf.vc.h +++ b/libtiff/tiffconf.vc.h @@ -151,3 +151,10 @@ #define IPTC_SUPPORT #endif /* _TIFFCONF_ */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tiffconf.wince.h b/libtiff/tiffconf.wince.h index 9c966499..2ef3958a 100644 --- a/libtiff/tiffconf.wince.h +++ b/libtiff/tiffconf.wince.h @@ -1,4 +1,4 @@ -/* $Id: tiffconf.wince.h,v 1.2 2008-05-26 19:05:51 fwarmerdam Exp $ */ +/* $Id: tiffconf.wince.h,v 1.3 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Windows CE platform tiffconf.wince.h @@ -112,3 +112,10 @@ #define IPTC_SUPPORT #endif /* _TIFFCONF_ */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tiffio.h b/libtiff/tiffio.h index da31f0f3..af6082f6 100644 --- a/libtiff/tiffio.h +++ b/libtiff/tiffio.h @@ -1,4 +1,4 @@ -/* $Id: tiffio.h,v 1.85 2009-11-30 12:22:26 fwarmerdam Exp $ */ +/* $Id: tiffio.h,v 1.86 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -541,3 +541,10 @@ extern const TIFFFieldInfo* TIFFFindFieldInfoByName(TIFF* , const char *, #endif /* _TIFFIO_ */ /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tiffiop.h b/libtiff/tiffiop.h index d05fcbf7..80b4a31c 100644 --- a/libtiff/tiffiop.h +++ b/libtiff/tiffiop.h @@ -1,4 +1,4 @@ -/* $Id: tiffiop.h,v 1.73 2008-04-14 09:05:26 dron Exp $ */ +/* $Id: tiffiop.h,v 1.74 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -365,3 +365,10 @@ extern TIFFCodec _TIFFBuiltinCODECS[]; #endif /* _TIFFIOP_ */ /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/tiffvers.h b/libtiff/tiffvers.h index 15d1c871..6999cc2f 100644 --- a/libtiff/tiffvers.h +++ b/libtiff/tiffvers.h @@ -7,3 +7,10 @@ * string returned by TIFFGetVersion. */ #define TIFFLIB_VERSION 20091104 +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/libtiff/uvcode.h b/libtiff/uvcode.h index 5b2d7d71..50f11d7e 100644 --- a/libtiff/uvcode.h +++ b/libtiff/uvcode.h @@ -171,3 +171,10 @@ static struct { { (float)0.016994, 31, 16237 }, { (float)0.023659, 21, 16268 }, }; +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/tools/bmp2tiff.c b/tools/bmp2tiff.c index 861eb430..c66a8d21 100644 --- a/tools/bmp2tiff.c +++ b/tools/bmp2tiff.c @@ -1,4 +1,4 @@ -/* $Id: bmp2tiff.c,v 1.22 2009-01-22 20:53:07 fwarmerdam Exp $ +/* $Id: bmp2tiff.c,v 1.23 2010-03-10 18:56:49 bfriesen Exp $ * * Project: libtiff tools * Purpose: Convert Windows BMP files in TIFF. @@ -845,3 +845,10 @@ usage(void) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/tools/fax2ps.c b/tools/fax2ps.c index ecd2ec8c..72a450e8 100644 --- a/tools/fax2ps.c +++ b/tools/fax2ps.c @@ -1,4 +1,4 @@ -/* $Id: fax2ps.c,v 1.23 2009-01-22 21:50:43 fwarmerdam Exp $" */ +/* $Id: fax2ps.c,v 1.24 2010-03-10 18:56:49 bfriesen Exp $" */ /* * Copyright (c) 1991-1997 Sam Leffler @@ -441,3 +441,10 @@ usage(int code) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/tools/fax2tiff.c b/tools/fax2tiff.c index b3119f56..8881e5fc 100644 --- a/tools/fax2tiff.c +++ b/tools/fax2tiff.c @@ -1,4 +1,4 @@ -/* $Id: fax2tiff.c,v 1.21 2009-01-22 21:12:45 fwarmerdam Exp $ */ +/* $Id: fax2tiff.c,v 1.22 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1990-1997 Sam Leffler @@ -460,3 +460,10 @@ usage(void) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/tools/gif2tiff.c b/tools/gif2tiff.c index c0c225a6..64df39be 100644 --- a/tools/gif2tiff.c +++ b/tools/gif2tiff.c @@ -1,4 +1,4 @@ -/* $Id: gif2tiff.c,v 1.10 2009-01-22 21:50:43 fwarmerdam Exp $ */ +/* $Id: gif2tiff.c,v 1.11 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1990-1997 Sam Leffler @@ -517,3 +517,10 @@ rasterize(int interleaved, char* mode) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/tools/pal2rgb.c b/tools/pal2rgb.c index 44ca05b1..c5a3ce4d 100644 --- a/tools/pal2rgb.c +++ b/tools/pal2rgb.c @@ -1,4 +1,4 @@ -/* $Id: pal2rgb.c,v 1.11 2009-01-22 21:50:43 fwarmerdam Exp $ */ +/* $Id: pal2rgb.c,v 1.12 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -426,3 +426,10 @@ usage(void) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/tools/ppm2tiff.c b/tools/ppm2tiff.c index c9675936..1b125357 100644 --- a/tools/ppm2tiff.c +++ b/tools/ppm2tiff.c @@ -1,4 +1,4 @@ -/* $Id: ppm2tiff.c,v 1.14 2009-01-22 20:53:07 fwarmerdam Exp $ */ +/* $Id: ppm2tiff.c,v 1.15 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1991-1997 Sam Leffler @@ -357,3 +357,10 @@ usage(void) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/tools/ras2tiff.c b/tools/ras2tiff.c index ec456f2f..ec8a0712 100644 --- a/tools/ras2tiff.c +++ b/tools/ras2tiff.c @@ -1,4 +1,4 @@ -/* $Id: ras2tiff.c,v 1.17 2009-11-30 18:42:53 fwarmerdam Exp $ */ +/* $Id: ras2tiff.c,v 1.18 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -307,3 +307,10 @@ usage(void) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/tools/raw2tiff.c b/tools/raw2tiff.c index c1168260..9ab980e5 100644 --- a/tools/raw2tiff.c +++ b/tools/raw2tiff.c @@ -1,4 +1,4 @@ -/* $Id: raw2tiff.c,v 1.24 2009-01-22 20:53:07 fwarmerdam Exp $ +/* $Id: raw2tiff.c,v 1.25 2010-03-10 18:56:49 bfriesen Exp $ * * Project: libtiff tools * Purpose: Convert raw byte sequences in TIFF images @@ -642,3 +642,10 @@ usage(void) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/tools/rgb2ycbcr.c b/tools/rgb2ycbcr.c index 70f8ba33..a9afd52d 100644 --- a/tools/rgb2ycbcr.c +++ b/tools/rgb2ycbcr.c @@ -1,4 +1,4 @@ -/* $Id: rgb2ycbcr.c,v 1.12 2009-08-24 17:15:05 bfriesen Exp $ */ +/* $Id: rgb2ycbcr.c,v 1.13 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1991-1997 Sam Leffler @@ -380,3 +380,10 @@ usage(int code) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/tools/sgi2tiff.c b/tools/sgi2tiff.c index 73801894..227e6210 100644 --- a/tools/sgi2tiff.c +++ b/tools/sgi2tiff.c @@ -1,4 +1,4 @@ -/* $Id: sgi2tiff.c,v 1.5 2006-01-11 16:59:36 fwarmerdam Exp $ */ +/* $Id: sgi2tiff.c,v 1.6 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1991-1997 Sam Leffler @@ -326,3 +326,10 @@ usage(void) fprintf(stderr, "%s\n", stuff[i]); exit(-1); } +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/tools/sgisv.c b/tools/sgisv.c index a4a87868..e0d91e06 100644 --- a/tools/sgisv.c +++ b/tools/sgisv.c @@ -1,4 +1,4 @@ -/* $Id: sgisv.c,v 1.5 2006-10-13 10:26:56 dron Exp $ */ +/* $Id: sgisv.c,v 1.6 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1990-1997 Sam Leffler @@ -307,3 +307,10 @@ tiffsv(char* name, int x1, int x2, int y1, int y2) (void) TIFFClose(tif); _TIFFfree((char *)scrbuf); } +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/tools/thumbnail.c b/tools/thumbnail.c index d99a4922..bd23a9d4 100644 --- a/tools/thumbnail.c +++ b/tools/thumbnail.c @@ -1,4 +1,4 @@ -/* $Id: thumbnail.c,v 1.14 2009-01-22 21:12:45 fwarmerdam Exp $ */ +/* $Id: thumbnail.c,v 1.15 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1994-1997 Sam Leffler @@ -650,3 +650,10 @@ usage(void) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/tools/tiff2bw.c b/tools/tiff2bw.c index 780c31ea..20ad42e0 100644 --- a/tools/tiff2bw.c +++ b/tools/tiff2bw.c @@ -1,4 +1,4 @@ -/* $Id: tiff2bw.c,v 1.13 2009-01-22 20:53:07 fwarmerdam Exp $ */ +/* $Id: tiff2bw.c,v 1.14 2010-03-10 18:56:49 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -462,3 +462,10 @@ usage(void) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/tools/tiff2pdf.c b/tools/tiff2pdf.c index b58e2c2a..17782df5 100644 --- a/tools/tiff2pdf.c +++ b/tools/tiff2pdf.c @@ -1,4 +1,4 @@ -/* $Id: tiff2pdf.c,v 1.51 2010-02-22 19:10:07 faxguy Exp $ +/* $Id: tiff2pdf.c,v 1.52 2010-03-10 18:56:49 bfriesen Exp $ * * tiff2pdf - converts a TIFF image to a PDF document * @@ -5399,3 +5399,10 @@ tsize_t t2p_write_pdf(T2P* t2p, TIFF* input, TIFF* output){ } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/tools/tiff2ps.c b/tools/tiff2ps.c index 345d8eb8..829e33ac 100644 --- a/tools/tiff2ps.c +++ b/tools/tiff2ps.c @@ -1,4 +1,4 @@ -/* $Id: tiff2ps.c,v 1.43 2009-01-22 21:12:45 fwarmerdam Exp $ */ +/* $Id: tiff2ps.c,v 1.44 2010-03-10 18:56:50 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -2370,3 +2370,10 @@ usage(int code) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/tools/tiff2rgba.c b/tools/tiff2rgba.c index bc2f1790..18eb1402 100644 --- a/tools/tiff2rgba.c +++ b/tools/tiff2rgba.c @@ -1,4 +1,4 @@ -/* $Id: tiff2rgba.c,v 1.17 2009-08-24 17:15:05 bfriesen Exp $ */ +/* $Id: tiff2rgba.c,v 1.18 2010-03-10 18:56:50 bfriesen Exp $ */ /* * Copyright (c) 1991-1997 Sam Leffler @@ -531,3 +531,10 @@ usage(int code) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/tools/tiffcmp.c b/tools/tiffcmp.c index db06f757..bc7dac94 100644 --- a/tools/tiffcmp.c +++ b/tools/tiffcmp.c @@ -1,4 +1,4 @@ -/* $Id: tiffcmp.c,v 1.15 2009-01-22 20:53:07 fwarmerdam Exp $ */ +/* $Id: tiffcmp.c,v 1.16 2010-03-10 18:56:50 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -635,3 +635,10 @@ leof(const char* name, uint32 row, int s) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/tools/tiffcp.c b/tools/tiffcp.c index 2c337193..64009076 100644 --- a/tools/tiffcp.c +++ b/tools/tiffcp.c @@ -1,4 +1,4 @@ -/* $Id: tiffcp.c,v 1.42 2009-06-30 17:25:26 fwarmerdam Exp $ */ +/* $Id: tiffcp.c,v 1.43 2010-03-10 18:56:50 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -1751,3 +1751,10 @@ pickCopyFunc(TIFF* in, TIFF* out, uint16 bitspersample, uint16 samplesperpixel) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c index 5f3801fd..20192921 100644 --- a/tools/tiffcrop.c +++ b/tools/tiffcrop.c @@ -1,4 +1,4 @@ -/* $Id: tiffcrop.c,v 1.15 2009-11-03 15:24:27 bfriesen Exp $ */ +/* $Id: tiffcrop.c,v 1.16 2010-03-10 18:56:50 bfriesen Exp $ */ /* tiffcrop.c -- a port of tiffcp.c extended to include manipulations of * the image data through additional options listed below @@ -8873,3 +8873,10 @@ invertImage(uint16 photometric, uint16 spp, uint16 bps, uint32 width, uint32 len } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/tools/tiffdither.c b/tools/tiffdither.c index fe6f87ed..3a377ac0 100644 --- a/tools/tiffdither.c +++ b/tools/tiffdither.c @@ -1,4 +1,4 @@ -/* $Id: tiffdither.c,v 1.11 2009-01-22 20:53:08 fwarmerdam Exp $ */ +/* $Id: tiffdither.c,v 1.12 2010-03-10 18:56:50 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -324,3 +324,10 @@ usage(void) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/tools/tiffdump.c b/tools/tiffdump.c index 25f1832b..3011fad2 100644 --- a/tools/tiffdump.c +++ b/tools/tiffdump.c @@ -1,4 +1,4 @@ -/* $Id: tiffdump.c,v 1.21 2009-01-22 21:12:45 fwarmerdam Exp $ */ +/* $Id: tiffdump.c,v 1.22 2010-03-10 18:56:50 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -842,3 +842,10 @@ Fatal(const char* fmt, ...) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/tools/tiffgt.c b/tools/tiffgt.c index ac5a03bb..33336907 100644 --- a/tools/tiffgt.c +++ b/tools/tiffgt.c @@ -1,4 +1,4 @@ -/* $Id: tiffgt.c,v 1.8 2009-08-30 17:38:51 bfriesen Exp $ */ +/* $Id: tiffgt.c,v 1.9 2010-03-10 18:56:50 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -453,3 +453,10 @@ photoArg(const char* arg) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/tools/tiffinfo.c b/tools/tiffinfo.c index 8132ba12..204ea2b6 100644 --- a/tools/tiffinfo.c +++ b/tools/tiffinfo.c @@ -1,4 +1,4 @@ -/* $Id: tiffinfo.c,v 1.16 2009-08-28 23:46:56 bfriesen Exp $ */ +/* $Id: tiffinfo.c,v 1.17 2010-03-10 18:56:50 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -463,3 +463,10 @@ tiffinfo(TIFF* tif, uint16 order, long flags) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/tools/tiffinfoce.c b/tools/tiffinfoce.c index c099fb3c..a7248f97 100644 --- a/tools/tiffinfoce.c +++ b/tools/tiffinfoce.c @@ -1,4 +1,4 @@ -/* $Id: tiffinfoce.c,v 1.2 2008-12-30 01:28:25 bfriesen Exp $ */ +/* $Id: tiffinfoce.c,v 1.3 2010-03-10 18:56:50 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -463,3 +463,10 @@ tiffinfo(TIFF* tif, uint16 order, long flags) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/tools/tiffmedian.c b/tools/tiffmedian.c index 3dde6abd..6501494b 100644 --- a/tools/tiffmedian.c +++ b/tools/tiffmedian.c @@ -1,4 +1,4 @@ -/* $Id: tiffmedian.c,v 1.9 2009-01-22 20:53:08 fwarmerdam Exp $ */ +/* $Id: tiffmedian.c,v 1.10 2010-03-10 18:56:50 bfriesen Exp $ */ /* * Apply median cut on an image. @@ -897,3 +897,10 @@ bad: _TIFFfree(nextline); _TIFFfree(outline); } +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/tools/tiffset.c b/tools/tiffset.c index 1c0018b2..c4f306f1 100644 --- a/tools/tiffset.c +++ b/tools/tiffset.c @@ -1,5 +1,5 @@ /****************************************************************************** - * $Id: tiffset.c,v 1.13 2008-01-01 15:46:28 fwarmerdam Exp $ + * $Id: tiffset.c,v 1.14 2010-03-10 18:56:50 bfriesen Exp $ * * Project: libtiff tools * Purpose: Mainline for setting metadata in existing TIFF files. @@ -29,7 +29,12 @@ ****************************************************************************** * * $Log: tiffset.c,v $ - * Revision 1.13 2008-01-01 15:46:28 fwarmerdam + * Revision 1.14 2010-03-10 18:56:50 bfriesen + * * libtiff/tif_aux.c (_TIFFCheckRealloc): Improve error message so + * that it is clearly a memory allocation error message, and also + * includes the size of the allocation request. + * + * Revision 1.13 2008/01/01 15:46:28 fwarmerdam * Changes to reflect the fact that TIFFFieldWithTag() and TIFFFieldWithName() * now return TIFFField pointers instead of TIFFFieldInfo pointers. * @@ -317,3 +322,10 @@ main(int argc, char* argv[]) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/tools/tiffsplit.c b/tools/tiffsplit.c index d17057ab..e340a473 100644 --- a/tools/tiffsplit.c +++ b/tools/tiffsplit.c @@ -1,4 +1,4 @@ -/* $Id: tiffsplit.c,v 1.19 2009-01-22 21:12:45 fwarmerdam Exp $ */ +/* $Id: tiffsplit.c,v 1.20 2010-03-10 18:56:50 bfriesen Exp $ */ /* * Copyright (c) 1992-1997 Sam Leffler @@ -288,3 +288,10 @@ cpTiles(TIFF* in, TIFF* out) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ diff --git a/tools/ycbcr.c b/tools/ycbcr.c index 01982fd5..8f72447d 100644 --- a/tools/ycbcr.c +++ b/tools/ycbcr.c @@ -159,3 +159,10 @@ check(int R, int G, int B) eCodes++; eBits += abs(eR) + abs(eG) + abs(eB); } +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ |