Merge pull request #499 from sidheshenator/develop

TSK_FACE_DETECTED B Artifact added

bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java

@@ -124,7 +124,9 @@ public enum ARTIFACT_TYPE implements SleuthkitVisitableItem {
 		TSK_GPS_ROUTE(36, "TSK_GPS_ROUTE", //NON-NLS
 				bundle.getString("BlackboardArtifact.tskGpsRoute.text")), // Route based on GPS coordinates
 		TSK_REMOTE_DRIVE(37, "TSK_REMOTE_DRIVE", //NON-NLS
-				bundle.getString("BlackboardArtifact.tskRemoteDrive.text"));
+				bundle.getString("BlackboardArtifact.tskRemoteDrive.text")),
+		TSK_FACE_DETECTED(38, "TSK_FACE_DETECTED", //NON-NLS
+				bundle.getString("BlackboardArtifact.tskFaceDetected.text"));
 
 		/* SEE ABOVE -- KEEP C++ CODE IN SYNC */
 		private final String label;

bindings/java/src/org/sleuthkit/datamodel/Bundle.properties

@@ -34,6 +34,7 @@ BlackboardArtifact.tskEncryptionDetected.text=Encryption Detected
 BlackboardArtifact.tskExtMismatchDetected.text=Extension Mismatch Detected
 BlackboardArtifact.tskInterestingArtifactHit.text=Interesting Results
 BlackboardArtifact.tskRemoteDrive.text=Remote Drive
+BlackboardArtifact.tskFaceDetected.text=Face Detected
 BlackboardAttribute.tskUrl.text=URL
 BlackboardAttribute.tskDatetime.text=Date/Time
 BlackboardAttribute.tskName.text=Name

framework/tsk/framework/services/TskBlackboard.cpp

@@ -49,6 +49,7 @@ map<int, TskArtifactNames> initializeArtifactTypeMap(){
     retval.insert(pair<int, TskArtifactNames>(TSK_INTERESTING_ARTIFACT_HIT, TskArtifactNames("TSK_INTERESTING_ARTIFACT_HIT", "Interesting Results")));
     retval.insert(pair<int, TskArtifactNames>(TSK_GPS_ROUTE, TskArtifactNames("TSK_GPS_ROUTE", "GPS Route")));
     retval.insert(pair<int, TskArtifactNames>(TSK_REMOTE_DRIVE, TskArtifactNames("TSK_REMOTE_DRIVE", "Remote Drive")));
+	retval.insert(pair<int, TskArtifactNames>(TSK_FACE_DETECTED, TskArtifactNames("TSK_FACE_DETECTED", "Face Detected")));
 
     return retval;
 }

framework/tsk/framework/services/TskBlackboard.h

@@ -86,6 +86,7 @@ enum TSK_ARTIFACT_TYPE {
     TSK_INTERESTING_ARTIFACT_HIT = 35,	///< Any artifact interesting enough that it should be called out in the UI.
 	TSK_GPS_ROUTE = 36,	///< Route based on GPS coordinates
 	TSK_REMOTE_DRIVE = 37, ///< Network drive
+	TSK_FACE_DETECTED = 38, ///< Face detected
     
     /* SEE ABOVE:
     * - KEEP JAVA CODE IN SYNC