Prechádzať zdrojové kódy

delete layout_parsing_v2 color function (#3318)

shuai.liu 9 mesiacov pred
rodič
commit
2580e04cc7

+ 2 - 10
paddlex/inference/pipelines/layout_parsing/result_v2.py

@@ -16,9 +16,7 @@ from __future__ import annotations
 import copy
 from pathlib import Path
 from PIL import Image, ImageDraw
-from typing import Dict
 
-import cv2
 import re
 import numpy as np
 from PIL import Image
@@ -29,13 +27,11 @@ from ...common.result import (
     HtmlMixin,
     JsonMixin,
     MarkdownMixin,
-    StrMixin,
     XlsxMixin,
 )
 from .utils import get_layout_ordering
 from .utils import recursive_img_array2path
 from .utils import get_show_color
-from .utils import convert_bgr2rgb
 
 
 class LayoutParsingResultV2(BaseCVResult, HtmlMixin, XlsxMixin, MarkdownMixin):
@@ -66,14 +62,10 @@ class LayoutParsingResultV2(BaseCVResult, HtmlMixin, XlsxMixin, MarkdownMixin):
         if model_settings["use_doc_preprocessor"]:
             for key, value in self["doc_preprocessor_res"].img.items():
                 res_img_dict[key] = value
-        res_img_dict["layout_det_res"] = convert_bgr2rgb(
-            self["layout_det_res"].img["res"]
-        )
+        res_img_dict["layout_det_res"] = self["layout_det_res"].img["res"]
 
         if model_settings["use_general_ocr"] or model_settings["use_table_recognition"]:
-            res_img_dict["overall_ocr_res"] = convert_bgr2rgb(
-                self["overall_ocr_res"].img["ocr_res_img"]
-            )
+            res_img_dict["overall_ocr_res"] = self["overall_ocr_res"].img["ocr_res_img"]
 
         if model_settings["use_table_recognition"] and len(self["table_res_list"]) > 0:
             table_cell_img = Image.fromarray(

+ 0 - 23
paddlex/inference/pipelines/layout_parsing/utils.py

@@ -19,12 +19,9 @@ __all__ = [
     "recursive_img_array2path",
     "get_show_color",
     "sorted_layout_boxes",
-    "convert_bgr2rgb",
 ]
 
 import numpy as np
-import copy
-import cv2
 from PIL import Image
 import uuid
 from pathlib import Path
@@ -34,26 +31,6 @@ from ...models.object_detection.result import DetResult
 from ..components import convert_points_to_boxes
 
 
-def convert_bgr2rgb(data: Image.Image) -> Image.Image:
-    """
-    Convert BGR image to RGB image.
-
-    Args:
-        data (PIL.Image): The input image data.
-
-    Returns:
-        PIL.Image: The converted RGB image data.
-    """
-    return data
-    original_img_array = np.array(data)
-    if original_img_array.ndim == 3 and original_img_array.shape[2] == 3:
-        res_img_array = original_img_array[:, :, ::-1]
-    else:
-        res_img_array = original_img_array
-    res_img = Image.fromarray(res_img_array)
-    return res_img
-
-
 def get_overlap_boxes_idx(src_boxes: np.ndarray, ref_boxes: np.ndarray) -> List:
     """
     Get the indices of source boxes that overlap with reference boxes based on a specified threshold.