Skip to content

Commit ca022d7

Browse files
authored
Fixed auto annotation, tf annotation and auto segmentation apps (#1409)
* fixed code that uses FrameProvider, as the interface has changed * Update CHANGELOG.md
1 parent 3cf0507 commit ca022d7

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1818
-
1919

2020
### Fixed
21-
-
21+
- Auto annotation, TF annotation and Auto segmentation apps (https://github.com/opencv/cvat/pull/1409)
2222

2323
### Security
2424
-

cvat/apps/auto_annotation/image_loader.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def __init__(self, frame_provider):
1111
self._frame_provider = frame_provider
1212

1313
def __iter__(self):
14-
for frame in self._frame_provider.get_frames(self._frame_provider.Quality.ORIGINAL):
14+
for frame, _ in self._frame_provider.get_frames(self._frame_provider.Quality.ORIGINAL):
1515
yield self._load_image(frame)
1616

1717
def __len__(self):

cvat/apps/auto_segmentation/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class InferenceConfig(coco.CocoConfig):
8282
## RUN OBJECT DETECTION
8383
result = {}
8484
frames = frame_provider.get_frames(frame_provider.Quality.ORIGINAL)
85-
for image_num, image_bytes in enumerate(frames):
85+
for image_num, (image_bytes, _) in enumerate(frames):
8686
job.refresh()
8787
if 'cancel' in job.meta:
8888
del job.meta['cancel']

cvat/apps/tf_annotation/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def _normalize_box(box, w, h):
117117
config.gpu_options.allow_growth=True
118118
sess = tf.Session(graph=detection_graph, config=config)
119119
frames = frame_provider.get_frames(frame_provider.Quality.ORIGINAL)
120-
for image_num, image in enumerate(frames):
120+
for image_num, (image, _) in enumerate(frames):
121121

122122
job.refresh()
123123
if 'cancel' in job.meta:

0 commit comments

Comments
 (0)