Update app.py

app.py

@@ -37,15 +37,24 @@ def calculate_text_similarity(text1, text2):
 
 
 def calculate_color_similarity(img1, img2):
-    hist1 = cv2.calcHist([img1], [0, 1, 2], None, [8, 8, 8], [0, 256, 0, 256, 0, 256])
-    hist2 = cv2.calcHist([img2], [0, 1, 2], None, [8, 8, 8], [0, 256, 0, 256, 0, 256])
-    return cv2.compareHist(hist1, hist2, cv2.HISTCMP_CORREL)
+    img1_hsv = cv2.cvtColor(img1, cv2.COLOR_BGR2HSV)
+    img2_hsv = cv2.cvtColor(img2, cv2.COLOR_BGR2HSV)
+    hist1 = cv2.calcHist([img1_hsv], [0, 1], None, [180, 256], [0, 180, 0, 256])
+    hist2 = cv2.calcHist([img2_hsv], [0, 1], None, [180, 256], [0, 180, 0, 256])
+    color_similarity = cv2.compareHist(hist1, hist2, cv2.HISTCMP_CORREL)
+    return color_similarity
 
 
 def compare_trademarks(trademark1, trademark2):
     img1 = np.array(trademark1)
     img2 = np.array(trademark2)
 
+    if img1.shape != img2.shape:
+        img1_resized = cv2.resize(img1, (img2.shape[1], img2.shape[0]))
+        img2_resized = cv2.resize(img2, (img1.shape[1], img1.shape[0]))
+        img1 = img1_resized
+        img2 = img2_resized
+
     ssim_score = calculate_ssim(img1, img2)
 
     text1 = "Trademark text 1"
@@ -65,15 +74,4 @@ def prevent_trademark_conflict(trademark1, trademark2):
 
 # Interface
 trademark_comparison_interface = gr.Interface(
-    fn=prevent_trademark_conflict,
-    inputs=[
-        gr.inputs.Image(type="pil", label="Trademark Image 1"),
-        gr.inputs.Image(type="pil", label="Trademark Image 2"),
-    ],
-    outputs="text",
-    title="Trademark Comparison",
-    description="Compare two trademarks based on SSIM, text similarity, and color similarity.",
-)
-
-# Launch the interface
-trademark_comparison_interface.launch()
+    fn=prevent_trademark_conflict