Skip to content

Commit 1ec133b

Browse files
authoredNov 9, 2022
[RSDK-556] remove width/height from GetImage response and create cust… (viamrobotics#1447)
1 parent 8ba7804 commit 1ec133b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+325
-270
lines changed
 

‎components/camera/camera.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ func (vs *videoSource) NextPointCloud(ctx context.Context) (pointcloud.PointClou
211211
if err != nil {
212212
return nil, err
213213
}
214-
dm, err := rimage.ConvertImageToDepthMap(img)
214+
dm, err := rimage.ConvertImageToDepthMap(ctx, img)
215215
if err != nil {
216216
return nil, errors.Wrapf(err, "cannot project to a point cloud")
217217
}
@@ -474,7 +474,7 @@ func SimultaneousColorDepthNext(ctx context.Context, color, depth gostream.Video
474474
if err != nil {
475475
panic(err)
476476
}
477-
dm, err = rimage.ConvertImageToDepthMap(d)
477+
dm, err = rimage.ConvertImageToDepthMap(ctx, d)
478478
if err != nil {
479479
panic(err)
480480
}

‎components/camera/camera_test.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,8 @@ type simpleSource struct {
283283
}
284284

285285
func (s *simpleSource) Read(ctx context.Context) (image.Image, func(), error) {
286-
img, err := rimage.NewDepthMapFromFile(artifact.MustPath(s.filePath + ".dat.gz"))
286+
img, err := rimage.NewDepthMapFromFile(
287+
context.Background(), artifact.MustPath(s.filePath+".dat.gz"))
287288
return img, func() {}, err
288289
}
289290

@@ -292,7 +293,8 @@ type simpleSourceWithPCD struct {
292293
}
293294

294295
func (s *simpleSourceWithPCD) Read(ctx context.Context) (image.Image, func(), error) {
295-
img, err := rimage.NewDepthMapFromFile(artifact.MustPath(s.filePath + ".dat.gz"))
296+
img, err := rimage.NewDepthMapFromFile(
297+
context.Background(), artifact.MustPath(s.filePath+".dat.gz"))
296298
return img, func() {}, err
297299
}
298300

@@ -463,7 +465,7 @@ func TestCameraWithProjector(t *testing.T) {
463465
test.That(t, got, test.ShouldBeTrue)
464466

465467
img, _, err := camera.ReadImage(
466-
gostream.WithMIMETypeHint(context.Background(), rutils.WithLazyMIMEType(rutils.MimeTypePNG)),
468+
gostream.WithMIMETypeHint(context.Background(), rutils.MimeTypePNG),
467469
cam2)
468470
test.That(t, err, test.ShouldBeNil)
469471

0 commit comments

Comments
 (0)
Please sign in to comment.