core_simple: support j2k and jp2 formats

Author: Grok Compression

examples/core/core_simple.cpp

@@ -34,7 +34,7 @@ with memory buffers as source and destination
 template<typename T>
 int core_compress(uint32_t dimX, uint32_t dimY, uint8_t precision,
                   std::vector<std::unique_ptr<T[]>>& uncompressedData,
-                  std::vector<uint8_t>& compressedData)
+                  std::vector<uint8_t>& compressedData, bool jp2)
 {
   const uint16_t numComps = (uint16_t)uncompressedData.size();
   const auto colourSpace = numComps == 3 ? GRK_CLRSPC_SRGB : GRK_CLRSPC_GRAY;
@@ -47,7 +47,7 @@ int core_compress(uint32_t dimX, uint32_t dimY, uint8_t precision,
   // 1. initialize compress parameters
   grk_cparameters compressParams;
   grk_compress_set_default_params(&compressParams);
-  compressParams.cod_format = GRK_FMT_JP2;
+  compressParams.cod_format = jp2 ? GRK_FMT_JP2 : GRK_FMT_J2K;
   compressParams.verbose = true;
   compressParams.irreversible = false; // Enable reversible (lossless) compression
 
@@ -122,7 +122,7 @@ int core_compress(uint32_t dimX, uint32_t dimY, uint8_t precision,
 template<typename T>
 int core_decompress(uint32_t dimX, uint32_t dimY, uint8_t precision,
                     std::vector<std::unique_ptr<T[]>>& uncompressedData,
-                    std::vector<uint8_t>& compressedData)
+                    std::vector<uint8_t>& compressedData, bool jp2)
 {
   const uint16_t numComps = (uint16_t)uncompressedData.size();
   const auto colourSpace = numComps == 3 ? GRK_CLRSPC_SRGB : GRK_CLRSPC_GRAY;
@@ -161,7 +161,7 @@ int core_decompress(uint32_t dimX, uint32_t dimY, uint8_t precision,
   printf("Decompression succeeded\n");
 
   // 3. compare original uncompressedData to decompressed decOutputImage
-  if(numComps != decOutputImage->numcomps || colourSpace != decOutputImage->color_space)
+  if(numComps != decOutputImage->numcomps || (jp2 && colourSpace != decOutputImage->color_space))
   {
     images_equal = false;
   }
@@ -247,9 +247,10 @@ int main([[maybe_unused]] int argc, [[maybe_unused]] const char** argv)
   std::vector<uint8_t> compressedData;
   size_t bufLen = (size_t)numComps * ((precision + 7) / 8) * dimX * dimY;
   compressedData.resize(bufLen);
-  int rc = core_compress<uint16_t>(dimX, dimY, precision, uncompressedData, compressedData);
+  bool jp2 = false;
+  int rc = core_compress<uint16_t>(dimX, dimY, precision, uncompressedData, compressedData, jp2);
   if(rc == 0)
-    rc = core_decompress<uint16_t>(dimX, dimY, precision, uncompressedData, compressedData);
+    rc = core_decompress<uint16_t>(dimX, dimY, precision, uncompressedData, compressedData, jp2);
 
   return rc;
 }