Implement ChatGPT patches: remove HAS_BARCODE gate, enable ZXing-CPP barcode detection

app.py

@@ -60,6 +60,15 @@ except Exception as e:
     HAS_BARCODE = False
     print(f"✗ Barcode reader import failed: {e}")
 
+# Enable barcode detection if we have ZXing-CPP or pyzbar
+if HAS_ZXING:
+    HAS_BARCODE = True
+    print("✓ Barcode detection enabled via ZXing-CPP")
+elif HAS_BARCODE:
+    print("✓ Barcode detection enabled via pyzbar")
+else:
+    print("✗ No barcode detection available")
+
 # -------------------- Core Data --------------------
 @dataclass
 class Box:
@@ -1131,70 +1140,8 @@ def compare_pdfs(file_a, file_b):
         print(f"Spell check results - A: {len(misspell_a)} boxes, B: {len(misspell_b)} boxes")
 
         # Always attempt barcode scan. The PDF path uses ZXing-CPP / pyzbar / dmtx / cv2 if available.
-        try:
-            codes_a = read_barcodes_from_path(file_a.name, max_pages=8, raster_dpis=(400, 600, 900))
-            codes_b = read_barcodes_from_path(file_b.name, max_pages=8, raster_dpis=(400, 600, 900))
-            
-            # Convert to old format for compatibility
-            bar_a, info_a = [], []
-            bar_b, info_b = [], []
-            
-            for code in codes_a:
-                if "error" not in code:
-                    # Create a simple box for visualization (center of polygon)
-                    if "polygon" in code:
-                        pts = np.array(code["polygon"])
-                        x1, y1 = pts.min(axis=0)
-                        x2, y2 = pts.max(axis=0)
-                        box = Box(y1=int(y1), x1=int(x1), y2=int(y2), x2=int(x2), area=int((x2-x1)*(y2-y1)))
-                        bar_a.append(box)
-                        info_a.append({
-                            "type": code.get("type", ""),
-                            "data": code.get("text", ""),
-                            "left": int(x1),
-                            "top": int(y1),
-                            "width": int(x2-x1),
-                            "height": int(y2-y1),
-                            "valid": True,
-                            "page": code.get("page", 0) + 1,
-                            "source": code.get("source", ""),
-                            "engine": code.get("engine", "")
-                        })
-            
-            for code in codes_b:
-                if "error" not in code:
-                    # Create a simple box for visualization (center of polygon)
-                    if "polygon" in code:
-                        pts = np.array(code["polygon"])
-                        x1, y1 = pts.min(axis=0)
-                        x2, y2 = pts.max(axis=0)
-                        box = Box(y1=int(y1), x1=int(x1), y2=int(y2), x2=int(x2), area=int((x2-x1)*(y2-y1)))
-                        bar_b.append(box)
-                        info_b.append({
-                            "type": code.get("type", ""),
-                            "data": code.get("text", ""),
-                            "left": int(x1),
-                            "top": int(y1),
-                            "width": int(x2-x1),
-                            "height": int(y2-y1),
-                            "valid": True,
-                            "page": code.get("page", 0) + 1,
-                            "source": code.get("source", ""),
-                            "engine": code.get("engine", "")
-                        })
-            
-            # Debug: Print barcode detection results
-            print(f"Barcode detection results - A: {len(bar_a)} codes, B: {len(bar_b)} codes")
-            print(f"Raw codes_a: {len(codes_a)} items")
-            print(f"Raw codes_b: {len(codes_b)} items")
-            if codes_a:
-                print(f"Sample code_a: {codes_a[0] if codes_a else 'None'}")
-            if codes_b:
-                print(f"Sample code_b: {codes_b[0] if codes_b else 'None'}")
-        except Exception as e:
-            print(f"Barcode detection error: {e}")
-            bar_a, info_a = [], []
-            bar_b, info_b = [], []
+        bar_a, info_a = find_barcode_boxes_and_info_from_pdf(file_a.name, image_size=image_size)
+        bar_b, info_b = find_barcode_boxes_and_info_from_pdf(file_b.name, image_size=image_size)
 
         # Always enable CMYK analysis
         cmyk_entries = compute_cmyk_diffs(a, b, red_boxes)
@@ -1325,8 +1272,7 @@ def _binarize(pil_img: Image.Image) -> Image.Image:
 
 def _decode_once(img: Image.Image):
     """Single decode attempt with common barcode symbols"""
-    if not HAS_BARCODE:
-            return []
+    # Only use pyzbar if available, otherwise rely on ZXing-CPP
     syms = [ZBarSymbol.QRCODE, ZBarSymbol.EAN13, ZBarSymbol.EAN8, ZBarSymbol.UPCA, ZBarSymbol.CODE128]
     return zbar_decode(img, symbols=syms)
 
@@ -1344,8 +1290,8 @@ def debug_scan_pdf(pdf_path: str, outdir: str = "barcode_debug", max_pages=2):
     Usage:
         debug_scan_pdf("your.pdf", outdir="barcode_debug", max_pages=2)
     """
-    if not (HAS_BARCODE and HAS_PYMUPDF):
-        print("ERROR: Missing dependencies (pyzbar or PyMuPDF)")
+    if not HAS_PYMUPDF:
+        print("ERROR: Missing PyMuPDF dependency")
         return
         
     os.makedirs(outdir, exist_ok=True)