liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix warnings

Browse Source
This commit is contained in:
Flössie
2019-11-27 09:49:13 +01:00
parent e89b6be76e
commit 4f153a6d72
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rtengine/canon_cr3_decoder.cc
View File

@@ -303,8 +303,8 @@ int DCraw::parseCR3(
char HandlerType[5]; char HandlerType[5];
char MediaFormatID[5]; char MediaFormatID[5];
// unsigned int ImageWidth, ImageHeight; // unsigned int ImageWidth, ImageHeight;
long relpos_inDir; unsigned long relpos_inDir;
long relpos_inBox; unsigned long relpos_inBox;
unsigned int szItem; unsigned int szItem;
unsigned int Tag; unsigned int Tag;
unsigned int lTag; unsigned int lTag;
@@ -2663,9 +2663,10 @@ int DCraw::crxDecodePlane(void* p, std::uint32_t planeNumber)
namespace namespace
{ {
using crx_data_header_t = DCraw::CanonCR3Data::crx_data_header_t; using crx_data_header_t = DCraw::CanonCR3Data::crx_data_header_t;
int crxReadSubbandHeaders(crx_data_header_t* hdr, CrxImage* img, CrxTile* tile, int crxReadSubbandHeaders(CrxImage* img, CrxTile* tile,
CrxPlaneComp* comp, std::uint8_t** subbandMdatPtr, CrxPlaneComp* comp, std::uint8_t** subbandMdatPtr,
std::uint32_t* mdatSize) std::uint32_t* mdatSize)
{ {
@@ -2952,7 +2953,7 @@ int crxReadImageHeaders(crx_data_header_t* hdr, CrxImage* img, std::uint8_t* mda
comp->roundedBitsMask = 1 << (compHdrRoundedBits - 1); comp->roundedBitsMask = 1 << (compHdrRoundedBits - 1);
} }
if (crxReadSubbandHeaders(hdr, img, tile, comp, &dataPtr, &dataSize)) { if (crxReadSubbandHeaders(img, tile, comp, &dataPtr, &dataSize)) {
return -1; return -1;
} }
} }
@@ -2980,9 +2981,7 @@ int crxSetupImageData(crx_data_header_t* hdr, CrxImage* img, std::int16_t* outBu
img->tileCols = (img->planeWidth + hdr->tileWidth - 1) / hdr->tileWidth; img->tileCols = (img->planeWidth + hdr->tileWidth - 1) / hdr->tileWidth;
img->tileRows = (img->planeHeight + hdr->tileHeight - 1) / hdr->tileHeight; img->tileRows = (img->planeHeight + hdr->tileHeight - 1) / hdr->tileHeight;
if (img->tileCols > 0xFF || img->tileRows > 0xFF || if (img->planeWidth - hdr->tileWidth * (img->tileCols - 1) < 0x16 || img->planeHeight - hdr->tileHeight * (img->tileRows - 1) < 0x16) {
img->planeWidth - hdr->tileWidth * (img->tileCols - 1) < 0x16 ||
img->planeHeight - hdr->tileHeight * (img->tileRows - 1) < 0x16) {
return -1; return -1;
} }