mirror of
https://github.com/iperov/DeepFaceLab.git
synced 2025-08-22 14:24:40 -07:00
Merge branch 'seranus-master-unix-line-endings' into build/update-from-seranus
# Conflicts: # .gitignore # converters/ConverterMasked.py # facelib/LandmarksProcessor.py
This commit is contained in:
commit
5ae319bb79
3 changed files with 19 additions and 24 deletions
|
@ -1,4 +1,4 @@
|
|||

|
||||

|
||||
|
||||

|
||||
|
||||
|
@ -10,12 +10,6 @@ If you like this software, please consider a donation.
|
|||
|
||||
GOAL: next DeepFacelab update.
|
||||
|
||||
[Donate via Yandex.Money](https://money.yandex.ru/to/41001142318065)
|
||||
|
||||
[Donate via Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=lepersorium@gmail.com&lc=US&no_note=0&item_name=Support+DeepFaceLab&cn=&curency_code=USD&bn=PP-DonationsBF:btn_donateCC_LG.gif:NonHosted)
|
||||
|
||||
bitcoin:31mPd6DxPCzbpCMZk4k1koWAbErSyqkAXr
|
||||
|
||||
- ### [Gallery](doc/gallery/doc_gallery.md)
|
||||
|
||||
- ### Manuals:
|
||||
|
|
|
@ -178,6 +178,7 @@ def get_image_hull_mask (image_shape, image_landmarks, ie_polys=None):
|
|||
hull_mask = np.zeros(image_shape[0:2]+(1,),dtype=np.float32)
|
||||
|
||||
# #nose
|
||||
# cv2.fillConvexPoly( hull_mask, cv2.convexHull(int_lmrks[27:36]), (1,) )
|
||||
ml_pnt = (int_lmrks[36] + int_lmrks[0]) // 2
|
||||
mr_pnt = (int_lmrks[16] + int_lmrks[45]) // 2
|
||||
|
||||
|
@ -209,7 +210,7 @@ def get_image_hull_mask (image_shape, image_landmarks, ie_polys=None):
|
|||
|
||||
for item in parts:
|
||||
merged = np.concatenate(item)
|
||||
cv2.fillConvexPoly(hull_mask, cv2.convexHull(merged), 1)
|
||||
cv2.fillConvexPoly(hull_mask, cv2.convexHull(merged), 255.) # pylint: disable=no-member
|
||||
|
||||
if ie_polys is not None:
|
||||
ie_polys.overlay_mask(hull_mask)
|
||||
|
|
|
@ -2,7 +2,7 @@ numpy==1.16.3
|
|||
h5py==2.9.0
|
||||
Keras==2.2.4
|
||||
opencv-python==4.0.0.21
|
||||
tensorflow-gpu==1.12.0
|
||||
tensorflow-gpu==1.14.0
|
||||
plaidml==0.6.0
|
||||
plaidml-keras==0.5.0
|
||||
scikit-image
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue