Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
zhouchengrong
2024-06-27 11:03:48 +08:00

View File

@@ -65,7 +65,7 @@ class GenerateImage:
# image_cv2 = cv2.imdecode(image_array, cv2.IMREAD_COLOR) # image_cv2 = cv2.imdecode(image_array, cv2.IMREAD_COLOR)
# image_rbg = cv2.cvtColor(image_cv2, cv2.COLOR_BGR2RGB) # image_rbg = cv2.cvtColor(image_cv2, cv2.COLOR_BGR2RGB)
image_cv2 = oss_get_image(bucket=image_url.split('/')[0], object_name=image_url, data_type="cv2") image_cv2 = oss_get_image(bucket=image_url.split('/')[0], object_name=image_url[image_url.find('/') + 1:], data_type="cv2")
image_rbg = cv2.cvtColor(image_cv2, cv2.COLOR_BGR2RGB) image_rbg = cv2.cvtColor(image_cv2, cv2.COLOR_BGR2RGB)
image = cv2.resize(image_rbg, (1024, 1024)) image = cv2.resize(image_rbg, (1024, 1024))
except minio.error.S3Error: except minio.error.S3Error: