Do some conversions of proto_tree_add_item() 'encoding' arg.

(previously missed).

    57   FT_BOOLEAN:       FALSE-->ENC_BIG_ENDIAN
    31   FT_BOOLEAN:       TRUE-->ENC_LITTLE_ENDIAN

    10   FT_BYTES:         ENC_BIG_ENDIAN-->ENC_NA
     1   FT_BYTES:         ENC_LITTLE_ENDIAN-->ENC_NA
    21   FT_BYTES:         FALSE-->ENC_NA
     2   FT_BYTES:         TRUE-->ENC_NA

     2   FT_IPXNET:        ENC_BIG_ENDIAN-->ENC_NA

     6   FT_IPv6:          ENC_BIG_ENDIAN-->ENC_NA
     1   FT_IPv6:          FALSE-->ENC_NA

     6   FT_NONE:          ENC_BIG_ENDIAN-->ENC_NA
    19   FT_NONE:          FALSE-->ENC_NA
     3   FT_NONE:          TRUE-->ENC_NA

     1   FT_STRING:        ENC_BIG_ENDIAN-->ENC_ASCII|ENC_NA
     1   FT_STRING:        ENC_LITTLE_ENDIAN-->ENC_ASCII|ENC_NA
     5   FT_STRING:        FALSE-->ENC_ASCII|ENC_NA
     1   FT_STRING:        TRUE-->ENC_ASCII|ENC_NA

     4   FT_STRINGZ:       ENC_NA-->ENC_ASCII|ENC_NA
     8   FT_STRINGZ:       FALSE-->ENC_ASCII|ENC_NA

     1   FT_INT32:         FALSE-->ENC_BIG_ENDIAN
     1   FT_INT32:         TRUE-->ENC_LITTLE_ENDIAN

    11   FT_UINT8:         0-->ENC_BIG_ENDIAN
   111   FT_UINT8:         FALSE-->ENC_BIG_ENDIAN
    17   FT_UINT8:         TRUE-->ENC_LITTLE_ENDIAN
     1   FT_UINT16:        0-->ENC_BIG_ENDIAN
    68   FT_UINT16:        FALSE-->ENC_BIG_ENDIAN
    18   FT_UINT16:        TRUE-->ENC_LITTLE_ENDIAN
     4   FT_UINT24:        FALSE-->ENC_BIG_ENDIAN
    70   FT_UINT32:        FALSE-->ENC_BIG_ENDIAN
     1   FT_UINT32:        TRUE-->ENC_LITTLE_ENDIAN
     4   FT_UINT64:        FALSE-->ENC_BIG_ENDIAN
     1   FT_UINT64:        TRUE-->ENC_LITTLE_ENDIAN

     1   FT_UINT_STRING:   FALSE-->ENC_ASCII|ENC_BIG_ENDIAN


svn path=/trunk/; revision=39442

1 files changed, 23 insertions, 23 deletions

diff --git a/epan/dissectors/packet-image-gif.c b/epan/dissectors/packet-image-gif.c
index 6b6b61d1ed..651e080123 100644
--- a/epan/dissectors/packet-image-gif.c
+++ b/epan/dissectors/packet-image-gif.c
@@ -181,10 +181,10 @@ dissect_gif(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 		proto_item_append_text(ti, ", Version: %s", str);
 		gif_tree = proto_item_add_subtree(ti, ett_gif);
 		/* GIF signature */
-		proto_tree_add_item(gif_tree, hf_version, tvb, 0, 6, TRUE);
+		proto_tree_add_item(gif_tree, hf_version, tvb, 0, 6, ENC_ASCII|ENC_NA);
 		/* Screen descriptor */
-		proto_tree_add_item(gif_tree, hf_screen_width, tvb, 6, 2, TRUE);
-		proto_tree_add_item(gif_tree, hf_screen_height, tvb, 8, 2, TRUE);
+		proto_tree_add_item(gif_tree, hf_screen_width, tvb, 6, 2, ENC_LITTLE_ENDIAN);
+		proto_tree_add_item(gif_tree, hf_screen_height, tvb, 8, 2, ENC_LITTLE_ENDIAN);
 
 		peek = tvb_get_guint8(tvb, 10);
 		/* Bitfield gccc 0ppp
@@ -208,19 +208,19 @@ dissect_gif(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 				image_bpp, plurality(image_bpp, "", "s"));
 		subtree = proto_item_add_subtree(ti, ett_global_flags);
 		proto_tree_add_item(subtree, hf_global_color_map_present,
-				tvb, 10, 1, TRUE);
+				tvb, 10, 1, ENC_LITTLE_ENDIAN);
 		proto_tree_add_item(subtree, hf_global_color_resolution,
-				tvb, 10, 1, TRUE);
+				tvb, 10, 1, ENC_LITTLE_ENDIAN);
 		if (version == GIF_89a) {
 			proto_tree_add_item(subtree, hf_global_color_map_ordered,
-					tvb, 10, 1, TRUE);
+					tvb, 10, 1, ENC_LITTLE_ENDIAN);
 		}
 		proto_tree_add_item(subtree, hf_global_image_bpp,
-				tvb, 10, 1, TRUE);
+				tvb, 10, 1, ENC_LITTLE_ENDIAN);
 
 		/* Background color */
 		proto_tree_add_item(gif_tree, hf_background_color,
-				tvb, 11, 1, TRUE);
+				tvb, 11, 1, ENC_LITTLE_ENDIAN);
 
 		/* byte at offset 12 is 0x00 - reserved in GIF87a but encodes the
 		 * pixel aspect ratio in GIF89a as:
@@ -245,7 +245,7 @@ dissect_gif(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 		if (color_map_present) {
 			len = 3 * (1 << image_bpp);
 			proto_tree_add_item(gif_tree, hf_global_color_map,
-					tvb, 13, len, TRUE);
+					tvb, 13, len, ENC_NA);
 		} else {
 			len = 0;
 		}
@@ -311,11 +311,11 @@ dissect_gif(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 										 */
 
 				ti = proto_tree_add_item(gif_tree, hf_extension,
-						tvb, offset, 1, TRUE);
+						tvb, offset, 1, ENC_NA);
 				subtree = proto_item_add_subtree(ti, ett_extension);
 				offset++;
 				proto_tree_add_item(subtree, hf_extension_label,
-						tvb, offset, 1, TRUE);
+						tvb, offset, 1, ENC_LITTLE_ENDIAN);
 				peek = tvb_get_guint8(tvb, offset);
 				proto_item_append_text(ti, ": %s",
 						val_to_str(peek, vals_extensions,
@@ -345,18 +345,18 @@ dissect_gif(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 										 */
 
 				ti = proto_tree_add_item(gif_tree, hf_image,
-						tvb, offset, 1, TRUE);
+						tvb, offset, 1, ENC_NA);
 				subtree = proto_item_add_subtree(ti, ett_image);
 				offset++;
 				/* Screen descriptor */
 				proto_tree_add_item(subtree, hf_image_left,
-						tvb, offset, 2, TRUE); offset += 2;
+						tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2;
 				proto_tree_add_item(subtree, hf_image_top,
-						tvb, offset, 2, TRUE); offset += 2;
+						tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2;
 				proto_tree_add_item(subtree, hf_image_width,
-						tvb, offset, 2, TRUE); offset += 2;
+						tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2;
 				proto_tree_add_item(subtree, hf_image_height,
-						tvb, offset, 2, TRUE); offset += 2;
+						tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2;
 				/* bit field */
 				peek = tvb_get_guint8(tvb, offset);
 				color_map_present = peek & 0x80;
@@ -373,15 +373,15 @@ dissect_gif(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 						image_bpp, plurality(image_bpp, "", "s"));
 				subtree2 = proto_item_add_subtree(ti2, ett_local_flags);
 				proto_tree_add_item(subtree2, hf_local_color_map_present,
-						tvb, offset, 1, TRUE);
+						tvb, offset, 1, ENC_LITTLE_ENDIAN);
 				proto_tree_add_item(subtree2, hf_local_color_resolution,
-						tvb, offset, 1, TRUE);
+						tvb, offset, 1, ENC_LITTLE_ENDIAN);
 				if (version == GIF_89a) {
 					proto_tree_add_item(subtree2, hf_local_color_map_ordered,
-							tvb, offset, 1, TRUE);
+							tvb, offset, 1, ENC_LITTLE_ENDIAN);
 				}
 				proto_tree_add_item(subtree2, hf_global_image_bpp,
-						tvb, offset, 1, TRUE);
+						tvb, offset, 1, ENC_LITTLE_ENDIAN);
 				offset++;
 
 				/* Local color map
@@ -391,7 +391,7 @@ dissect_gif(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 				if (color_map_present) {
 					len = 3 * (1 << image_bpp);
 					proto_tree_add_item(subtree, hf_local_color_map,
-							tvb, offset, len, TRUE);
+							tvb, offset, len, ENC_NA);
 				} else {
 					len = 0;
 				}
@@ -399,7 +399,7 @@ dissect_gif(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 				item_len += len;
 
 				proto_tree_add_item(subtree, hf_image_code_size,
-						tvb, offset, 1, TRUE);
+						tvb, offset, 1, ENC_LITTLE_ENDIAN);
 				offset++;
 				do {
 					/* Read length of data block */
@@ -414,7 +414,7 @@ dissect_gif(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 			} else {
 				/* GIF processing stops at this very byte */
 				proto_tree_add_item(gif_tree, hf_trailer,
-						tvb, offset, 1, TRUE);
+						tvb, offset, 1, ENC_NA);
 				break;
 			}
 		} /* while */