public/gallery3-contrib
Archived
1
0
Fork 0
Code Releases Activity

Added ignored face fix from rlparadise

Browse Source
This commit is contained in:
colings 2011-01-01 12:20:47 -06:00
parent ae78daac3c
commit 290e3f220f
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
3.0/modules/picasa_faces/helpers/picasa_faces_task.php
View File

@ -85,6 +85,11 @@ class picasa_faces_task_Core {
foreach ($faces as $faceId => $faceCoords) {
$faceMapping = ORM::factory("picasa_face")->where("face_id", "=", $faceId)->find();
// This is a special id Picasa uses for ignored faces, skip it
if ($faceId == "ffffffffffffffff") {
continue;
}
// If we don't already have a mapping for this face, create one
if (!$faceMapping->loaded()) {
$newTagId = self::getFaceMapping($faceId, $contacts);
@ -242,7 +247,7 @@ class picasa_faces_task_Core {
foreach ($ini_lines as $ini_line) {
// Trim off any whitespace at the ends
$ini_line = trim($ini_line);
if ($ini_line[0] == '[') {
// If this line starts with [ it's a filename, strip off the brackets
$curFilename = substr($ini_line, 1, -1);
@ -250,9 +255,9 @@ class picasa_faces_task_Core {
else {
// If this isn't a filename, it must be data for a file, get the key/value pair
$photoData = explode("=", $ini_line);
if ($photoData[0] == "faces") {
// If it's face data, break it up by face
// If it's face data, break it up by face
$faces = explode(";", $photoData[1]);
$photoFaces = array();
@ -279,7 +284,7 @@ class picasa_faces_task_Core {
$photoFaces[$person] = $facePos;
}
$photosWithFaces[$curFilename] = $photoFaces;
}
}