Skip to content

Commit ddcf37b

Browse files
jonnyawsom3jonnyawsom3
authored
Lint tweaks
2 parents d167eb1 + bb7e2fe commit ddcf37b

File tree

2 files changed

+41
-40
lines changed

2 files changed

+41
-40
lines changed

‎lib/extras/enc/jpegli.cc

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -435,47 +435,46 @@ Status EncodeJpeg(const PackedPixelFile& ppf, const JpegSettings& jpeg_settings,
435435
}
436436
jpegli_set_cicp_transfer_function(&cinfo, cicp_tf);
437437
jpegli_set_defaults(&cinfo);
438-
// Defaults are set in lib/jpegli/encode.cc#L799
439438
// All factors need to be specified to subsample the blue channel
440439
// for XYB. H and V are swapped between YCbCr and XYB.
441440
if (!jpeg_settings.chroma_subsampling.empty()) {
442-
cinfo.master->chroma_subsampling_set_by_cli = true;
441+
cinfo.master->chroma_subsampling_set_by_cli = true;
443442
if (jpeg_settings.chroma_subsampling == "444") {
444443
cinfo.comp_info[0].h_samp_factor = 1;
445-
cinfo.comp_info[0].v_samp_factor = 1;
444+
cinfo.comp_info[0].v_samp_factor = 1;
446445
} else if (jpeg_settings.chroma_subsampling == "440") {
447446
cinfo.comp_info[0].h_samp_factor = 1;
448447
cinfo.comp_info[0].v_samp_factor = 2;
449-
if (jpeg_settings.xyb) {
450-
cinfo.comp_info[0].h_samp_factor = 2;
451-
cinfo.comp_info[0].v_samp_factor = 2;
452-
cinfo.comp_info[1].h_samp_factor = 2;
453-
cinfo.comp_info[1].v_samp_factor = 2;
454-
cinfo.comp_info[2].h_samp_factor = 2;
455-
cinfo.comp_info[2].v_samp_factor = 1;
456-
}
448+
if (jpeg_settings.xyb) {
449+
cinfo.comp_info[0].h_samp_factor = 2;
450+
cinfo.comp_info[0].v_samp_factor = 2;
451+
cinfo.comp_info[1].h_samp_factor = 2;
452+
cinfo.comp_info[1].v_samp_factor = 2;
453+
cinfo.comp_info[2].h_samp_factor = 2;
454+
cinfo.comp_info[2].v_samp_factor = 1;
455+
}
457456
} else if (jpeg_settings.chroma_subsampling == "422") {
458457
cinfo.comp_info[0].h_samp_factor = 2;
459458
cinfo.comp_info[0].v_samp_factor = 1;
460-
if (jpeg_settings.xyb) {
461-
cinfo.comp_info[0].h_samp_factor = 2;
462-
cinfo.comp_info[0].v_samp_factor = 2;
463-
cinfo.comp_info[1].h_samp_factor = 2;
464-
cinfo.comp_info[1].v_samp_factor = 2;
465-
cinfo.comp_info[2].h_samp_factor = 1;
466-
cinfo.comp_info[2].v_samp_factor = 2;
467-
}
459+
if (jpeg_settings.xyb) {
460+
cinfo.comp_info[0].h_samp_factor = 2;
461+
cinfo.comp_info[0].v_samp_factor = 2;
462+
cinfo.comp_info[1].h_samp_factor = 2;
463+
cinfo.comp_info[1].v_samp_factor = 2;
464+
cinfo.comp_info[2].h_samp_factor = 1;
465+
cinfo.comp_info[2].v_samp_factor = 2;
466+
}
468467
} else if (jpeg_settings.chroma_subsampling == "420") {
469468
cinfo.comp_info[0].h_samp_factor = 2;
470-
cinfo.comp_info[0].v_samp_factor = 2;
471-
if (jpeg_settings.xyb) {
472-
cinfo.comp_info[0].h_samp_factor = 2;
473-
cinfo.comp_info[0].v_samp_factor = 2;
474-
cinfo.comp_info[1].h_samp_factor = 2;
475-
cinfo.comp_info[1].v_samp_factor = 2;
476-
cinfo.comp_info[2].h_samp_factor = 1;
477-
cinfo.comp_info[2].v_samp_factor = 1;
478-
}
469+
cinfo.comp_info[0].v_samp_factor = 2;
470+
if (jpeg_settings.xyb) {
471+
cinfo.comp_info[0].h_samp_factor = 2;
472+
cinfo.comp_info[0].v_samp_factor = 2;
473+
cinfo.comp_info[1].h_samp_factor = 2;
474+
cinfo.comp_info[1].v_samp_factor = 2;
475+
cinfo.comp_info[2].h_samp_factor = 1;
476+
cinfo.comp_info[2].v_samp_factor = 1;
477+
}
479478
} else {
480479
return false;
481480
}

‎lib/jpegli/encode.cc

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -784,8 +784,10 @@ void jpegli_set_colorspace(j_compress_ptr cinfo, J_COLOR_SPACE colorspace) {
784784
JPEGLI_ERROR("Unsupported jpeg colorspace %d", colorspace);
785785
}
786786
// Adobe marker is needed to distinguish CMYK, YCCK and RGB(XYB) JPEGs.
787-
cinfo->write_Adobe_marker = TO_JXL_BOOL((cinfo->jpeg_color_space == JCS_CMYK ||
788-
cinfo->jpeg_color_space == JCS_YCCK || cinfo->jpeg_color_space == JCS_RGB));
787+
cinfo->write_Adobe_marker =
788+
TO_JXL_BOOL((cinfo->jpeg_color_space == JCS_CMYK ||
789+
cinfo->jpeg_color_space == JCS_YCCK ||
790+
cinfo->jpeg_color_space == JCS_RGB));
789791
if (cinfo->comp_info == nullptr) {
790792
cinfo->comp_info =
791793
jpegli::Allocate<jpeg_component_info>(cinfo, MAX_COMPONENTS);
@@ -831,20 +833,20 @@ void jpegli_set_distance(j_compress_ptr cinfo, float distance,
831833
CheckState(cinfo, jpegli::kEncStart);
832834
cinfo->master->force_baseline = FROM_JXL_BOOL(force_baseline);
833835
if (distance >= 1.9f && !(cinfo->master->xyb_mode) &&
834-
!cinfo->master->chroma_subsampling_set_by_cli) {
836+
!cinfo->master->chroma_subsampling_set_by_cli) {
835837
// At medium qualities, 420 subsampling begins to outperform 444.
836-
cinfo->comp_info[0].h_samp_factor = cinfo->comp_info[0].v_samp_factor = 2;
838+
cinfo->comp_info[0].h_samp_factor = cinfo->comp_info[0].v_samp_factor = 2;
837839
if (cinfo->jpeg_color_space == JCS_YCCK) {
838-
cinfo->comp_info[3].h_samp_factor = cinfo->comp_info[3].v_samp_factor = 2;
840+
cinfo->comp_info[3].h_samp_factor = cinfo->comp_info[3].v_samp_factor = 2;
839841
}
840842
}
841843
// Disable adaptive quantization at high qualities.
842844
if (distance <= 1.0f && !(cinfo->master->xyb_mode)) {
843-
cinfo->master->use_adaptive_quantization = false;
845+
cinfo->master->use_adaptive_quantization = false;
844846
}
845847
// At quality 100 (distance 0) auto select RGB colorspace.
846848
if (distance <= 0.01f && cinfo->in_color_space == JCS_RGB) {
847-
jpegli_set_colorspace(cinfo, JCS_RGB);
849+
jpegli_set_colorspace(cinfo, JCS_RGB);
848850
}
849851
float distances[NUM_QUANT_TBLS] = {distance, distance, distance};
850852
jpegli::SetQuantMatrices(cinfo, distances, /*add_two_chroma_tables=*/true);
@@ -872,20 +874,20 @@ void jpegli_set_quality(j_compress_ptr cinfo, int quality,
872874
cinfo->master->force_baseline = FROM_JXL_BOOL(force_baseline);
873875
float distance = jpegli_quality_to_distance(quality);
874876
if (distance >= 1.9f && !(cinfo->master->xyb_mode) &&
875-
!cinfo->master->chroma_subsampling_set_by_cli) {
877+
!cinfo->master->chroma_subsampling_set_by_cli) {
876878
// At medium qualities, 420 subsampling begins to outperform 444.
877-
cinfo->comp_info[0].h_samp_factor = cinfo->comp_info[0].v_samp_factor = 2;
879+
cinfo->comp_info[0].h_samp_factor = cinfo->comp_info[0].v_samp_factor = 2;
878880
if (cinfo->jpeg_color_space == JCS_YCCK) {
879-
cinfo->comp_info[3].h_samp_factor = cinfo->comp_info[3].v_samp_factor = 2;
881+
cinfo->comp_info[3].h_samp_factor = cinfo->comp_info[3].v_samp_factor = 2;
880882
}
881883
}
882884
// Disable adaptive quantization at high qualities.
883885
if (distance <= 1.0f && !(cinfo->master->xyb_mode)) {
884-
cinfo->master->use_adaptive_quantization = false;
886+
cinfo->master->use_adaptive_quantization = false;
885887
}
886888
// At quality 100 (distance 0) auto select RGB colorspace.
887889
if (distance <= 0.01f && cinfo->in_color_space == JCS_RGB) {
888-
jpegli_set_colorspace(cinfo, JCS_RGB);
890+
jpegli_set_colorspace(cinfo, JCS_RGB);
889891
}
890892
float distances[NUM_QUANT_TBLS] = {distance, distance, distance};
891893
jpegli::SetQuantMatrices(cinfo, distances, /*add_two_chroma_tables=*/false);

0 commit comments

Comments
 (0)