Commit Graph

111 Commits

Author SHA1 Message Date
Abdelrahman Mahmoud 6f27ddf6ca Fix bug, in video-demo not all the frames are wrote to the csv file due to a race condition 2016-06-22 17:25:38 -04:00
Abdelrahman Mahmoud 0ffd40f18a Fix location of highgui header 2016-06-06 00:04:08 -04:00
Abdelrahman Mahmoud 960e01bbdb Add TravisCI build status 2016-06-05 23:37:12 -04:00
Abdelrahman Mahmoud 2c087f0bda Fix valence negatove doesn't show up 2016-06-05 23:33:27 -04:00
Abdelrahman Mahmoud f8ce40680e Fix readme 2016-06-05 23:31:56 -04:00
Abdelrahman Mahmoud 0df3f24706 Merge pull request #7 from Affectiva/linux-3.0
Linux 3.0
2016-04-11 23:00:00 +03:00
Abdelrahman Mahmoud 23fff5902b Merge branch 'linux-3.0' of https://github.com/Affectiva/win-sdk-samples into linux-3.0 2016-04-08 10:13:45 -04:00
Abdelrahman Mahmoud 7c66b5e7af Remove the word Windows from the man pages 2016-04-08 10:12:02 -04:00
abdelrahman 4061763086 iFix bug in video-demo 2016-04-05 14:30:11 -04:00
abdelrahman 9af6fcd9c2 Fix a bug where the screen hangs in the case of photo/video 2016-04-05 13:58:40 -04:00
Abdelrahman Mahmoud 549e446f21 Add to video-demo the ability to process photos as well as images 2016-04-05 11:25:50 -04:00
Abdelrahman Mahmoud 0d8c63f959 Add emojis to the output file 2016-04-05 11:24:54 -04:00
Abdelrahman Mahmoud 4b4e1e05ba Add ld_library_path export 2016-03-25 13:52:08 -04:00
Abdelrahman Mahmoud 961aa8de97 Add travis.yml file for linux builds 2016-03-18 17:11:52 -04:00
Abdelrahman Mahmoud f6fc7b19f1 Fix installation instructions for boost on ubuntu 14.04 2016-03-18 14:56:35 -04:00
Abdelrahman Mahmoud 1c529efd07 Add custom module 2016-03-18 14:31:27 -04:00
Abdelrahman Mahmoud cdeb071732 Add CMakeLists files to generate and compile the sample applications on Ubuntu 14.04 2016-03-18 14:28:55 -04:00
Abdelrahman Mahmoud aff6fc8c10 copy data folder to release directory 2016-02-22 15:23:18 -05:00
Abdelrahman Mahmoud dec27faa6b Update README.md 2016-02-03 07:22:00 -05:00
Abdelrahman Mahmoud 0d39ef4964 Squashed commit of the following:
commit 45c5b72d6c294fe1a4cd90f8090442d313886fc9
Author: Abdelrahman Mahmoud <mahmoud@affectiva.com>
Date:   Wed Feb 3 07:17:09 2016 -0500

    Remove affdex me .. fix dll references

commit 98bfdbc3302c1ba8226a4151826c541d8d250aa9
Author: Abdelrahman Mahmoud <ahamino@gmail.com>
Date:   Wed Feb 3 06:57:59 2016 -0500

    Update README.md

commit fd9dedbdc7daeeacc65ef1df8b79447e5e22cc64
Author: Abdelrahman Mahmoud <ahamino@gmail.com>
Date:   Tue Feb 2 15:43:00 2016 -0500

    Update README.md

    update appveyor badge

commit ccbd9770da316c35de75b47d749e14bd551acc2a
Author: Abdelrahman Mahmoud <mahmoud@affectiva.com>
Date:   Tue Feb 2 15:36:11 2016 -0500

    Update appveyor badge

commit b08547f1dd77548f24140e709a8574d23c8aa7db
Author: Abdelrahman Mahmoud <mahmoud@affectiva.com>
Date:   Tue Feb 2 15:32:03 2016 -0500

    Add appveyor badge

commit e0a2b36ca9fb0c828bf54c7326aa59a1fa6d1079
Author: Abdelrahman Mahmoud <mahmoud@affectiva.com>
Date:   Tue Feb 2 15:11:50 2016 -0500

    remove nuget references

commit b5561f7353381106ad5b133d3bc73d49d36bcbc0
Author: Abdelrahman Mahmoud <mahmoud@affectiva.com>
Date:   Tue Feb 2 15:01:15 2016 -0500

    remove nuget

commit ec3d93bb38e5390f176de23dd249b30e5420f3fb
Author: Abdelrahman Mahmoud <mahmoud@affectiva.com>
Date:   Tue Feb 2 14:09:28 2016 -0500

    More changes to get nuget working

commit ea9662b583d08fa9bae3b30cb2d909d288911b2e
Author: Abdelrahman Mahmoud <mahmoud@affectiva.com>
Date:   Tue Feb 2 12:53:20 2016 -0500

    Change the opencv version

commit 56ffaebfb3c3cdc1610f1ad2c67a47010d0e3dbf
Author: Abdelrahman Mahmoud <mahmoud@affectiva.com>
Date:   Tue Feb 2 12:29:22 2016 -0500

    Commit changes to the nuget configuration

commit 3e6aa2c2dc4a8cb97dd9999154b8c6fb5471c351
Author: Abdelrahman Mahmoud <mahmoud@affectiva.com>
Date:   Tue Feb 2 12:12:03 2016 -0500

    add nuget configuration

commit e69ea5e078b42a286f0ca27b09b922178e376cd1
Author: Abdelrahman Mahmoud <mahmoud@affectiva.com>
Date:   Mon Feb 1 17:02:38 2016 -0500

    Remove unecessary packages from nuget

commit 3f98b04af745b880be3f4be5d4e7d7a6174f2453
Author: Abdelrahman Mahmoud <mahmoud@affectiva.com>
Date:   Mon Dec 21 18:22:45 2015 -0500

    Update the documentation

commit a92352bea891e553fb8f8da61afda3fa255ec46f
Author: Abdelrahman Mahmoud <mahmoud@affectiva.com>
Date:   Mon Dec 21 17:54:55 2015 -0500

    Add video demo 2.1
2016-02-03 07:20:08 -05:00
Abdelrahman Mahmoud 35fb6bec6e Add license file to the repository 2016-01-05 11:36:58 -05:00
Forest Handford 16ea5751ae Added link to developer portal from README.md 2015-10-06 11:31:53 -04:00
Abdelrahman Mahmoud 047418b0e6 Remove licensing folder checking .. since it is nolonger a folder 2015-09-04 11:23:50 -04:00
Abdelrahman Mahmoud f2770f9968 Remove binaries 2015-09-04 11:16:23 -04:00
Abdelrahman Mahmoud 3977f3b10b fix compilation error caused in the previous commit 2015-09-04 11:15:04 -04:00
Abdelrahman Mahmoud 7ff285adcd Remove the registery code from affdexme 2015-09-04 11:06:45 -04:00
Abdelrahman Mahmoud e1013e2a3a Merge pull request #4 from Affectiva/affdex2.0
Affdex SDK 2.0 changes
2015-09-03 17:38:39 -04:00
Abdelrahman Mahmoud d9b8d87a59 Add wpfAnitmatedGif dll 2015-09-03 16:34:51 -04:00
Abdelrahman Mahmoud 7f3aa0e71b Add new files for affdexme 2015-09-03 16:34:30 -04:00
Abdelrahman Mahmoud 383bb912e7 AffdexMe upgraded to include a new selection ui as well as enable /
disable all expressions and emotions
2015-09-03 16:31:43 -04:00
Abdelrahman Mahmoud e4ba8321e0 Fix documentation 2015-09-03 15:52:25 -04:00
Abdelrahman Mahmoud b6e1fd15b6 Changes to opencv-webcam-demo app following SDK 2.0 2015-09-03 15:50:04 -04:00
Abdelrahman Mahmoud c20599c5c6 Memory optimization in AffdexMe 2015-05-13 14:16:46 -04:00
Abdelrahman Mahmoud db9e7bfd37 Update readme instructions 2015-04-21 18:12:54 -04:00
Jay Turcot aa56f9054c Merge pull request #3 from Affectiva/opencv-app-update
update the C++ sample app w/sdk release changes
2015-04-21 17:45:26 -04:00
Abdelrahman Mahmoud 2e8787ebeb add env path to project 2015-04-21 15:23:46 -04:00
Abdelrahman Mahmoud eaa8a4e845 Update opencv test app to new sdk changes 2015-04-21 15:19:54 -04:00
Jay Turcot 00af1ee714 Merge pull request #2 from Affectiva/affdexme
Merging AffdexMe SDK demo to master
2015-04-21 14:54:08 -04:00
Abdelrahman Mahmoud 991cf686c7 Update path to sdk 2015-04-21 14:45:13 -04:00
Abdelrahman Mahmoud 8b23072cf2 update namespace 2015-04-21 14:45:01 -04:00
Abdelrahman Mahmoud 35ef048be8 Update the solution to include affdexme 2015-04-21 14:27:10 -04:00
Abdelrahman Mahmoud e9917a0010 update the markdown file 2015-04-21 14:21:17 -04:00
Abdelrahman Mahmoud 977f324c72 Remove cruft 2015-04-21 14:17:46 -04:00
Abdelrahman Mahmoud 617c7375c9 Optimization - no need to update layout on each call 2015-04-21 14:17:08 -04:00
John Buczkowski 5e9ef929e9 Optimized FeatureDisplay() to minimize calls to CLI class. 2015-04-21 12:36:48 -04:00
John Buczkowski 61f479d1ea Moved ReadMe to HTML (via MarkDown) 2015-04-20 23:11:57 -04:00
John Buczkowski ab8e81d12d Added Debug/Release conditional to project file for including Affdex.dll. 2015-04-20 22:30:07 -04:00
John Buczkowski 30f23b45f5 Removed unused Jenkins template file. 2015-04-20 20:56:10 -04:00
John Buczkowski 6dfd6401ae Removed unused files. 2015-04-20 20:52:53 -04:00
John Buczkowski 0464ff5568 Updated project file with relative rather than absolute paths 2015-04-20 19:51:50 -04:00