mirror of
				https://github.com/python-pillow/Pillow.git
				synced 2025-11-04 09:57:43 +03:00 
			
		
		
		
	Renamed "add_plt" to "plt"
This commit is contained in:
		
							parent
							
								
									9035e0d6c8
								
							
						
					
					
						commit
						1fd189164c
					
				| 
						 | 
				
			
			@ -409,7 +409,7 @@ def test_crashes(test_file):
 | 
			
		|||
def test_plt_marker():
 | 
			
		||||
    # Search the start of the codesteam for the PLT box (id 0xFF58)
 | 
			
		||||
    out = BytesIO()
 | 
			
		||||
    test_card.save(out, "JPEG2000", no_jp2=True, add_plt=True)
 | 
			
		||||
    test_card.save(out, "JPEG2000", no_jp2=True, plt=True)
 | 
			
		||||
    out.seek(0)
 | 
			
		||||
    while True:
 | 
			
		||||
        box_bytes = out.read(2)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -354,7 +354,7 @@ def _save(im, fp, filename):
 | 
			
		|||
    comment = info.get("comment")
 | 
			
		||||
    if isinstance(comment, str):
 | 
			
		||||
        comment = comment.encode()
 | 
			
		||||
    add_plt = info.get("add_plt", False)
 | 
			
		||||
    plt = info.get("plt", False)
 | 
			
		||||
 | 
			
		||||
    fd = -1
 | 
			
		||||
    if hasattr(fp, "fileno"):
 | 
			
		||||
| 
						 | 
				
			
			@ -379,7 +379,7 @@ def _save(im, fp, filename):
 | 
			
		|||
        signed,
 | 
			
		||||
        fd,
 | 
			
		||||
        comment,
 | 
			
		||||
        add_plt,
 | 
			
		||||
        plt,
 | 
			
		||||
    )
 | 
			
		||||
 | 
			
		||||
    ImageFile._save(im, fp, [("jpeg2k", (0, 0) + im.size, 0, kind)])
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1216,7 +1216,7 @@ PyImaging_Jpeg2KEncoderNew(PyObject *self, PyObject *args) {
 | 
			
		|||
    Py_ssize_t fd = -1;
 | 
			
		||||
    char *comment = NULL;
 | 
			
		||||
    Py_ssize_t comment_size;
 | 
			
		||||
    int add_plt = 0;
 | 
			
		||||
    int plt = 0;
 | 
			
		||||
 | 
			
		||||
    if (!PyArg_ParseTuple(
 | 
			
		||||
            args,
 | 
			
		||||
| 
						 | 
				
			
			@ -1239,7 +1239,7 @@ PyImaging_Jpeg2KEncoderNew(PyObject *self, PyObject *args) {
 | 
			
		|||
            &fd,
 | 
			
		||||
            &comment,
 | 
			
		||||
            &comment_size,
 | 
			
		||||
            &add_plt)) {
 | 
			
		||||
            &plt)) {
 | 
			
		||||
        return NULL;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -1358,7 +1358,7 @@ PyImaging_Jpeg2KEncoderNew(PyObject *self, PyObject *args) {
 | 
			
		|||
    context->cinema_mode = cine_mode;
 | 
			
		||||
    context->mct = mct;
 | 
			
		||||
    context->sgnd = sgnd;
 | 
			
		||||
    context->add_plt = add_plt;
 | 
			
		||||
    context->plt = plt;
 | 
			
		||||
 | 
			
		||||
    return (PyObject *)encoder;
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -101,7 +101,7 @@ typedef struct {
 | 
			
		|||
    char *comment;
 | 
			
		||||
 | 
			
		||||
    /* Include PLT marker segment */
 | 
			
		||||
    int add_plt;
 | 
			
		||||
    int plt;
 | 
			
		||||
 | 
			
		||||
} JPEG2KENCODESTATE;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -502,7 +502,7 @@ j2k_encode_entry(Imaging im, ImagingCodecState state) {
 | 
			
		|||
 | 
			
		||||
    /* Enabling PLT markers only supported in OpenJPEG 2.4.0 and up */
 | 
			
		||||
#if ((OPJ_VERSION_MAJOR == 2 && OPJ_VERSION_MINOR >= 4) || OPJ_VERSION_MAJOR > 2)
 | 
			
		||||
    if (context->add_plt) {
 | 
			
		||||
    if (context->plt) {
 | 
			
		||||
        const char * plt_option[2] = {"PLT=YES", NULL};
 | 
			
		||||
        opj_encoder_set_extra_options(codec, plt_option);
 | 
			
		||||
    }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue
	
	Block a user