Merge branch 'main' into fix-imagegrab-with-wl-paste

.github/workflows/test-cygwin.yml

@@ -84,6 +84,10 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-cygwin-pip3.${{ matrix.python-minor-version }}-
 
+      - name: Select Python version
+        run: |
+          ln -sf c:/cygwin/bin/python3.${{ matrix.python-minor-version }} c:/cygwin/bin/python3
+
       - name: Build system information
         run: |
           dash.exe -c "python3 .github/workflows/system-info.py"
@@ -95,7 +99,7 @@ jobs:
       - name: Install a different NumPy
         shell: dash.exe -l "{0}"
         run: |
-          python3 -m pip install -U 'numpy!=1.21.*'
+          python3 -m pip install -U numpy
 
       - name: Build
         shell: bash.exe -eo pipefail -o igncr "{0}"

src/libImaging/Jpeg2KEncode.c

@@ -281,7 +281,6 @@ j2k_encode_entry(Imaging im, ImagingCodecState state) {
     int ret = -1;
 
     unsigned prec = 8;
-    unsigned bpp = 8;
     unsigned _overflow_scale_factor;
 
     stream = opj_stream_create(BUFFER_SIZE, OPJ_FALSE);
@@ -313,7 +312,6 @@ j2k_encode_entry(Imaging im, ImagingCodecState state) {
         color_space = OPJ_CLRSPC_GRAY;
         pack = j2k_pack_i16;
         prec = 16;
-        bpp = 12;
     } else if (strcmp(im->mode, "LA") == 0) {
         components = 2;
         color_space = OPJ_CLRSPC_GRAY;
@@ -342,7 +340,6 @@ j2k_encode_entry(Imaging im, ImagingCodecState state) {
         image_params[n].h = im->ysize;
         image_params[n].x0 = image_params[n].y0 = 0;
         image_params[n].prec = prec;
-        image_params[n].bpp = bpp;
         image_params[n].sgnd = context->sgnd == 0 ? 0 : 1;
     }