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

C files should not use C++ style comments.

Browse Source
This commit is contained in:
Bob Friesenhahn 2010-06-21 19:09:26 +00:00
parent ee8700a596
commit e3538640b6
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libtiff/tif_dirread.c
View File

@ -1,4 +1,4 @@
/* $Id: tif_dirread.c,v 1.157 2010-05-08 18:33:07 olivier Exp $ */ /* $Id: tif_dirread.c,v 1.158 2010-06-21 19:09:26 bfriesen Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -2792,7 +2792,7 @@ static void TIFFReadDirEntryCheckedSbyte(TIFF* tif, TIFFDirEntry* direntry, int8
static void TIFFReadDirEntryCheckedShort(TIFF* tif, TIFFDirEntry* direntry, uint16* value) static void TIFFReadDirEntryCheckedShort(TIFF* tif, TIFFDirEntry* direntry, uint16* value)
{ {
*value = direntry->tdir_offset.toff_short; *value = direntry->tdir_offset.toff_short;
//*value=*(uint16*)(&direntry->tdir_offset); /* *value=*(uint16*)(&direntry->tdir_offset); */
if (tif->tif_flags&TIFF_SWAB) if (tif->tif_flags&TIFF_SWAB)
TIFFSwabShort(value); TIFFSwabShort(value);
} }

4
libtiff/tif_jpeg.c
View File

@ -1,4 +1,4 @@
/* $Id: tif_jpeg.c,v 1.91 2010-05-07 18:38:46 fwarmerdam Exp $ */ /* $Id: tif_jpeg.c,v 1.92 2010-06-21 19:09:26 bfriesen Exp $ */
/* /*
* Copyright (c) 1994-1997 Sam Leffler * Copyright (c) 1994-1997 Sam Leffler
@ -1401,7 +1401,7 @@ JPEGDecodeRaw(TIFF* tif, uint8* buf, tmsize_t cc, uint16 s)
} }
} }
else else
{ // 12-bit { /* 12-bit */
int value_pairs = (sp->cinfo.d.output_width int value_pairs = (sp->cinfo.d.output_width
* sp->cinfo.d.num_components) / 2; * sp->cinfo.d.num_components) / 2;
int iPair; int iPair;

6
libtiff/tif_win32.c
View File

@ -1,4 +1,4 @@
/* $Id: tif_win32.c,v 1.36 2010-03-10 18:56:49 bfriesen Exp $ */ /* $Id: tif_win32.c,v 1.37 2010-06-21 19:09:26 bfriesen Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -165,8 +165,8 @@ _tiffMapProc(thandle_t fd, void** pbase, toff_t* psize)
if ((uint64)sizem!=size) if ((uint64)sizem!=size)
return (0); return (0);
// By passing in 0 for the maximum file size, it specifies that we /* By passing in 0 for the maximum file size, it specifies that we
// create a file mapping object for the full file size. create a file mapping object for the full file size. */
hMapFile = CreateFileMapping(fd, NULL, PAGE_READONLY, 0, 0, NULL); hMapFile = CreateFileMapping(fd, NULL, PAGE_READONLY, 0, 0, NULL);
if (hMapFile == NULL) if (hMapFile == NULL)
return (0); return (0);

4
tools/tiff2pdf.c
View File

@ -1,4 +1,4 @@
/* $Id: tiff2pdf.c,v 1.53 2010-06-13 19:25:55 fwarmerdam Exp $ /* $Id: tiff2pdf.c,v 1.54 2010-06-21 19:09:26 bfriesen Exp $
* *
* tiff2pdf - converts a TIFF image to a PDF document * tiff2pdf - converts a TIFF image to a PDF document
* *
@ -4803,7 +4803,7 @@ tsize_t t2p_write_pdf_transfer_dict(T2P* t2p, TIFF* output, uint16 i){
tsize_t written=0; tsize_t written=0;
char buffer[32]; char buffer[32];
int buflen=0; int buflen=0;
(void)i; // XXX (void)i; /* XXX */
written += t2pWriteFile(output, (tdata_t) "/FunctionType 0 \n", 17); written += t2pWriteFile(output, (tdata_t) "/FunctionType 0 \n", 17);
written += t2pWriteFile(output, (tdata_t) "/Domain [0.0 1.0] \n", 19); written += t2pWriteFile(output, (tdata_t) "/Domain [0.0 1.0] \n", 19);

4
tools/tiffdump.c
View File

@ -1,4 +1,4 @@
/* $Id: tiffdump.c,v 1.22 2010-03-10 18:56:50 bfriesen Exp $ */ /* $Id: tiffdump.c,v 1.23 2010-06-21 19:09:26 bfriesen Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -169,7 +169,7 @@ dump(int fd, uint64 diroff)
ReadError("TIFF header"); ReadError("TIFF header");
if (hdr.common.tiff_magic != TIFF_BIGENDIAN && hdr.common.tiff_magic != TIFF_LITTLEENDIAN && if (hdr.common.tiff_magic != TIFF_BIGENDIAN && hdr.common.tiff_magic != TIFF_LITTLEENDIAN &&
#if HOST_BIGENDIAN #if HOST_BIGENDIAN
// MDI is sensitive to the host byte order, unlike TIFF /* MDI is sensitive to the host byte order, unlike TIFF */
MDI_BIGENDIAN != hdr.common.tiff_magic ) MDI_BIGENDIAN != hdr.common.tiff_magic )
#else #else
MDI_LITTLEENDIAN != hdr.common.tiff_magic ) MDI_LITTLEENDIAN != hdr.common.tiff_magic )