RPJosh
/
memories
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

faces: skip invalid face images (#230)

pull/148/head
Varun Patil 2022-11-28 05:58:51 -08:00
parent f1c0d51a7d
commit 7862d28dc1
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Controller/FacesController.php
View File

@ -96,7 +96,8 @@ class FacesController extends ApiBase
} }
// Find the first detection that has a preview // Find the first detection that has a preview
$preview = null; /** @var \Imagick */
$image = null;
$userFolder = $this->rootFolder->getUserFolder($user->getUID()); $userFolder = $this->rootFolder->getUserFolder($user->getUID());
foreach ($detections as &$detection) { foreach ($detections as &$detection) {
// Get the file (also checks permissions) // Get the file (also checks permissions)
@ -113,6 +114,18 @@ class FacesController extends ApiBase
// Get (hopefully cached) preview image // Get (hopefully cached) preview image
try { try {
$preview = $this->previewManager->getPreview($files[0], 2048, 2048, false); $preview = $this->previewManager->getPreview($files[0], 2048, 2048, false);
$image = new \Imagick();
if (!$image->readImageBlob($preview->getContent())) {
throw new \Exception('Failed to read image blob');
}
$iw = $image->getImageWidth();
$ih = $image->getImageHeight();
if ($iw <= 0 || $ih <= 0) {
$image = null;
throw new \Exception('Invalid image size');
}
} catch (\Exception $e) { } catch (\Exception $e) {
continue; continue;
} }
@ -122,15 +135,11 @@ class FacesController extends ApiBase
} }
// Make sure the preview is valid // Make sure the preview is valid
if (null === $preview) { if (null === $image) {
return new DataResponse([], Http::STATUS_NOT_FOUND); return new DataResponse([], Http::STATUS_NOT_FOUND);
} }
// Crop image // Crop image
$image = new \Imagick();
$image->readImageBlob($preview->getContent());
$iw = $image->getImageWidth();
$ih = $image->getImageHeight();
$dw = (float) $detection['width']; $dw = (float) $detection['width'];
$dh = (float) $detection['height']; $dh = (float) $detection['height'];
$dcx = (float) $detection['x'] + (float) $detection['width'] / 2; $dcx = (float) $detection['x'] + (float) $detection['width'] / 2;