Skip to content

Commit 42c730b

Browse files
committed
Address review
1 parent 18539a5 commit 42c730b

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

components/camera/camera.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,11 @@ func GetImageFromGetImages(ctx context.Context, sourceName *string, mimeType str
179179
return nil, ImageMetadata{}, errors.New("no images returned from camera")
180180
}
181181

182+
// if mimeType is empty, use JPEG as default
183+
if mimeType == "" {
184+
mimeType = utils.MimeTypeJPEG
185+
}
186+
182187
var img image.Image
183188
if sourceName == nil {
184189
img = images[0].Image
@@ -224,8 +229,10 @@ func GetImagesFromGetImage(
224229
if len(resBytes) == 0 {
225230
return nil, resource.ResponseMetadata{}, errors.New("received empty bytes from camera")
226231
}
227-
if resMetadata.MimeType != mimeType {
228-
logger.Warnf("requested mime type %s, but received %s", mimeType, resMetadata.MimeType)
232+
233+
resMimetype, _ := utils.CheckLazyMIMEType(resMetadata.MimeType)
234+
if resMimetype != mimeType {
235+
logger.Warnf("requested mime type %s, but received %s", mimeType, resMimetype)
229236
}
230237

231238
img, err := rimage.DecodeImage(ctx, resBytes, utils.WithLazyMIMEType(mimeType))

components/camera/camera_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ func TestGetImageFromGetImages(t *testing.T) {
287287
testImg1 := image.NewRGBA(image.Rect(0, 0, 100, 100))
288288
testImg2 := image.NewRGBA(image.Rect(0, 0, 200, 200))
289289

290-
testCam := inject.NewCamera("test_cam")
290+
testCam := inject.NewCamera("rgba_cam")
291291
testCam.ImagesFunc = func(ctx context.Context) ([]camera.NamedImage, resource.ResponseMetadata, error) {
292292
return []camera.NamedImage{
293293
{Image: testImg1, SourceName: source1Name},
@@ -379,7 +379,7 @@ func TestGetImagesFromGetImage(t *testing.T) {
379379
logger := logging.NewTestLogger(t)
380380
testImg := image.NewRGBA(image.Rect(0, 0, 100, 100))
381381

382-
testCam := inject.NewCamera("test_cam")
382+
testCam := inject.NewCamera("rgba_cam")
383383
testCam.ImageFunc = func(ctx context.Context, mimeType string, extra map[string]interface{}) ([]byte, camera.ImageMetadata, error) {
384384
imgBytes, err := rimage.EncodeImage(ctx, testImg, mimeType)
385385
if err != nil {

0 commit comments

Comments
 (0)