various fixes, patch by Christian Meyer

2008-06-03  Jürg Billeter  <j@bitron.ch>

	* vapi/tiff.vapi: various fixes, patch by Christian Meyer

svn path=/trunk/; revision=1548

2 files changed, 195 insertions, 191 deletions

diff --git a/ChangeLog b/ChangeLog
index 0954ca6a7..2cdf231e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-06-03  Jürg Billeter  <j@bitron.ch>
 
+	* vapi/tiff.vapi: various fixes, patch by Christian Meyer
+
+2008-06-03  Jürg Billeter  <j@bitron.ch>
+
 	* vapi/Makefile.am: distribute and install libepc-1.0.vapi
 
 2008-06-02  Jürg Billeter  <j@bitron.ch>
diff --git a/vapi/tiff.vapi b/vapi/tiff.vapi
index 743470ecc..eae411b0b 100644
--- a/vapi/tiff.vapi
+++ b/vapi/tiff.vapi
@@ -219,151 +219,151 @@ namespace Tiff {
 	public static delegate int VSetMethod (TIFF p1, ttag_t p2, ...);
 	************************************************************* */
 	[CCode (cname= "tileContigRoutine")]
-	public static delegate void TileContigRoutine (RGBAImage p1, uint32* p2, uint32 p3, uint32 p4, uint32 p5, uint32 p6, int32 p7, int32 p8, uchar *p9);
+	public static delegate void TileContigRoutine (RGBAImage p1, uint32[] p2, uint32 p3, uint32 p4, uint32 p5, uint32 p6, int32 p7, int32 p8, uchar *p9);
 	[CCode (cname= "tileSeparateRoutine")]
-	public static delegate void TileSeparateRoutine (RGBAImage p1, uint32* p2, uint32 p3, uint32 p4, uint32 p5, uint32 p6, int32 p7, int32 p8, uchar p9, uchar p10, uchar p11, uchar p12);
+	public static delegate void TileSeparateRoutine (RGBAImage p1, uint32[] p2, uint32 p3, uint32 p4, uint32 p5, uint32 p6, int32 p7, int32 p8, uchar p9, uchar p10, uchar* p11, uchar* p12);
 
-	public const int CIELABTORGB_TABLE_RANGE;
-	public const int CLEANFAXDATA_CLEAN;
-	public const int CLEANFAXDATA_REGENERATED;
-	public const int CLEANFAXDATA_UNCLEAN;
-	public const int COLORRESPONSEUNIT_100000S;
-	public const int COLORRESPONSEUNIT_10000S;
-	public const int COLORRESPONSEUNIT_1000S;
-	public const int COLORRESPONSEUNIT_100S;
-	public const int COLORRESPONSEUNIT_10S;
-	public const int COMPRESSION_ADOBE_DEFLATE;
-	public const int COMPRESSION_CCITTFAX3;
-	public const int COMPRESSION_CCITTFAX4;
-	public const int COMPRESSION_CCITTRLE;
-	public const int COMPRESSION_CCITTRLEW;
-	public const int COMPRESSION_CCITT_T4;
-	public const int COMPRESSION_CCITT_T6;
-	public const int COMPRESSION_DEFLATE;
-	public const int COMPRESSION_IT8BL;
-	public const int COMPRESSION_IT8CTPAD;
-	public const int COMPRESSION_IT8LW;
-	public const int COMPRESSION_IT8MP;
-	public const int COMPRESSION_JBIG;
-	public const int COMPRESSION_JP2000;
-	public const int COMPRESSION_JPEG;
-	public const int COMPRESSION_LZW;
-	public const int COMPRESSION_NEXT;
-	public const int COMPRESSION_NONE;
-	public const int COMPRESSION_OJPEG;
-	public const int COMPRESSION_PACKBITS;
-	public const int COMPRESSION_PIXARFILM;
-	public const int COMPRESSION_PIXARLOG;
-	public const int COMPRESSION_SGILOG;
-	public const int COMPRESSION_SGILOG24;
-	public const int COMPRESSION_THUNDERSCAN;
-	public const int DCSIMAGERFILTER_CFA;
-	public const int DCSIMAGERFILTER_IR;
-	public const int DCSIMAGERFILTER_MONO;
-	public const int DCSIMAGERFILTER_OTHER;
-	public const int DCSIMAGERMODEL_M3;
-	public const int DCSIMAGERMODEL_M5;
-	public const int DCSIMAGERMODEL_M6;
-	public const int DCSINTERPMODE_NORMAL;
-	public const int DCSINTERPMODE_PREVIEW;
-	public const int EXIFTAG_APERTUREVALUE;
-	public const int EXIFTAG_BRIGHTNESSVALUE;
-	public const int EXIFTAG_CFAPATTERN;
-	public const int EXIFTAG_COLORSPACE;
-	public const int EXIFTAG_COMPRESSEDBITSPERPIXEL;
-	public const int EXIFTAG_CONTRAST;
-	public const int EXIFTAG_CUSTOMRENDERED;
-	public const int EXIFTAG_DATETIMEORIGINAL;
-	public const int EXIFTAG_DEVICESETTINGDESCRIPTION;
-	public const int EXIFTAG_DIGITALZOOMRATIO;
-	public const int EXIFTAG_EXPOSUREBIASVALUE;
-	public const int EXIFTAG_EXPOSUREINDEX;
-	public const int EXIFTAG_EXPOSUREMODE;
-	public const int EXIFTAG_EXPOSUREPROGRAM;
-	public const int EXIFTAG_EXPOSURETIME;
-	public const int EXIFTAG_FILESOURCE;
-	public const int EXIFTAG_FLASH;
-	public const int EXIFTAG_FLASHENERGY;
-	public const int EXIFTAG_FLASHPIXVERSION;
-	public const int EXIFTAG_FNUMBER;
-	public const int EXIFTAG_FOCALLENGTH;
-	public const int EXIFTAG_FOCALLENGTHIN35MMFILM;
-	public const int EXIFTAG_FOCALPLANERESOLUTIONUNIT;
-	public const int EXIFTAG_FOCALPLANEXRESOLUTION;
-	public const int EXIFTAG_FOCALPLANEYRESOLUTION;
-	public const int EXIFTAG_GAINCONTROL;
-	public const int EXIFTAG_IMAGEUNIQUEID;
-	public const int EXIFTAG_ISOSPEEDRATINGS;
-	public const int EXIFTAG_LIGHTSOURCE;
-	public const int EXIFTAG_MAKERNOTE;
-	public const int EXIFTAG_MAXAPERTUREVALUE;
-	public const int EXIFTAG_METERINGMODE;
-	public const int EXIFTAG_OECF;
-	public const int EXIFTAG_PIXELXDIMENSION;
-	public const int EXIFTAG_PIXELYDIMENSION;
-	public const int EXIFTAG_RELATEDSOUNDFILE;
-	public const int EXIFTAG_SATURATION;
-	public const int EXIFTAG_SCENECAPTURETYPE;
-	public const int EXIFTAG_SCENETYPE;
-	public const int EXIFTAG_SENSINGMETHOD;
-	public const int EXIFTAG_SHARPNESS;
-	public const int EXIFTAG_SHUTTERSPEEDVALUE;
-	public const int EXIFTAG_SPATIALFREQUENCYRESPONSE;
-	public const int EXIFTAG_SPECTRALSENSITIVITY;
-	public const int EXIFTAG_SUBJECTAREA;
-	public const int EXIFTAG_SUBJECTDISTANCE;
-	public const int EXIFTAG_SUBJECTDISTANCERANGE;
-	public const int EXIFTAG_SUBJECTLOCATION;
-	public const int EXIFTAG_SUBSECTIME;
-	public const int EXIFTAG_SUBSECTIMEDIGITIZED;
-	public const int EXIFTAG_SUBSECTIMEORIGINAL;
-	public const int EXIFTAG_USERCOMMENT;
-	public const int EXIFTAG_WHITEBALANCE;
-	public const int EXTRASAMPLE_ASSOCALPHA;
-	public const int EXTRASAMPLE_UNASSALPHA;
-	public const int EXTRASAMPLE_UNSPECIFIED;
-	public const int FAXMODE_BYTEALIGN;
-	public const int FAXMODE_CLASSIC;
-	public const int FAXMODE_NOEOL;
-	public const int FAXMODE_NORTC;
-	public const int FAXMODE_WORDALIGN;
-	public const int FIELD_CUSTOM;
-	public const int FILETYPE_MASK;
-	public const int FILETYPE_PAGE;
-	public const int FILETYPE_REDUCEDIMAGE;
-	public const int FILLORDER_LSB2MSB;
-	public const int FILLORDER_MSB2LSB;
-	public const int GRAYRESPONSEUNIT_100000S;
-	public const int GRAYRESPONSEUNIT_10000S;
-	public const int GRAYRESPONSEUNIT_1000S;
-	public const int GRAYRESPONSEUNIT_100S;
-	public const int GRAYRESPONSEUNIT_10S;
-	public const int GROUP3OPT_2DENCODING;
-	public const int GROUP3OPT_FILLBITS;
-	public const int GROUP3OPT_UNCOMPRESSED;
-	public const int GROUP4OPT_UNCOMPRESSED;
-	public const int INKSET_CMYK;
-	public const int INKSET_MULTIINK;
-	public const int JPEGCOLORMODE_RAW;
-	public const int JPEGCOLORMODE_RGB;
-	public const int JPEGPROC_BASELINE;
-	public const int JPEGPROC_LOSSLESS;
-	public const int JPEGTABLESMODE_HUFF;
-	public const int JPEGTABLESMODE_QUANT;
-	public const int LOGLUV_PUBLIC;
-	public const int MDI_BIGENDIAN;
-	public const int MDI_LITTLEENDIAN;
-	public const int OFILETYPE_IMAGE;
-	public const int OFILETYPE_PAGE;
-	public const int OFILETYPE_REDUCEDIMAGE;
-	public const int ORIENTATION_BOTLEFT;
-	public const int ORIENTATION_BOTRIGHT;
-	public const int ORIENTATION_LEFTBOT;
-	public const int ORIENTATION_LEFTTOP;
-	public const int ORIENTATION_RIGHTBOT;
-	public const int ORIENTATION_RIGHTTOP;
-	public const int ORIENTATION_TOPLEFT;
-	public const int ORIENTATION_TOPRIGHT;
+	public const ttag_t CIELABTORGB_TABLE_RANGE;
+	public const ttag_t CLEANFAXDATA_CLEAN;
+	public const ttag_t CLEANFAXDATA_REGENERATED;
+	public const ttag_t CLEANFAXDATA_UNCLEAN;
+	public const ttag_t COLORRESPONSEUNIT_100000S;
+	public const ttag_t COLORRESPONSEUNIT_10000S;
+	public const ttag_t COLORRESPONSEUNIT_1000S;
+	public const ttag_t COLORRESPONSEUNIT_100S;
+	public const ttag_t COLORRESPONSEUNIT_10S;
+	public const ttag_t COMPRESSION_ADOBE_DEFLATE;
+	public const ttag_t COMPRESSION_CCITTFAX3;
+	public const ttag_t COMPRESSION_CCITTFAX4;
+	public const ttag_t COMPRESSION_CCITTRLE;
+	public const ttag_t COMPRESSION_CCITTRLEW;
+	public const ttag_t COMPRESSION_CCITT_T4;
+	public const ttag_t COMPRESSION_CCITT_T6;
+	public const ttag_t COMPRESSION_DEFLATE;
+	public const ttag_t COMPRESSION_IT8BL;
+	public const ttag_t COMPRESSION_IT8CTPAD;
+	public const ttag_t COMPRESSION_IT8LW;
+	public const ttag_t COMPRESSION_IT8MP;
+	public const ttag_t COMPRESSION_JBIG;
+	public const ttag_t COMPRESSION_JP2000;
+	public const ttag_t COMPRESSION_JPEG;
+	public const ttag_t COMPRESSION_LZW;
+	public const ttag_t COMPRESSION_NEXT;
+	public const ttag_t COMPRESSION_NONE;
+	public const ttag_t COMPRESSION_OJPEG;
+	public const ttag_t COMPRESSION_PACKBITS;
+	public const ttag_t COMPRESSION_PIXARFILM;
+	public const ttag_t COMPRESSION_PIXARLOG;
+	public const ttag_t COMPRESSION_SGILOG;
+	public const ttag_t COMPRESSION_SGILOG24;
+	public const ttag_t COMPRESSION_THUNDERSCAN;
+	public const ttag_t DCSIMAGERFILTER_CFA;
+	public const ttag_t DCSIMAGERFILTER_IR;
+	public const ttag_t DCSIMAGERFILTER_MONO;
+	public const ttag_t DCSIMAGERFILTER_OTHER;
+	public const ttag_t DCSIMAGERMODEL_M3;
+	public const ttag_t DCSIMAGERMODEL_M5;
+	public const ttag_t DCSIMAGERMODEL_M6;
+	public const ttag_t DCSINTERPMODE_NORMAL;
+	public const ttag_t DCSINTERPMODE_PREVIEW;
+	public const ttag_t EXIFTAG_APERTUREVALUE;
+	public const ttag_t EXIFTAG_BRIGHTNESSVALUE;
+	public const ttag_t EXIFTAG_CFAPATTERN;
+	public const ttag_t EXIFTAG_COLORSPACE;
+	public const ttag_t EXIFTAG_COMPRESSEDBITSPERPIXEL;
+	public const ttag_t EXIFTAG_CONTRAST;
+	public const ttag_t EXIFTAG_CUSTOMRENDERED;
+	public const ttag_t EXIFTAG_DATETIMEORIGINAL;
+	public const ttag_t EXIFTAG_DEVICESETTINGDESCRIPTION;
+	public const ttag_t EXIFTAG_DIGITALZOOMRATIO;
+	public const ttag_t EXIFTAG_EXPOSUREBIASVALUE;
+	public const ttag_t EXIFTAG_EXPOSUREINDEX;
+	public const ttag_t EXIFTAG_EXPOSUREMODE;
+	public const ttag_t EXIFTAG_EXPOSUREPROGRAM;
+	public const ttag_t EXIFTAG_EXPOSURETIME;
+	public const ttag_t EXIFTAG_FILESOURCE;
+	public const ttag_t EXIFTAG_FLASH;
+	public const ttag_t EXIFTAG_FLASHENERGY;
+	public const ttag_t EXIFTAG_FLASHPIXVERSION;
+	public const ttag_t EXIFTAG_FNUMBER;
+	public const ttag_t EXIFTAG_FOCALLENGTH;
+	public const ttag_t EXIFTAG_FOCALLENGTHIN35MMFILM;
+	public const ttag_t EXIFTAG_FOCALPLANERESOLUTIONUNIT;
+	public const ttag_t EXIFTAG_FOCALPLANEXRESOLUTION;
+	public const ttag_t EXIFTAG_FOCALPLANEYRESOLUTION;
+	public const ttag_t EXIFTAG_GAINCONTROL;
+	public const ttag_t EXIFTAG_IMAGEUNIQUEID;
+	public const ttag_t EXIFTAG_ISOSPEEDRATINGS;
+	public const ttag_t EXIFTAG_LIGHTSOURCE;
+	public const ttag_t EXIFTAG_MAKERNOTE;
+	public const ttag_t EXIFTAG_MAXAPERTUREVALUE;
+	public const ttag_t EXIFTAG_METERINGMODE;
+	public const ttag_t EXIFTAG_OECF;
+	public const ttag_t EXIFTAG_PIXELXDIMENSION;
+	public const ttag_t EXIFTAG_PIXELYDIMENSION;
+	public const ttag_t EXIFTAG_RELATEDSOUNDFILE;
+	public const ttag_t EXIFTAG_SATURATION;
+	public const ttag_t EXIFTAG_SCENECAPTURETYPE;
+	public const ttag_t EXIFTAG_SCENETYPE;
+	public const ttag_t EXIFTAG_SENSINGMETHOD;
+	public const ttag_t EXIFTAG_SHARPNESS;
+	public const ttag_t EXIFTAG_SHUTTERSPEEDVALUE;
+	public const ttag_t EXIFTAG_SPATIALFREQUENCYRESPONSE;
+	public const ttag_t EXIFTAG_SPECTRALSENSITIVITY;
+	public const ttag_t EXIFTAG_SUBJECTAREA;
+	public const ttag_t EXIFTAG_SUBJECTDISTANCE;
+	public const ttag_t EXIFTAG_SUBJECTDISTANCERANGE;
+	public const ttag_t EXIFTAG_SUBJECTLOCATION;
+	public const ttag_t EXIFTAG_SUBSECTIME;
+	public const ttag_t EXIFTAG_SUBSECTIMEDIGITIZED;
+	public const ttag_t EXIFTAG_SUBSECTIMEORIGINAL;
+	public const ttag_t EXIFTAG_USERCOMMENT;
+	public const ttag_t EXIFTAG_WHITEBALANCE;
+	public const ttag_t EXTRASAMPLE_ASSOCALPHA;
+	public const ttag_t EXTRASAMPLE_UNASSALPHA;
+	public const ttag_t EXTRASAMPLE_UNSPECIFIED;
+	public const ttag_t FAXMODE_BYTEALIGN;
+	public const ttag_t FAXMODE_CLASSIC;
+	public const ttag_t FAXMODE_NOEOL;
+	public const ttag_t FAXMODE_NORTC;
+	public const ttag_t FAXMODE_WORDALIGN;
+	public const ttag_t FIELD_CUSTOM;
+	public const ttag_t FILETYPE_MASK;
+	public const ttag_t FILETYPE_PAGE;
+	public const ttag_t FILETYPE_REDUCEDIMAGE;
+	public const ttag_t FILLORDER_LSB2MSB;
+	public const ttag_t FILLORDER_MSB2LSB;
+	public const ttag_t GRAYRESPONSEUNIT_100000S;
+	public const ttag_t GRAYRESPONSEUNIT_10000S;
+	public const ttag_t GRAYRESPONSEUNIT_1000S;
+	public const ttag_t GRAYRESPONSEUNIT_100S;
+	public const ttag_t GRAYRESPONSEUNIT_10S;
+	public const ttag_t GROUP3OPT_2DENCODING;
+	public const ttag_t GROUP3OPT_FILLBITS;
+	public const ttag_t GROUP3OPT_UNCOMPRESSED;
+	public const ttag_t GROUP4OPT_UNCOMPRESSED;
+	public const ttag_t INKSET_CMYK;
+	public const ttag_t INKSET_MULTIINK;
+	public const ttag_t JPEGCOLORMODE_RAW;
+	public const ttag_t JPEGCOLORMODE_RGB;
+	public const ttag_t JPEGPROC_BASELINE;
+	public const ttag_t JPEGPROC_LOSSLESS;
+	public const ttag_t JPEGTABLESMODE_HUFF;
+	public const ttag_t JPEGTABLESMODE_QUANT;
+	public const ttag_t LOGLUV_PUBLIC;
+	public const ttag_t MDI_BIGENDIAN;
+	public const ttag_t MDI_LITTLEENDIAN;
+	public const ttag_t OFILETYPE_IMAGE;
+	public const ttag_t OFILETYPE_PAGE;
+	public const ttag_t OFILETYPE_REDUCEDIMAGE;
+	public const ttag_t ORIENTATION_BOTLEFT;
+	public const ttag_t ORIENTATION_BOTRIGHT;
+	public const ttag_t ORIENTATION_LEFTBOT;
+	public const ttag_t ORIENTATION_LEFTTOP;
+	public const ttag_t ORIENTATION_RIGHTBOT;
+	public const ttag_t ORIENTATION_RIGHTTOP;
+	public const ttag_t ORIENTATION_TOPLEFT;
+	public const ttag_t ORIENTATION_TOPRIGHT;
 	public const ttag_t PHOTOMETRIC_CIELAB;
 	public const ttag_t PHOTOMETRIC_ICCLAB;
 	public const ttag_t PHOTOMETRIC_ITULAB;
@@ -376,42 +376,42 @@ namespace Tiff {
 	public const ttag_t PHOTOMETRIC_RGB;
 	public const ttag_t PHOTOMETRIC_SEPARATED;
 	public const ttag_t PHOTOMETRIC_YCBCR;
-	public const int PIXARLOGDATAFMT_11BITLOG;
-	public const int PIXARLOGDATAFMT_12BITPICIO;
-	public const int PIXARLOGDATAFMT_16BIT;
-	public const int PIXARLOGDATAFMT_8BIT;
-	public const int PIXARLOGDATAFMT_8BITABGR;
-	public const int PIXARLOGDATAFMT_FLOAT;
-	public const int PLANARCONFIG_CONTIG;
-	public const int PLANARCONFIG_SEPARATE;
-	public const int PREDICTOR_FLOATINGPOINT;
-	public const int PREDICTOR_HORIZONTAL;
-	public const int PREDICTOR_NONE;
-	public const int RESUNIT_CENTIMETER;
-	public const int RESUNIT_INCH;
-	public const int RESUNIT_NONE;
-	public const int SAMPLEFORMAT_COMPLEXIEEEFP;
-	public const int SAMPLEFORMAT_COMPLEXINT;
-	public const int SAMPLEFORMAT_IEEEFP;
-	public const int SAMPLEFORMAT_INT;
-	public const int SAMPLEFORMAT_UINT;
-	public const int SAMPLEFORMAT_VOID;
-	public const int SGILOGDATAFMT_16BIT;
-	public const int SGILOGDATAFMT_8BIT;
-	public const int SGILOGDATAFMT_FLOAT;
-	public const int SGILOGDATAFMT_RAW;
-	public const int SGILOGENCODE_NODITHER;
-	public const int SGILOGENCODE_RANDITHER;
-	public const int THRESHHOLD_BILEVEL;
-	public const int THRESHHOLD_ERRORDIFFUSE;
-	public const int THRESHHOLD_HALFTONE;
-	public const int TIFFPRINT_COLORMAP;
-	public const int TIFFPRINT_CURVES;
-	public const int TIFFPRINT_JPEGACTABLES;
-	public const int TIFFPRINT_JPEGDCTABLES;
-	public const int TIFFPRINT_JPEGQTABLES;
-	public const int TIFFPRINT_NONE;
-	public const int TIFFPRINT_STRIPS;
+	public const ttag_t PIXARLOGDATAFMT_11BITLOG;
+	public const ttag_t PIXARLOGDATAFMT_12BITPICIO;
+	public const ttag_t PIXARLOGDATAFMT_16BIT;
+	public const ttag_t PIXARLOGDATAFMT_8BIT;
+	public const ttag_t PIXARLOGDATAFMT_8BITABGR;
+	public const ttag_t PIXARLOGDATAFMT_FLOAT;
+	public const ttag_t PLANARCONFIG_CONTIG;
+	public const ttag_t PLANARCONFIG_SEPARATE;
+	public const ttag_t PREDICTOR_FLOATINGPOINT;
+	public const ttag_t PREDICTOR_HORIZONTAL;
+	public const ttag_t PREDICTOR_NONE;
+	public const ttag_t RESUNIT_CENTIMETER;
+	public const ttag_t RESUNIT_INCH;
+	public const ttag_t RESUNIT_NONE;
+	public const ttag_t SAMPLEFORMAT_COMPLEXIEEEFP;
+	public const ttag_t SAMPLEFORMAT_COMPLEXINT;
+	public const ttag_t SAMPLEFORMAT_IEEEFP;
+	public const ttag_t SAMPLEFORMAT_INT;
+	public const ttag_t SAMPLEFORMAT_UINT;
+	public const ttag_t SAMPLEFORMAT_VOID;
+	public const ttag_t SGILOGDATAFMT_16BIT;
+	public const ttag_t SGILOGDATAFMT_8BIT;
+	public const ttag_t SGILOGDATAFMT_FLOAT;
+	public const ttag_t SGILOGDATAFMT_RAW;
+	public const ttag_t SGILOGENCODE_NODITHER;
+	public const ttag_t SGILOGENCODE_RANDITHER;
+	public const ttag_t THRESHHOLD_BILEVEL;
+	public const ttag_t THRESHHOLD_ERRORDIFFUSE;
+	public const ttag_t THRESHHOLD_HALFTONE;
+	public const ttag_t TIFFPRINT_COLORMAP;
+	public const ttag_t TIFFPRINT_CURVES;
+	public const ttag_t TIFFPRINT_JPEGACTABLES;
+	public const ttag_t TIFFPRINT_JPEGDCTABLES;
+	public const ttag_t TIFFPRINT_JPEGQTABLES;
+	public const ttag_t TIFFPRINT_NONE;
+	public const ttag_t TIFFPRINT_STRIPS;
 	public const ttag_t TIFFTAG_ANTIALIASSTRENGTH;
 	public const ttag_t TIFFTAG_ARTIST;
 	public const ttag_t TIFFTAG_ASSHOTPREPROFILEMATRIX;
@@ -581,18 +581,18 @@ namespace Tiff {
 	public const ttag_t TIFFTAG_YPOSITION;
 	public const ttag_t TIFFTAG_YRESOLUTION;
 	public const ttag_t TIFFTAG_ZIPQUALITY;
-	public const int BIGENDIAN;
-	public const int BIGTIFF_VERSION;
-	public const int DIROFFSET_SIZE;
-	public const int LITTLEENDIAN;
-	public const int MAGIC_SIZE;
-	public const int SPP;
-	public const int VARIABLE;
-	public const int VARIABLE2;
-	public const int VERSION;
-	public const int VERSION_SIZE;
-	public const int YCBCRPOSITION_CENTERED;
-	public const int YCBCRPOSITION_COSITED;
+	public const ttag_t BIGENDIAN;
+	public const ttag_t BIGTIFF_VERSION;
+	public const ttag_t DIROFFSET_SIZE;
+	public const ttag_t LITTLEENDIAN;
+	public const ttag_t MAGIC_SIZE;
+	public const ttag_t SPP;
+	public const ttag_t VARIABLE;
+	public const ttag_t VARIABLE2;
+	public const ttag_t VERSION;
+	public const ttag_t VERSION_SIZE;
+	public const ttag_t YCBCRPOSITION_CENTERED;
+	public const ttag_t YCBCRPOSITION_COSITED;
 
 	[CCode (cname = "TIFF", free_function = "TIFFClose")]
 	[Compact]