Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-15 10:43:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Set WAGTAILIMAGES_FEATURE_DETECTION_ENABLED to False by default in project template, and avoid importing OpenCV if it's false to avoid spurious errors about libdc1394

Browse source
This commit is contained in:
Matt Westcott 2014-09-11 14:22:38 +01:00
parent 1cc64b9478
commit 39ab06722b
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
wagtail/project_template/project_name/settings/base.py
View file

@ -158,3 +158,7 @@ WAGTAIL_SITE_NAME = "{{ project_name }}"
# 'INDEX': '{{ project_name }}',
# },
# }
# Whether to use face/feature detection to improve image cropping - requires OpenCV
WAGTAILIMAGES_FEATURE_DETECTION_ENABLED = False

21
wagtail/wagtailimages/utils/feature_detection.py
View file

@ -1,16 +1,23 @@
import os
from django.conf import settings
try:
import cv
opencv_available = True
except ImportError:
# only try to import OpenCV if WAGTAILIMAGES_FEATURE_DETECTION_ENABLED is True -
# avoids spurious "libdc1394 error: Failed to initialize libdc1394" errors on sites that
# don't even use OpenCV
if getattr(settings, 'WAGTAILIMAGES_FEATURE_DETECTION_ENABLED', False):
try:
import cv2.cv as cv
import cv
opencv_available = True
except ImportError:
opencv_available = False
try:
import cv2.cv as cv
opencv_available = True
except ImportError:
opencv_available = False
else:
opencv_available = False
from wagtail.wagtailimages.utils.focal_point import FocalPoint, combine_focal_points