Merge pull request #18194 from VadimLevin:dev/vlevin/openjpeg-source-intergration

2020-09-02 22:48:09 +00:00
parent 7a796b20ea 0384eb7d8c
commit cf8322c0d3
64 changed files with 42074 additions and 7 deletions
@@ -564,7 +564,7 @@ bool Jpeg2KOpjDecoder::readHeader()
            CV_Error(Error::StsNotImplemented, cv::format("OpenJPEG2000: Component %d/%d is duplicate alpha channel", i, numcomps));
        }

-        hasAlpha |= (bool)comp.alpha;
+        hasAlpha |= comp.alpha != 0;

        if (comp.prec > 64)
        {