From 389b87f8cb9dbf2f31be8b70a94a3e47e11693db Mon Sep 17 00:00:00 2001 From: Mohammed Yasin <32206511+Y-T-G@users.noreply.github.com> Date: Sat, 22 Nov 2025 03:17:12 +0800 Subject: [PATCH] `ultralytics 8.3.230` Fix color conversion for Tensor inputs and PIL plots (#22734) Signed-off-by: Glenn Jocher Co-authored-by: Glenn Jocher --- ultralytics/__init__.py | 2 +- ultralytics/engine/results.py | 2 +- ultralytics/models/rtdetr/predict.py | 2 +- ultralytics/models/sam/predict.py | 2 +- ultralytics/models/yolo/classify/predict.py | 2 +- ultralytics/models/yolo/detect/predict.py | 2 +- ultralytics/utils/plotting.py | 9 +++++---- 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ultralytics/__init__.py b/ultralytics/__init__.py index 6a3cd3d2..158540c1 100644 --- a/ultralytics/__init__.py +++ b/ultralytics/__init__.py @@ -1,6 +1,6 @@ # Ultralytics 🚀 AGPL-3.0 License - https://ultralytics.com/license -__version__ = "8.3.229" +__version__ = "8.3.230" import importlib import os diff --git a/ultralytics/engine/results.py b/ultralytics/engine/results.py index ecdb5e26..912fd4f6 100644 --- a/ultralytics/engine/results.py +++ b/ultralytics/engine/results.py @@ -589,7 +589,7 @@ class Results(SimpleClass, DataExportMixin): if save: annotator.save(filename or f"results_{Path(self.path).name}") - return annotator.im if pil else annotator.result() + return annotator.result(pil) def show(self, *args, **kwargs): """Display the image with annotated inference results. diff --git a/ultralytics/models/rtdetr/predict.py b/ultralytics/models/rtdetr/predict.py index c072b360..bee5a6b0 100644 --- a/ultralytics/models/rtdetr/predict.py +++ b/ultralytics/models/rtdetr/predict.py @@ -55,7 +55,7 @@ class RTDETRPredictor(BasePredictor): bboxes, scores = preds[0].split((4, nd - 4), dim=-1) if not isinstance(orig_imgs, list): # input images are a torch.Tensor, not a list - orig_imgs = ops.convert_torch2numpy_batch(orig_imgs) + orig_imgs = ops.convert_torch2numpy_batch(orig_imgs)[..., ::-1] results = [] for bbox, score, orig_img, img_path in zip(bboxes, scores, orig_imgs, self.batch[0]): # (300, 4) diff --git a/ultralytics/models/sam/predict.py b/ultralytics/models/sam/predict.py index b3566bca..f7517afd 100644 --- a/ultralytics/models/sam/predict.py +++ b/ultralytics/models/sam/predict.py @@ -502,7 +502,7 @@ class Predictor(BasePredictor): names = dict(enumerate(str(i) for i in range(pred_masks.shape[0]))) if not isinstance(orig_imgs, list): # input images are a torch.Tensor, not a list - orig_imgs = ops.convert_torch2numpy_batch(orig_imgs) + orig_imgs = ops.convert_torch2numpy_batch(orig_imgs)[..., ::-1] results = [] for masks, orig_img, img_path in zip([pred_masks], orig_imgs, self.batch[0]): diff --git a/ultralytics/models/yolo/classify/predict.py b/ultralytics/models/yolo/classify/predict.py index f8d73b1b..0d11f8fb 100644 --- a/ultralytics/models/yolo/classify/predict.py +++ b/ultralytics/models/yolo/classify/predict.py @@ -81,7 +81,7 @@ class ClassificationPredictor(BasePredictor): (list[Results]): List of Results objects containing classification results for each image. """ if not isinstance(orig_imgs, list): # Input images are a torch.Tensor, not a list - orig_imgs = ops.convert_torch2numpy_batch(orig_imgs) + orig_imgs = ops.convert_torch2numpy_batch(orig_imgs)[..., ::-1] preds = preds[0] if isinstance(preds, (list, tuple)) else preds return [ diff --git a/ultralytics/models/yolo/detect/predict.py b/ultralytics/models/yolo/detect/predict.py index c6fdea07..f4127ddc 100644 --- a/ultralytics/models/yolo/detect/predict.py +++ b/ultralytics/models/yolo/detect/predict.py @@ -65,7 +65,7 @@ class DetectionPredictor(BasePredictor): ) if not isinstance(orig_imgs, list): # input images are a torch.Tensor, not a list - orig_imgs = ops.convert_torch2numpy_batch(orig_imgs) + orig_imgs = ops.convert_torch2numpy_batch(orig_imgs)[..., ::-1] if save_feats: obj_feats = self.get_obj_feats(self._feats, preds[1]) diff --git a/ultralytics/utils/plotting.py b/ultralytics/utils/plotting.py index bbeb6bc3..c3a00125 100644 --- a/ultralytics/utils/plotting.py +++ b/ultralytics/utils/plotting.py @@ -207,7 +207,7 @@ class Annotator: elif im.shape[2] > 3: # multispectral im = np.ascontiguousarray(im[..., :3]) if self.pil: # use PIL - self.im = im if input_is_pil else Image.fromarray(im) + self.im = im if input_is_pil else Image.fromarray(im) # stay in BGR since color palette is in BGR if self.im.mode not in {"RGB", "RGBA"}: # multispectral self.im = self.im.convert("RGB") self.draw = ImageDraw.Draw(self.im, "RGBA") @@ -515,9 +515,10 @@ class Annotator: self.im = im if isinstance(im, Image.Image) else Image.fromarray(im) self.draw = ImageDraw.Draw(self.im) - def result(self): - """Return annotated image as array.""" - return np.asarray(self.im) + def result(self, pil=False): + """Return annotated image as array or PIL image.""" + im = np.asarray(self.im) # self.im is in BGR + return Image.fromarray(im[..., ::-1]) if pil else im def show(self, title: str | None = None): """Show the annotated image."""