prepareForDecompression now void - if fails, TileProcessor isn't initialized

Author: Grok Compression

src/lib/core/codestream/decompress/CodeStreamDecompress.cpp

@@ -1055,11 +1055,7 @@ bool CodeStreamDecompress::scheduleNextSlatedTile(bool multiTile)
     return false;
   }
 
-  if(!currTileProcessor_->prepareForDecompression())
-  {
-    success_ = false;
-    return false;
-  }
+  currTileProcessor_->prepareForDecompression();
 
   auto tileProcessor = currTileProcessor_;
   currTileProcessor_ = nullptr;

src/lib/core/tile_processor/TileProcessor.cpp

@@ -188,6 +188,12 @@ grk_progression_state TileProcessor::getProgressionState()
 
   return rc;
 }
+
+bool TileProcessor::isInitialized(void)
+{
+  return initialized_;
+}
+
 bool TileProcessor::init(void)
 {
   uint32_t state = grk_plugin_get_debug_state();
@@ -291,6 +297,8 @@ bool TileProcessor::init(void)
       grklog.warn("plugin tile differs from grok tile");
   }
 
+  initialized_ = true;
+
   return true;
 }
 
@@ -367,7 +375,9 @@ bool TileProcessor::decompressPrepareWithTLM(const std::shared_ptr<TPFetchSeq>&
 
   tilePartFetchSeq_ = tilePartFetchSeq;
 
-  return prepareForDecompression();
+  prepareForDecompression();
+
+  return true;
 }
 
 bool TileProcessor::decompressWithTLM(const std::shared_ptr<TPFetchSeq>& tilePartFetchSeq,
@@ -664,7 +674,7 @@ void TileProcessor::prepareConcurrentParsing(void)
     prepareFlow_ = std::make_unique<FlowComponent>();
 }
 
-bool TileProcessor::prepareForDecompression(void)
+void TileProcessor::prepareForDecompression(void)
 {
   auto prep = [this]() {
     // now we can get ready to decompress this tile
@@ -689,8 +699,6 @@ bool TileProcessor::prepareForDecompression(void)
     prepareFlow_->nextTask().work(prep);
   else
     prep();
-
-  return true;
 }
 
 Mct* TileProcessor::getMCT(void)
@@ -766,6 +774,8 @@ bool TileProcessor::readPLT(uint8_t* headerData, uint16_t headerSize)
 
 bool TileProcessor::createDecompressTileComponentWindows(void)
 {
+  if(!initialized_)
+    return false;
   for(uint16_t compno = 0; compno < tile_->numcomps_; ++compno)
   {
     auto imageComp = headerImage_->comps + compno;
@@ -952,7 +962,7 @@ bool TileProcessor::scheduleT2T1(CoderPool* coderPool, Rect32 unreducedImageBoun
     }
   };
 
-  auto t2Parse = [this, allocAndSchedule]() {
+  auto t2Parse = [this]() {
     // synch plugin with T2 data
     // todo re-enable decompress synch
     // decompress_synch_plugin_with_host(this);

src/lib/core/tile_processor/TileProcessor.h

@@ -81,9 +81,10 @@ struct TileProcessor
   /**
    * @brief Prepares for decompresion
    *
-   * @return true if successful
+   * If this fails, then TileProcessor doesn't get initialized.
+   *
    */
-  bool prepareForDecompression(void);
+  void prepareForDecompression(void);
 
   /**
    * @brief Parses tile part
@@ -342,6 +343,8 @@ struct TileProcessor
 
   bool hasError(void);
 
+  bool isInitialized(void);
+
 protected:
   /**
    * @brief header @ref GrkImage
@@ -401,6 +404,8 @@ struct TileProcessor
   CodecScheduler* scheduler_ = nullptr;
 
 private:
+  bool initialized_ = false;
+
   void prepareConcurrentParsing(void);
 
   std::atomic<bool> success_ = true;