Skip to content
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

Jump to bottom

Add #ifndefs so compiles with TINY_DNG_LOADER_NO_STB_IMAGE_INCLUDE #45

Merged
merged 1 commit into from
Aug 22, 2024
Merged

Add #ifndefs so compiles with TINY_DNG_LOADER_NO_STB_IMAGE_INCLUDE #45

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
23 changes: 13 additions & 10 deletions tiny_dng_loader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ struct DNGImage {
// An array of flattened the pair of input/output value.
// [(0.0, 0.0), (0.1, 0.1), ... (1.0, 1.0)]
// First two item must be 0.0, Last two item must be 1.0
std::vector<float> profile_tone_curve;
std::vector<float> profile_tone_curve;
int profile_embed_policy{-1}; // 0 = "allow copying", 1 = "embed if used", 2 = "embed never"

// Noise profile
Expand Down Expand Up @@ -2006,7 +2006,7 @@ typedef enum {
TAG_LIGHT_SOURCE = 0x9208, // int16u
TAG_FLASH = 0x9209, // int16u
TAG_FOCAL_LENGTH = 0x920a, // rational64u

TAG_LENS_INFO = 0xa432, // rational64u[4]
TAG_LENS_MAKE = 0xa433, // string
TAG_LENS_MODEL = 0xa434, // string
Expand Down Expand Up @@ -2483,7 +2483,7 @@ class StreamReader {

bool read_rational(int type, uint32_t* ret0, uint32_t *ret1) const {
// @todo { Support more types. }

if (!ret0 || !ret1) {
return false;
}
Expand All @@ -2508,7 +2508,7 @@ class StreamReader {

bool read_srational(int type, int32_t* ret0, int32_t *ret1) const {
// @todo { Support more types. }

if (!ret0 || !ret1) {
return false;
}
Expand Down Expand Up @@ -4115,7 +4115,7 @@ static bool ParseTIFFIFD(const StreamReader& sr,
TINY_DNG_DPRINTF("tone curve datalen = %d\n", len);

// len = samples * 2.
// It seems single channel tone curve only.
// It seems single channel tone curve only.
if ((len % 2) != 0) {
if (err) {
(*err) += "Invalid data size for ProfileToneCurve Tag.\n";
Expand Down Expand Up @@ -4180,7 +4180,7 @@ static bool ParseTIFFIFD(const StreamReader& sr,
// or
// DOUBLE * 2 * colorPlanes

// It seems single channel tone curve only.
// It seems single channel tone curve only.
if ((len % 2) != 0) {
if (err) {
(*err) += "Invalid data size for ProfileToneCurve Tag.\n";
Expand Down Expand Up @@ -4222,7 +4222,7 @@ static bool ParseTIFFIFD(const StreamReader& sr,
return false;
}
}

// TODO: Validate noise profile data.
image.noise_profile = buf;

Expand Down Expand Up @@ -5723,6 +5723,7 @@ bool LoadDNGFromMemory(const char* mem, unsigned int size,
} else {
// Baseline 8bit JPEG

#ifndef TINY_DNG_LOADER_NO_STB_IMAGE_INCLUDE
image->bits_per_sample_original = 8;
image->bits_per_sample = 8;

Expand Down Expand Up @@ -5801,12 +5802,13 @@ bool LoadDNGFromMemory(const char* mem, unsigned int size,

image->width = w;
image->height = h;
#endif
}

} else if (image->compression ==
COMPRESSION_NEW_JPEG) { // new JPEG(baseline DCT JPEG or
// lossless JPEG)

#ifndef TINY_DNG_LOADER_NO_STB_IMAGE_INCLUDE
bool decoded = false;

if (image->bits_per_sample_original == 8) {
Expand Down Expand Up @@ -5968,7 +5970,7 @@ bool LoadDNGFromMemory(const char* mem, unsigned int size,
image->bits_per_sample_original = lj_bits;
}
}

#endif
} else if (image->compression == COMPRESSION_ZIP) { // ZIP
#ifdef TINY_DNG_LOADER_ENABLE_ZIP
TINY_DNG_CHECK_AND_RETURN(image->bits_per_sample_original > 0,
Expand Down Expand Up @@ -6029,6 +6031,7 @@ bool LoadDNGFromMemory(const char* mem, unsigned int size,
#endif
} else if (image->compression == COMPRESSION_LOSSY) { // lossy JPEG

#ifndef TINY_DNG_LOADER_NO_STB_IMAGE_INCLUDE
// TOOD: Check bps and photometric_interpretation.

size_t jpeg_len = static_cast<size_t>(image->jpeg_byte_count);
Expand Down Expand Up @@ -6110,7 +6113,7 @@ bool LoadDNGFromMemory(const char* mem, unsigned int size,
#endif
free(decoded_image);
}

#endif
} else if (image->compression == 34713) { // NEF lossless?

image->bits_per_sample_original = 1; // FIXME
Expand Down
Loading