License text issue in image specific model repos 85/6285/2
authorEric Z <ezavesky@research.att.com>
Wed, 15 Jan 2020 21:08:01 +0000 (15:08 -0600)
committerEric Z <ezavesky@research.att.com>
Wed, 15 Jan 2020 21:08:01 +0000 (15:08 -0600)
- fix license issue by image update, add proper credit
- remove tox testing in legacy environment
- add existing image for test in webdemo

Issue-ID: ACUMOS-3915
Signed-off-by: Eric Z <ezavesky@research.att.com>
Change-Id: I5e5b58886dabde501a1433ee4349d3da1e3f46c3

docs/catalog_image_detect.png
docs/face-privacy-filter.rst
docs/tutorials/demonstration.rst
tox.ini
web_demo/face-privacy.js
web_demo/images/face_glasses.jpg [new file with mode: 0644]

index 1f88764..c8cc38d 100644 (file)
Binary files a/docs/catalog_image_detect.png and b/docs/catalog_image_detect.png differ
index cd49b1f..59ec45d 100644 (file)
@@ -192,7 +192,7 @@ detected image regions.
 Metadata Examples
 =================
 
--  example detect catalog image - `url source <https://flic.kr/p/xqw25C>`__
+-  example detect catalog image - `url source <https://www.pexels.com/photo/close-up-photography-of-man-wearing-sunglasses-1212984/>`__
 -  example blur catalog image - `url source <https://flic.kr/p/bEgYbs>`__
 
 
index 7fe9da0..04a76da 100644 (file)
@@ -28,10 +28,6 @@ Web Demo
 This web page sample allows the user to submit an image to a face
 detection and a face pixelation service in serial progression.
 
-* ***Image Copyrights May Apply*** - the included sample videos may
-carry additional copyright restrictions and are not meant for public resale or
-consumption.
-
 Browser Interaction
 ===================
 
diff --git a/tox.ini b/tox.ini
index ebceacd..a797516 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 skipsdist = True
-envlist = py35,py36
+envlist = py36
 
 [testenv]
 deps = -r{toxinidir}/testing/tox-requirements.txt
index 3eeeb42..5481f07 100644 (file)
@@ -49,7 +49,12 @@ $(document).ready(function() {
             {
                 'img': 'images/face_reunion.jpg',
                 'source': 'https://flic.kr/p/bEgYbs',
-                'name': 'reuninon (flickr)'
+                'name': 'reunion (flickr)'
+            },
+            {
+                'img': 'images/face_glasses.jpg',
+                'source': 'https://www.pexels.com/photo/close-up-photography-of-man-wearing-sunglasses-1212984/',
+                'name': 'glasses (pexels)'
             },
             {
                 'img': 'images/face_family.jpg',
@@ -60,7 +65,7 @@ $(document).ready(function() {
                 'img': 'images/commercial.jpg',
                 'movie': "images/commercial.mp4",
                 'source': 'https://www.youtube.com/watch?v=34KfCNapnUg',
-                'name': 'family (pexels)'
+                'name': 'commercial (pexels)'
             },
             {
                 'img': 'images/face_Schwarzenegger.jpg',
diff --git a/web_demo/images/face_glasses.jpg b/web_demo/images/face_glasses.jpg
new file mode 100644 (file)
index 0000000..8d6e958
Binary files /dev/null and b/web_demo/images/face_glasses.jpg differ