Merge branch 'develop' of https://github.com/sleuthkit/sleuthkit into develop

tsk/auto/tsk_case_db.h

@@ -68,7 +68,7 @@ class TskAutoDb:public TskAuto {
      * Sets whether or not the file systems for an image should be added when 
      * the image is added to the case database. The default value is true. 
      */
-    void TskAutoDb::setAddFileSystems(bool addFileSytems);
+    void setAddFileSystems(bool addFileSytems);
 
     /**
      * Skip processing of orphans on FAT filesystems.  

tsk/img/img_types.c

@@ -20,7 +20,7 @@
   */
 typedef struct {
     char *name;
-    uint8_t code;
+    uint16_t code;
     char *comment;
 } IMG_TYPES;
 
@@ -39,6 +39,12 @@ static IMG_TYPES img_open_table[] = {
 #endif
 #if HAVE_LIBEWF
     {"ewf", TSK_IMG_TYPE_EWF_EWF, "Expert Witness Format (EnCase)"},
+#endif
+#if HAVE_LIBVMDK
+    {"vmdk", TSK_IMG_TYPE_VMDK_VMDK, "Virtual Machine Disk (VmWare, Virtual Box)"},
+#endif
+#if HAVE_LIBVHDI
+    {"vhd", TSK_IMG_TYPE_VHD_VHD, "Virtual Hard Drive (Microsoft)"},
 #endif
     {0},
 };