Add Image::operator|=().

Author: egorpugin

src/ccmain/pagesegmain.cpp

@@ -216,7 +216,7 @@ int Tesseract::AutoPageSeg(PageSegMode pageseg_mode, BLOCK_LIST *blocks, TO_BLOC
     if (musicmask_pix != nullptr) {
       // TODO(rays) pass the musicmask_pix into FindBlocks and mark music
       // blocks separately. For now combine with photomask_pix.
-      pixOr(photomask_pix, photomask_pix, musicmask_pix);
+      photomask_pix |= musicmask_pix;
     }
 #ifndef DISABLED_LEGACY_ENGINE
     if (equ_detect_) {

src/ccstruct/image.cpp

@@ -39,4 +39,8 @@ bool Image::isZero() const {
   return r == 1;
 }
 
+void Image::operator|=(Image i) {
+  pixOr(pix_, pix_, i);
+}
+
 }

src/ccstruct/image.h

@@ -39,6 +39,7 @@ class TESS_API Image {
   Image copy() const;  // does full copy
   void destroy();
   bool isZero() const;
+  void operator|=(Image);
 };
 
 } // namespace tesseract

src/textord/colfind.cpp

@@ -287,7 +287,7 @@ int ColumnFinder::FindBlocks(PageSegMode pageseg_mode, Image scaled_color, int s
                              TO_BLOCK *input_block, Image photo_mask_pix, Image thresholds_pix,
                              Image grey_pix, DebugPixa *pixa_debug, BLOCK_LIST *blocks,
                              BLOBNBOX_LIST *diacritic_blobs, TO_BLOCK_LIST *to_blocks) {
-  pixOr(photo_mask_pix, photo_mask_pix, nontext_map_);
+  photo_mask_pix |= nontext_map_;
   stroke_width_->FindLeaderPartitions(input_block, &part_grid_);
   stroke_width_->RemoveLineResidue(&big_parts_);
   FindInitialTabVectors(nullptr, min_gutter_width_, tabfind_aligned_gap_fraction_, input_block);

src/textord/imagefind.cpp

@@ -110,7 +110,7 @@ Image ImageFind::FindImages(Image pix, DebugPixa *pixa_debug) {
 
   // Fill to capture pixels near the mask edges that were missed
   Image pixt = pixSeedfillBinary(nullptr, pixht, pix, 8);
-  pixOr(pixht, pixht, pixt);
+  pixht |= pixt;
   pixt.destroy();
 
   // Eliminate lines and bars that may be joined to images.
@@ -146,7 +146,7 @@ Image ImageFind::FindImages(Image pix, DebugPixa *pixa_debug) {
   }
   // Make the result image the same size as the input.
   Image result = pixCreate(pixGetWidth(pix), pixGetHeight(pix), 1);
-  pixOr(result, result, pixht);
+  result |= pixht;
   pixht.destroy();
   return result;
 }

src/textord/linefind.cpp

@@ -646,7 +646,7 @@ void LineFinder::GetLineMasks(int resolution, Image src_pix, Image *pix_vline, I
     pixSeedfillBinary(*pix_non_vline, *pix_non_vline, pix_nonlines, 8);
     if (!h_empty) {
       // Candidate hlines are not vlines.
-      pixOr(*pix_non_vline, *pix_non_vline, *pix_hline);
+      *pix_non_vline |= *pix_hline;
       pixSubtract(*pix_non_vline, *pix_non_vline, *pix_intersections);
     }
     if (!FilterFalsePositives(resolution, *pix_non_vline, *pix_intersections, *pix_vline)) {
@@ -670,7 +670,7 @@ void LineFinder::GetLineMasks(int resolution, Image src_pix, Image *pix_vline, I
     *pix_non_hline = pixErodeBrick(nullptr, pix_nonlines, 1, kMaxLineResidue);
     pixSeedfillBinary(*pix_non_hline, *pix_non_hline, pix_nonlines, 8);
     if (extra_non_hlines != nullptr) {
-      pixOr(*pix_non_hline, *pix_non_hline, extra_non_hlines);
+      *pix_non_hline |= extra_non_hlines;
       extra_non_hlines.destroy();
     }
     if (!FilterFalsePositives(resolution, *pix_non_hline, *pix_intersections, *pix_hline)) {

src/training/pango/stringrenderer.cpp

@@ -875,7 +875,7 @@ int StringRenderer::RenderAllFontsToImage(double min_coverage, const char *text,
       v_margin_ /= 8;
       Image title_image = nullptr;
       RenderToBinaryImage(title, strlen(title), 128, &title_image);
-      pixOr(*image, *image, title_image);
+      *image |= title_image;
       title_image.destroy();
 
       v_margin_ *= 8;