Vendor/Libraries/jpeg: update code of library to remove warning compi…

…lation.
LSTS · Jul 17, 2024 · 1255a99 · 1255a99
1 parent 3ddaef8
commit 1255a99
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/vendor/libraries/jpeg/jcmaster.c b/vendor/libraries/jpeg/jcmaster.c
@@ -674,6 +674,9 @@ prepare_for_pass (j_compress_ptr cinfo)
     break;
 #ifdef ENTROPY_OPT_SUPPORTED
   case huff_opt_pass:
+#endif
+  case output_pass:
+#ifdef ENTROPY_OPT_SUPPORTED
     /* Do Huffman optimization for a scan after the first one. */
     select_scan_parameters(cinfo);
     per_scan_setup(cinfo);
@@ -690,7 +693,6 @@ prepare_for_pass (j_compress_ptr cinfo)
     master->pass_number++;
     /*FALLTHROUGH*/
 #endif
-  case output_pass:
     /* Do a data-output pass. */
     /* We need not repeat per-scan setup if prior optimization pass did it. */
     if (! cinfo->optimize_coding) {

diff --git a/vendor/libraries/jpeg/jdarith.c b/vendor/libraries/jpeg/jdarith.c
@@ -454,7 +454,7 @@ decode_mcu_AC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
   tbl = cinfo->cur_comp_info[0]->ac_tbl_no;
 
   p1 = 1 << cinfo->Al;		/* 1 in the bit position being coded */
-  m1 = (-1) << cinfo->Al;	/* -1 in the bit position being coded */
+  m1 = ((unsigned int) -1) << cinfo->Al;  /* -1 in the bit position being coded */
 
   /* Establish EOBx (previous stage end-of-block) index */
   for (kex = cinfo->Se; kex > 0; kex--)

diff --git a/vendor/libraries/jpeg/jdhuff.c b/vendor/libraries/jpeg/jdhuff.c
@@ -928,7 +928,7 @@ decode_mcu_AC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
 
     Se = cinfo->Se;
     p1 = 1 << cinfo->Al;	/* 1 in the bit position being coded */
-    m1 = (-1) << cinfo->Al;	/* -1 in the bit position being coded */
+    m1 = ((unsigned int) -1) << cinfo->Al;  /* -1 in the bit position being coded */
     natural_order = cinfo->natural_order;
 
     /* Load up working state */