diff --git a/src/common.cc b/src/common.cc index bd88504e..00aa8069 100644 --- a/src/common.cc +++ b/src/common.cc @@ -75,7 +75,7 @@ namespace sharp { Napi::Buffer buffer = input.Get("buffer").As>(); descriptor->bufferLength = buffer.Length(); descriptor->buffer = buffer.Data(); - descriptor->isBuffer = TRUE; + descriptor->isBuffer = true; } descriptor->failOn = AttrAsEnum(input, "failOn", VIPS_TYPE_FAIL_ON); // Density for vector-based input @@ -384,7 +384,7 @@ namespace sharp { ->set("access", descriptor->access) ->set("fail_on", descriptor->failOn); if (descriptor->unlimited && ImageTypeSupportsUnlimited(imageType)) { - option->set("unlimited", TRUE); + option->set("unlimited", true); } if (imageType == ImageType::SVG || imageType == ImageType::PDF) { option->set("dpi", descriptor->density); @@ -488,7 +488,7 @@ namespace sharp { ->set("access", descriptor->access) ->set("fail_on", descriptor->failOn); if (descriptor->unlimited && ImageTypeSupportsUnlimited(imageType)) { - option->set("unlimited", TRUE); + option->set("unlimited", true); } if (imageType == ImageType::SVG || imageType == ImageType::PDF) { option->set("dpi", descriptor->density); @@ -768,7 +768,7 @@ namespace sharp { int *timeout = VIPS_NEW(im, int); *timeout = seconds; g_signal_connect(im, "eval", G_CALLBACK(VipsProgressCallBack), timeout); - vips_image_set_progress(im, TRUE); + vips_image_set_progress(im, true); } } } @@ -778,7 +778,7 @@ namespace sharp { */ void VipsProgressCallBack(VipsImage *im, VipsProgress *progress, int *timeout) { if (*timeout > 0 && progress->run >= *timeout) { - vips_image_set_kill(im, TRUE); + vips_image_set_kill(im, true); vips_error("timeout", "%d%% complete", progress->percent); *timeout = 0; } diff --git a/src/common.h b/src/common.h index d8167fc9..5dabe02c 100644 --- a/src/common.h +++ b/src/common.h @@ -79,12 +79,12 @@ namespace sharp { buffer(nullptr), failOn(VIPS_FAIL_ON_WARNING), limitInputPixels(0x3FFF * 0x3FFF), - unlimited(FALSE), + unlimited(false), access(VIPS_ACCESS_RANDOM), bufferLength(0), - isBuffer(FALSE), + isBuffer(false), density(72.0), - ignoreIcc(FALSE), + ignoreIcc(false), rawDepth(VIPS_FORMAT_UCHAR), rawChannels(0), rawWidth(0), @@ -103,9 +103,9 @@ namespace sharp { textWidth(0), textHeight(0), textAlign(VIPS_ALIGN_LOW), - textJustify(FALSE), + textJustify(false), textDpi(72), - textRgba(FALSE), + textRgba(false), textSpacing(0), textWrap(VIPS_TEXT_WRAP_WORD), textAutofitDpi(0) {} @@ -386,7 +386,7 @@ namespace sharp { /* Ensure decoding remains sequential. */ - VImage StaySequential(VImage image, bool condition = TRUE); + VImage StaySequential(VImage image, bool condition = true); } // namespace sharp diff --git a/src/pipeline.cc b/src/pipeline.cc index c6c122de..91c09de4 100644 --- a/src/pipeline.cc +++ b/src/pipeline.cc @@ -70,8 +70,8 @@ class PipelineWorker : public Napi::AsyncWorker { // Calculate angle of rotation VipsAngle rotation = VIPS_ANGLE_D0; VipsAngle autoRotation = VIPS_ANGLE_D0; - bool autoFlip = FALSE; - bool autoFlop = FALSE; + bool autoFlip = false; + bool autoFlop = false; if (baton->useExifOrientation) { // Rotate and flip image according to Exif orientation @@ -104,17 +104,17 @@ class PipelineWorker : public Napi::AsyncWorker { } if (autoFlip) { image = image.flip(VIPS_DIRECTION_VERTICAL); - autoFlip = FALSE; + autoFlip = false; } else if (baton->flip) { image = image.flip(VIPS_DIRECTION_VERTICAL); - baton->flip = FALSE; + baton->flip = false; } if (autoFlop) { image = image.flip(VIPS_DIRECTION_HORIZONTAL); - autoFlop = FALSE; + autoFlop = false; } else if (baton->flop) { image = image.flip(VIPS_DIRECTION_HORIZONTAL); - baton->flop = FALSE; + baton->flop = false; } if (rotation != VIPS_ANGLE_D0) { if (rotation != VIPS_ANGLE_D180) { @@ -126,7 +126,7 @@ class PipelineWorker : public Napi::AsyncWorker { if (baton->rotationAngle != 0.0) { MultiPageUnsupported(nPages, "Rotate"); std::vector background; - std::tie(image, background) = sharp::ApplyAlpha(image, baton->rotationBackground, FALSE); + std::tie(image, background) = sharp::ApplyAlpha(image, baton->rotationBackground, false); image = image.rotate(baton->rotationAngle, VImage::option()->set("background", background)).copy_memory(); } } @@ -337,7 +337,7 @@ class PipelineWorker : public Napi::AsyncWorker { // Convert to sRGB/P3 using embedded profile try { image = image.icc_transform(processingProfile, VImage::option() - ->set("embedded", TRUE) + ->set("embedded", true) ->set("depth", sharp::Is16Bit(image.interpretation()) ? 16 : 8) ->set("intent", VIPS_INTENT_PERCEPTUAL)); } catch(...) { @@ -781,7 +781,7 @@ class PipelineWorker : public Napi::AsyncWorker { if ((baton->keepMetadata & VIPS_FOREIGN_KEEP_ICC) && baton->colourspacePipeline != VIPS_INTERPRETATION_CMYK && baton->withIccProfile.empty() && sharp::HasProfile(image)) { image = image.icc_transform(processingProfile, VImage::option() - ->set("embedded", TRUE) + ->set("embedded", true) ->set("depth", sharp::Is16Bit(image.interpretation()) ? 16 : 8) ->set("intent", VIPS_INTENT_PERCEPTUAL)); } @@ -812,7 +812,7 @@ class PipelineWorker : public Napi::AsyncWorker { try { image = image.icc_transform(const_cast(baton->withIccProfile.data()), VImage::option() ->set("input_profile", processingProfile) - ->set("embedded", TRUE) + ->set("embedded", true) ->set("depth", sharp::Is16Bit(image.interpretation()) ? 16 : 8) ->set("intent", VIPS_INTENT_PERCEPTUAL)); } catch(...) { @@ -1339,16 +1339,16 @@ class PipelineWorker : public Napi::AsyncWorker { std::tuple CalculateExifRotationAndFlip(int const exifOrientation) { VipsAngle rotate = VIPS_ANGLE_D0; - bool flip = FALSE; - bool flop = FALSE; + bool flip = false; + bool flop = false; switch (exifOrientation) { case 6: rotate = VIPS_ANGLE_D90; break; case 3: rotate = VIPS_ANGLE_D180; break; case 8: rotate = VIPS_ANGLE_D270; break; - case 2: flop = TRUE; break; // flop 1 - case 7: flip = TRUE; rotate = VIPS_ANGLE_D90; break; // flip 6 - case 4: flop = TRUE; rotate = VIPS_ANGLE_D180; break; // flop 3 - case 5: flip = TRUE; rotate = VIPS_ANGLE_D270; break; // flip 8 + case 2: flop = true; break; // flop 1 + case 7: flip = true; rotate = VIPS_ANGLE_D90; break; // flip 6 + case 4: flop = true; rotate = VIPS_ANGLE_D180; break; // flop 3 + case 5: flip = true; rotate = VIPS_ANGLE_D270; break; // flip 8 } return std::make_tuple(rotate, flip, flop); } @@ -1396,7 +1396,7 @@ class PipelineWorker : public Napi::AsyncWorker { std::string suffix; if (baton->tileFormat == "png") { std::vector> options { - {"interlace", baton->pngProgressive ? "TRUE" : "FALSE"}, + {"interlace", baton->pngProgressive ? "true" : "false"}, {"compression", std::to_string(baton->pngCompressionLevel)}, {"filter", baton->pngAdaptiveFiltering ? "all" : "none"} }; @@ -1405,25 +1405,25 @@ class PipelineWorker : public Napi::AsyncWorker { std::vector> options { {"Q", std::to_string(baton->webpQuality)}, {"alpha_q", std::to_string(baton->webpAlphaQuality)}, - {"lossless", baton->webpLossless ? "TRUE" : "FALSE"}, - {"near_lossless", baton->webpNearLossless ? "TRUE" : "FALSE"}, - {"smart_subsample", baton->webpSmartSubsample ? "TRUE" : "FALSE"}, + {"lossless", baton->webpLossless ? "true" : "false"}, + {"near_lossless", baton->webpNearLossless ? "true" : "false"}, + {"smart_subsample", baton->webpSmartSubsample ? "true" : "false"}, {"preset", vips_enum_nick(VIPS_TYPE_FOREIGN_WEBP_PRESET, baton->webpPreset)}, - {"min_size", baton->webpMinSize ? "TRUE" : "FALSE"}, - {"mixed", baton->webpMixed ? "TRUE" : "FALSE"}, + {"min_size", baton->webpMinSize ? "true" : "false"}, + {"mixed", baton->webpMixed ? "true" : "false"}, {"effort", std::to_string(baton->webpEffort)} }; suffix = AssembleSuffixString(".webp", options); } else { std::vector> options { {"Q", std::to_string(baton->jpegQuality)}, - {"interlace", baton->jpegProgressive ? "TRUE" : "FALSE"}, + {"interlace", baton->jpegProgressive ? "true" : "false"}, {"subsample_mode", baton->jpegChromaSubsampling == "4:4:4" ? "off" : "on"}, - {"trellis_quant", baton->jpegTrellisQuantisation ? "TRUE" : "FALSE"}, + {"trellis_quant", baton->jpegTrellisQuantisation ? "true" : "false"}, {"quant_table", std::to_string(baton->jpegQuantisationTable)}, - {"overshoot_deringing", baton->jpegOvershootDeringing ? "TRUE": "FALSE"}, - {"optimize_scans", baton->jpegOptimiseScans ? "TRUE": "FALSE"}, - {"optimize_coding", baton->jpegOptimiseCoding ? "TRUE": "FALSE"} + {"overshoot_deringing", baton->jpegOvershootDeringing ? "true": "false"}, + {"optimize_scans", baton->jpegOptimiseScans ? "true": "false"}, + {"optimize_coding", baton->jpegOptimiseCoding ? "true": "false"} }; std::string extname = baton->tileLayout == VIPS_FOREIGN_DZ_LAYOUT_DZ ? ".jpeg" : ".jpg"; suffix = AssembleSuffixString(extname, options);