From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Tue, 25 May 2010 16:06:49 +0000 (-0400)
Subject: remove reference to obsolete/no longer available opencv-php extension.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=dc0d79c803f44b65a1cc4e99a564b9c484b35076;p=horde.git

remove reference to obsolete/no longer available opencv-php extension.

this extension doesn't seem to be available any longer, all links to
it have been dead for well over a year. Also, make note that facedetect
requires opencv version 1.x, 2.0 is not supported.
---

diff --git a/ansel/docs/INSTALL b/ansel/docs/INSTALL
index a20cf639d..fd52ca6f7 100644
--- a/ansel/docs/INSTALL
+++ b/ansel/docs/INSTALL
@@ -97,21 +97,18 @@ To function properly, Ansel **requires** the following:
 
    b. _`OpenCV`
 
-      The opencv module provides the ability to detect human faces in images.
-      If you would like to be able to have Ansel automatically detect faces in
-      your images, you will need to install the opencv module. You will still be
-      able to manually select faces from your images if you do not have opencv
-      installed.
+      The php-facedetect module provides the ability to detect human faces in
+      images. If you would like to be able to have Ansel automatically detect
+      faces in your images, you will need to install both the opencv library as
+      well as the phpfacedetect extension. You will still be able to manually
+      select faces from your images if you do not have this extension installed.
 
       .. _ `OpenCV library`: http://sourceforge.net/projects/opencvlibrary/
-      .. _ `PHP module`: http://d.hatena.ne.jp/moriyoshi/20070924/1190595577
-
-
-      Alternatively, you may use the php-facedetect module instead of the
-      php-opencv module. You will still need to install the OpenCV library.
-
       .. _ `PHP Module`: http://www.xarg.org/project/php-facedetect/
 
+      NOTE: The php-facedetect extension **requires** the use of opencv library
+            version 1.x. Version 2 will NOT work at this time.
+
    c. _`libpuzzle`
 
       The libpuzzle module provides the ability to determine similarities
diff --git a/ansel/lib/Test.php b/ansel/lib/Test.php
index 871f96f65..386081a85 100644
--- a/ansel/lib/Test.php
+++ b/ansel/lib/Test.php
@@ -21,7 +21,7 @@ class Ansel_Test extends Horde_Test
         'facedetect' => array(
             'descrip' => 'Facedetect Face Detection Library',
             'required' => false,
-            'error' => 'Ansel can make use of the Facedetect PHP extension for automatically detecting human faces in images.  You need either OpenCV (above) or Facedetect to detect human faces.'
+            'error' => 'Ansel can make use of the Facedetect PHP extension for automatically detecting human faces in images.'
         ),
         'gd' => array(
             'descrip' => 'GD Support',
@@ -37,11 +37,6 @@ class Ansel_Test extends Horde_Test
             'required' => false,
             'error' => 'Ansel can make use of the libpuzzle PHP extension for finding similar images based on image content.'
         ),
-        'opencv' => array(
-            'descrip' => 'OpenCV Library',
-            'required' => false,
-            'error' => 'Ansel can make use of the OpenCV PHP extension for automatically detecting human faces in images. You need either this library or the one immediately below to detect human faces.'
-        ),
         'zip' => array(
             'descrip' => 'Zip Support',
             'required' => false,