Skip to content

Added uintXX_t for new libtiff #233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Added uintXX_t for new libtiff #233

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/bin/image_format/TIFFFormat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ bool TIFFFormat::encodeHeader(grk_image *image, const std::string &filename,
}

if (numExtraChannels) {
std::unique_ptr<uint16[]> out(new uint16[numExtraChannels]);
std::unique_ptr<uint16_t[]> out(new uint16_t[numExtraChannels]);
numExtraChannels = 0;
for (uint32_t i = 0U; i < numcomps; ++i) {
auto comp = m_image->comps + i;
Expand Down Expand Up @@ -860,9 +860,9 @@ grk_image* TIFFFormat::decode(const std::string &filename,
bool is_cinema = GRK_IS_CINEMA(parameters->rsiz);
bool success = false;
bool isCIE = false;
uint16 compress;
uint16_t compress;
float *luma = nullptr, *refBlackWhite= nullptr;
uint16 *red_orig=nullptr, *green_orig=nullptr, *blue_orig=nullptr;
uint16_t *red_orig=nullptr, *green_orig=nullptr, *blue_orig=nullptr;

tif = TIFFOpen(filename.c_str(), "r");
if (!tif) {
Expand Down Expand Up @@ -891,8 +891,8 @@ grk_image* TIFFFormat::decode(const std::string &filename,
uint32_t iptc_len = 0;
uint8_t *xmp_buf = nullptr;
uint32_t xmp_len = 0;
uint16 *sampleinfo = nullptr;
uint16 extrasamples = 0;
uint16_t *sampleinfo = nullptr;
uint16_t extrasamples = 0;
bool hasXRes = false, hasYRes = false, hasResUnit = false;
bool isSigned = (tiSf == SAMPLEFORMAT_INT);

Expand Down Expand Up @@ -1185,7 +1185,7 @@ grk_image* TIFFFormat::decode(const std::string &filename,
// 7. extract IPTC meta-data
if (TIFFGetFieldDefaulted(tif, TIFFTAG_RICHTIFFIPTC, &iptc_len, &iptc_buf) == 1) {
if (TIFFIsByteSwapped(tif))
TIFFSwabArrayOfLong((uint32*) iptc_buf, iptc_len);
TIFFSwabArrayOfLong((uint32_t*) iptc_buf, iptc_len);
// since TIFFTAG_RICHTIFFIPTC is of type TIFF_LONG, we must multiply
// by 4 to get the length in bytes
grk::create_meta(image);
Expand Down Expand Up @@ -1597,4 +1597,4 @@ static void convert_tif_16uto32s(const uint16_t *pSrc, int32_t *pDst, size_t len
pDst[i] = INV(pSrc[i], 0xFFFF, invert);
}