Skip to content

Commit 2ffb2fc

Browse files
authored
Merge branch 'main' into extend_wayland_support
2 parents af3a1fd + 03e7871 commit 2ffb2fc

File tree

6 files changed

+42
-45
lines changed

6 files changed

+42
-45
lines changed

Makefile

+5
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ doc html:
2323
htmlview:
2424
$(MAKE) -C docs htmlview
2525

26+
.PHONY: htmllive
27+
htmllive:
28+
$(MAKE) -C docs htmllive
29+
2630
.PHONY: doccheck
2731
doccheck:
2832
$(MAKE) doc
@@ -43,6 +47,7 @@ help:
4347
@echo " docserve run an HTTP server on the docs directory"
4448
@echo " html make HTML docs"
4549
@echo " htmlview open the index page built by the html target in your browser"
50+
@echo " htmllive rebuild and reload HTML files in your browser"
4651
@echo " install make and install"
4752
@echo " install-coverage make and install with C coverage"
4853
@echo " lint run the lint checks"

docs/Guardfile

-10
This file was deleted.

docs/Makefile

+5-4
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ help:
2020
@echo "Please use \`make <target>' where <target> is one of"
2121
@echo " html to make standalone HTML files"
2222
@echo " htmlview to open the index page built by the html target in your browser"
23+
@echo " htmllive to rebuild and reload HTML files in your browser"
2324
@echo " serve to start a local server for viewing docs"
24-
@echo " livehtml to start a local server for viewing docs and auto-reload on change"
2525
@echo " dirhtml to make HTML files named index.html in directories"
2626
@echo " singlehtml to make a single large HTML file"
2727
@echo " pickle to make pickle files"
@@ -201,9 +201,10 @@ doctest:
201201
htmlview: html
202202
$(PYTHON) -c "import os, webbrowser; webbrowser.open('file://' + os.path.realpath('$(BUILDDIR)/html/index.html'))"
203203

204-
.PHONY: livehtml
205-
livehtml: html
206-
livereload $(BUILDDIR)/html -p 33233
204+
.PHONY: htmllive
205+
htmllive: SPHINXBUILD = $(PYTHON) -m sphinx_autobuild
206+
htmllive: SPHINXOPTS = --open-browser --delay 0
207+
htmllive: html
207208

208209
.PHONY: serve
209210
serve:

docs/handbook/concepts.rst

+22-22
Original file line numberDiff line numberDiff line change
@@ -30,35 +30,35 @@ image. Each pixel uses the full range of the bit depth. So a 1-bit pixel has a r
3030
INT32 and a 32-bit floating point pixel has the range of FLOAT32. The current release
3131
supports the following standard modes:
3232

33-
* ``1`` (1-bit pixels, black and white, stored with one pixel per byte)
34-
* ``L`` (8-bit pixels, grayscale)
35-
* ``P`` (8-bit pixels, mapped to any other mode using a color palette)
36-
* ``RGB`` (3x8-bit pixels, true color)
37-
* ``RGBA`` (4x8-bit pixels, true color with transparency mask)
38-
* ``CMYK`` (4x8-bit pixels, color separation)
39-
* ``YCbCr`` (3x8-bit pixels, color video format)
33+
* ``1`` (1-bit pixels, black and white, stored with one pixel per byte)
34+
* ``L`` (8-bit pixels, grayscale)
35+
* ``P`` (8-bit pixels, mapped to any other mode using a color palette)
36+
* ``RGB`` (3x8-bit pixels, true color)
37+
* ``RGBA`` (4x8-bit pixels, true color with transparency mask)
38+
* ``CMYK`` (4x8-bit pixels, color separation)
39+
* ``YCbCr`` (3x8-bit pixels, color video format)
4040

41-
* Note that this refers to the JPEG, and not the ITU-R BT.2020, standard
41+
* Note that this refers to the JPEG, and not the ITU-R BT.2020, standard
4242

43-
* ``LAB`` (3x8-bit pixels, the L*a*b color space)
44-
* ``HSV`` (3x8-bit pixels, Hue, Saturation, Value color space)
43+
* ``LAB`` (3x8-bit pixels, the L*a*b color space)
44+
* ``HSV`` (3x8-bit pixels, Hue, Saturation, Value color space)
4545

46-
* Hue's range of 0-255 is a scaled version of 0 degrees <= Hue < 360 degrees
46+
* Hue's range of 0-255 is a scaled version of 0 degrees <= Hue < 360 degrees
4747

48-
* ``I`` (32-bit signed integer pixels)
49-
* ``F`` (32-bit floating point pixels)
48+
* ``I`` (32-bit signed integer pixels)
49+
* ``F`` (32-bit floating point pixels)
5050

5151
Pillow also provides limited support for a few additional modes, including:
5252

53-
* ``LA`` (L with alpha)
54-
* ``PA`` (P with alpha)
55-
* ``RGBX`` (true color with padding)
56-
* ``RGBa`` (true color with premultiplied alpha)
57-
* ``La`` (L with premultiplied alpha)
58-
* ``I;16`` (16-bit unsigned integer pixels)
59-
* ``I;16L`` (16-bit little endian unsigned integer pixels)
60-
* ``I;16B`` (16-bit big endian unsigned integer pixels)
61-
* ``I;16N`` (16-bit native endian unsigned integer pixels)
53+
* ``LA`` (L with alpha)
54+
* ``PA`` (P with alpha)
55+
* ``RGBX`` (true color with padding)
56+
* ``RGBa`` (true color with premultiplied alpha)
57+
* ``La`` (L with premultiplied alpha)
58+
* ``I;16`` (16-bit unsigned integer pixels)
59+
* ``I;16L`` (16-bit little endian unsigned integer pixels)
60+
* ``I;16B`` (16-bit big endian unsigned integer pixels)
61+
* ``I;16N`` (16-bit native endian unsigned integer pixels)
6262

6363
Premultiplied alpha is where the values for each other channel have been
6464
multiplied by the alpha. For example, an RGBA pixel of ``(10, 20, 30, 127)``

docs/reference/block_allocator.rst

+9-9
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ fresh allocation. This caching of free blocks is currently disabled by
3737
default, but can be enabled and tweaked using three environment
3838
variables:
3939

40-
* ``PILLOW_ALIGNMENT``, in bytes. Specifies the alignment of memory
41-
allocations. Valid values are powers of 2 between 1 and
42-
128, inclusive. Defaults to 1.
40+
* ``PILLOW_ALIGNMENT``, in bytes. Specifies the alignment of memory
41+
allocations. Valid values are powers of 2 between 1 and
42+
128, inclusive. Defaults to 1.
4343

44-
* ``PILLOW_BLOCK_SIZE``, in bytes, K, or M. Specifies the maximum
45-
block size for ``ImagingAllocateArray``. Valid values are
46-
integers, with an optional ``k`` or ``m`` suffix. Defaults to 16M.
44+
* ``PILLOW_BLOCK_SIZE``, in bytes, K, or M. Specifies the maximum
45+
block size for ``ImagingAllocateArray``. Valid values are
46+
integers, with an optional ``k`` or ``m`` suffix. Defaults to 16M.
4747

48-
* ``PILLOW_BLOCKS_MAX`` Specifies the number of freed blocks to
49-
retain to fill future memory requests. Any freed blocks over this
50-
threshold will be returned to the OS immediately. Defaults to 0.
48+
* ``PILLOW_BLOCKS_MAX`` Specifies the number of freed blocks to
49+
retain to fill future memory requests. Any freed blocks over this
50+
threshold will be returned to the OS immediately. Defaults to 0.

pyproject.toml

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ optional-dependencies.docs = [
4444
"furo",
4545
"olefile",
4646
"sphinx>=8.2",
47+
"sphinx-autobuild",
4748
"sphinx-copybutton",
4849
"sphinx-inline-tabs",
4950
"sphinxext-opengraph",

0 commit comments

Comments
 (0)