Merge pull request #32 from EFinley/patch-1

Replace arbitrary int with named constant
BitMiracle · Nov 21, 2016 · 8a694f7 · 8a694f7
2 parents cbf4363 + 12a9731
commit 8a694f7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/LibTiff/Help/Samples/Using LibTiff.Net/Add custom TIFF tags to an existing TIFF image.aml b/LibTiff/Help/Samples/Using LibTiff.Net/Add custom TIFF tags to an existing TIFF image.aml
@@ -29,8 +29,9 @@ namespace BitMiracle.LibTiff.Samples
         {
             TiffFieldInfo[] tiffFieldInfo = 
             {
-                new TiffFieldInfo(TIFFTAG_GDAL_METADATA, -1, -1, TiffType.ASCII,
-                    FieldBit.Custom, true, false, &quot;GDALMetadata&quot;),
+                new TiffFieldInfo(TIFFTAG_GDAL_METADATA, TiffFieldInfo.Variable, 
+                    TiffFieldInfo.Variable, TiffType.ASCII, FieldBit.Custom, 
+                    true, false, &quot;GDALMetadata&quot;),
             };
 
             tif.MergeFieldInfo(tiffFieldInfo, tiffFieldInfo.Length);
@@ -88,8 +89,9 @@ Namespace BitMiracle.LibTiff.Samples
         Private Shared m_parentExtender As Tiff.TiffExtendProc
 
         Public Shared Sub TagExtender(tif As Tiff)
-            Dim tiffFieldInfo As TiffFieldInfo() = {New TiffFieldInfo(TIFFTAG_GDAL_METADATA, -1, -1, TiffType.ASCII, FieldBit.[Custom], True, _
-             False, &quot;GDALMetadata&quot;)}
+            Dim tiffFieldInfo As TiffFieldInfo() = {New TiffFieldInfo(TIFFTAG_GDAL_METADATA, _
+              TiffFieldInfo.Variable, TiffFieldInfo.Variable, TiffType.ASCII, FieldBit.[Custom], _
+              True, False, &quot;GDALMetadata&quot;)}
 
             tif.MergeFieldInfo(tiffFieldInfo, tiffFieldInfo.Length)
 

diff --git a/LibTiff/Help/Samples/Using LibTiff.Net/Read and write custom TIFF tags.aml b/LibTiff/Help/Samples/Using LibTiff.Net/Read and write custom TIFF tags.aml
@@ -34,7 +34,8 @@ namespace BitMiracle.LibTiff.Samples
         {
             TiffFieldInfo[] tiffFieldInfo = 
             {
-                new TiffFieldInfo(TIFFTAG_ASCIITAG, -1, -1, TiffType.ASCII, FieldBit.Custom, true, false, &quot;MyTag&quot;),
+                new TiffFieldInfo(TIFFTAG_ASCIITAG, TiffFieldInfo.Variable, TiffFieldInfo.Variable, 
+                      TiffType.ASCII, FieldBit.Custom, true, false, &quot;MyTag&quot;),
                 new TiffFieldInfo(TIFFTAG_SHORTTAG, 2, 2, TiffType.SHORT, FieldBit.Custom, false, true, &quot;ShortTag&quot;),
                 new TiffFieldInfo(TIFFTAG_LONGTAG, 2, 2, TiffType.LONG, FieldBit.Custom, false, true, &quot;LongTag&quot;),
                 new TiffFieldInfo(TIFFTAG_RATIONALTAG, 2, 2, TiffType.RATIONAL, FieldBit.Custom, false, true, &quot;RationalTag&quot;),
@@ -182,8 +183,9 @@ Namespace BitMiracle.LibTiff.Samples
         Private Shared m_parentExtender As Tiff.TiffExtendProc
 
         Public Shared Sub TagExtender(ByVal tif As Tiff)
-            Dim tiffFieldInfo As TiffFieldInfo() = {New TiffFieldInfo(TIFFTAG_ASCIITAG, -1, -1, TiffType.ASCII, FieldBit.[Custom], True, _
-             False, &quot;MyTag&quot;), New TiffFieldInfo(TIFFTAG_SHORTTAG, 2, 2, TiffType.[SHORT], FieldBit.[Custom], False, _
+            Dim tiffFieldInfo As TiffFieldInfo() = {New TiffFieldInfo(TIFFTAG_ASCIITAG, TiffFieldInfo.Variable, _
+             TiffFieldInfo.Variable, TiffType.ASCII, FieldBit.[Custom], True, False, &quot;MyTag&quot;), _
+             New TiffFieldInfo(TIFFTAG_SHORTTAG, 2, 2, TiffType.[SHORT], FieldBit.[Custom], False, _
              True, &quot;ShortTag&quot;), New TiffFieldInfo(TIFFTAG_LONGTAG, 2, 2, TiffType.[LONG], FieldBit.[Custom], False, _
              True, &quot;LongTag&quot;), New TiffFieldInfo(TIFFTAG_RATIONALTAG, 2, 2, TiffType.RATIONAL, FieldBit.[Custom], False, _
              True, &quot;RationalTag&quot;), New TiffFieldInfo(TIFFTAG_FLOATTAG, 2, 2, TiffType.FLOAT, FieldBit.[Custom], False, _