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

added copyright tag

Browse Source
This commit is contained in:
Frank Warmerdam 2001-03-02 04:59:52 +00:00
parent 7b2e915893
commit aba53d12dc
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libtiff/tif_dir.c
View File

@ -1,4 +1,4 @@
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dir.c,v 1.14 2000-10-17 03:23:36 warmerda Exp $ */
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dir.c,v 1.15 2001-03-02 04:59:52 warmerda Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@ -214,6 +214,9 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va_list ap)
case TIFFTAG_SOFTWARE:
_TIFFsetString(&td->td_software, va_arg(ap, char*));
break;
case TIFFTAG_COPYRIGHT:
_TIFFsetString(&td->td_copyright, va_arg(ap, char*));
break;
case TIFFTAG_ORIENTATION:
v = va_arg(ap, int);
if (v < ORIENTATION_TOPLEFT || ORIENTATION_LEFTBOT < v) {
@ -641,6 +644,9 @@ _TIFFVGetField(TIFF* tif, ttag_t tag, va_list ap)
case TIFFTAG_SOFTWARE:
*va_arg(ap, char**) = td->td_software;
break;
case TIFFTAG_COPYRIGHT:
*va_arg(ap, char**) = td->td_copyright;
break;
case TIFFTAG_ORIENTATION:
*va_arg(ap, uint16*) = td->td_orientation;
break;
@ -917,6 +923,7 @@ TIFFFreeDirectory(TIFF* tif)
CleanupField(td_make);
CleanupField(td_model);
CleanupField(td_software);
CleanupField(td_copyright);
CleanupField(td_pagename);
CleanupField(td_sampleinfo);
#if SUBIFD_SUPPORT

6
libtiff/tif_dir.h
View File

@ -1,4 +1,4 @@
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dir.h,v 1.2 1999-12-21 17:03:03 mwelles Exp $ */
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dir.h,v 1.3 2001-03-02 04:59:52 warmerda Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@ -70,6 +70,7 @@ typedef struct {
char* td_make;
char* td_model;
char* td_software;
char* td_copyright;
char* td_pagename;
tstrip_t td_stripsperimage;
tstrip_t td_nstrips; /* size of offset & bytecount arrays */
@ -201,8 +202,9 @@ typedef struct {
#define FIELD_FOVCOT 59
#define FIELD_MATRIX_WORLDTOSCREEN 60
#define FIELD_MATRIX_WORLDTOCAMERA 61
#define FIELD_COPYRIGHT 62
/* end of support for well-known tags; codec-private tags follow */
#define FIELD_CODEC 62 /* base of codec-private tags */
#define FIELD_CODEC 63 /* base of codec-private tags */
/*
* Pseudo-tags don't normally need field bits since they
* are not written to an output file (by definition).

4
libtiff/tif_dirinfo.c
View File

@ -1,4 +1,4 @@
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dirinfo.c,v 1.3 2001-02-17 03:20:39 warmerda Exp $ */
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dirinfo.c,v 1.4 2001-03-02 04:59:52 warmerda Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@ -131,6 +131,8 @@ const TIFFFieldInfo tiffFieldInfo[] = {
#endif
{ TIFFTAG_SOFTWARE, -1,-1, TIFF_ASCII, FIELD_SOFTWARE,
TRUE, FALSE, "Software" },
{ TIFFTAG_COPYRIGHT, -1,-1, TIFF_ASCII, FIELD_COPYRIGHT,
TRUE, FALSE, "Copyright" },
{ TIFFTAG_DATETIME, 20,20, TIFF_ASCII, FIELD_DATETIME,
TRUE, FALSE, "DateTime" },
{ TIFFTAG_ARTIST, -1,-1, TIFF_ASCII, FIELD_ARTIST,

4
libtiff/tif_print.c
View File

@ -1,4 +1,4 @@
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_print.c,v 1.4 2000-07-14 18:43:08 warmerda Exp $ */
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_print.c,v 1.5 2001-03-02 04:59:52 warmerda Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@ -353,6 +353,8 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags)
_TIFFprintAsciiTag(fd, "Host Computer", td->td_hostcomputer);
if (TIFFFieldSet(tif,FIELD_SOFTWARE))
_TIFFprintAsciiTag(fd, "Software", td->td_software);
if (TIFFFieldSet(tif,FIELD_COPYRIGHT))
_TIFFprintAsciiTag(fd, "Copyright", td->td_copyright);
if (TIFFFieldSet(tif,FIELD_DOCUMENTNAME))
_TIFFprintAsciiTag(fd, "Document Name", td->td_documentname);
if (TIFFFieldSet(tif,FIELD_IMAGEDESCRIPTION))