Merge pull request #2778 from sepinf-inc/#2777_FixPhotoDNA

Fix PhotoDNALookup to correctly map PhotoDNAItem's (#2777)

Author: lfcnassif

iped-engine/src/main/java/iped/engine/hashdb/PhotoDnaTree.java

@@ -27,19 +27,20 @@ public PhotoDnaTree(PhotoDnaItem[] items) {
         childs = new int[maxLen];
         Arrays.fill(starts, -1);
 
-        split(0, items.length, len++);
+        len = 1;
+        split(0, items.length, 0);
 
         rays = Arrays.copyOf(rays, len);
         starts = Arrays.copyOf(starts, len);
         ends = Arrays.copyOf(ends, len);
         childs = Arrays.copyOf(childs, len);
         photoDnaArr = new byte[items[0].getBytes().length][items.length];
         hashId = new int[items.length];
-        Map<Integer, Integer> posToId = new HashMap<Integer, Integer>();
+        Map<PhotoDnaItem, Integer> itemToPos = new HashMap<PhotoDnaItem, Integer>();
         for (int i = 0; i < items.length; i++) {
             PhotoDnaItem item = items[i];
-            int id = hashId[i] = item.getHashId();
-            posToId.put(id, i);
+            hashId[i] = item.getHashId();
+            itemToPos.put(item, i);
             byte[] b = item.getBytes();
             for (int j = 0; j < b.length; j++) {
                 photoDnaArr[j][i] = b[j];
@@ -49,7 +50,7 @@ public PhotoDnaTree(PhotoDnaItem[] items) {
         for (int i = 0; i < len; i++) {
             PhotoDnaItem item = centerItems[i];
             if (item != null) {
-                centers[i] = posToId.get(item.getHashId());
+                centers[i] = itemToPos.get(item);
             }
         }
         this.items = null;

iped-engine/src/main/java/iped/engine/task/PhotoDNALookup.java

@@ -60,7 +60,7 @@ public class PhotoDNALookup extends AbstractTask {
     private static HashDBDataSource hashDBDataSource;
 
     // Magic number used as the first bytes of cache file
-    private static final int magic = 0x20250826;
+    private static final int magic = 0x20260126;
 
     private PhotoDNALookupConfig pdnaLookupConfig;