|
66 | 66 | landmarks_frame = pd.read_csv('faces/face_landmarks.csv')
|
67 | 67 |
|
68 | 68 | n = 65
|
69 |
| -img_name = landmarks_frame.ix[n, 0] |
70 |
| -landmarks = landmarks_frame.ix[n, 1:].as_matrix().astype('float') |
71 |
| -landmarks = landmarks.reshape(-1, 2) |
| 69 | +img_name = landmarks_frame.iloc[n, 0] |
| 70 | +landmarks = landmarks_frame.iloc[n, 1:].as_matrix() |
| 71 | +landmarks = landmarks.astype('float').reshape(-1, 2) |
72 | 72 |
|
73 | 73 | print('Image name: {}'.format(img_name))
|
74 | 74 | print('Landmarks shape: {}'.format(landmarks.shape))
|
@@ -136,10 +136,11 @@ def __len__(self):
|
136 | 136 | return len(self.landmarks_frame)
|
137 | 137 |
|
138 | 138 | def __getitem__(self, idx):
|
139 |
| - img_name = os.path.join(self.root_dir, self.landmarks_frame.ix[idx, 0]) |
| 139 | + img_name = os.path.join(self.root_dir, |
| 140 | + self.landmarks_frame.iloc[idx, 0]) |
140 | 141 | image = io.imread(img_name)
|
141 |
| - landmarks = self.landmarks_frame.ix[idx, 1:].as_matrix().astype('float') |
142 |
| - landmarks = landmarks.reshape(-1, 2) |
| 142 | + landmarks = self.landmarks_frame.iloc[idx, 1:].as_matrix() |
| 143 | + landmarks = landmarks.astype('float').reshape(-1, 2) |
143 | 144 | sample = {'image': image, 'landmarks': landmarks}
|
144 | 145 |
|
145 | 146 | if self.transform:
|
|
0 commit comments