Merge branch 'master' into dev

ccvl · Jul 6, 2017 · 674cd4a · 674cd4a
2 parents 2541d7e + ab202c3
commit 674cd4a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/MatlabAPI/Context/getAnnofromJSON.m b/MatlabAPI/Context/getAnnofromJSON.m
@@ -16,7 +16,7 @@
     cate_id = part_annos.annotations(index(ii)).category_id;
     anno.objects(ii).class = part_annos.categories(part_annos_cates == cate_id).name;
     partsnames = part_annos.categories(part_annos_cates == cate_id).parts;
-    partsindices =cell2mat({partsnames.id});
+    partsindices =cell2mat({partsnames.part_id});
 
     % transfer the category id (459 classes) to the original PASCAL 20 classes;
     cate_id = find(part2senmatic == cate_id);

diff --git a/MatlabAPI/detailPartDemo.m b/MatlabAPI/detailPartDemo.m
@@ -17,7 +17,7 @@
 load('./Context/part2senmatic.mat');
 part_annos = gason(fileread(json_path));
 part_annos_imgid = num2str((cell2mat({part_annos.annotations.image_id}))');
-part_annos_cates = cell2mat({part_annos.categories.id});
+part_annos_cates = cell2mat({part_annos.categories.category_id});
 
 % Shuffle image order
 images = cell2mat({part_annos.images.file_name}');