Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge pull request from @shuge #1

Closed
aclark4life opened this issue Jul 24, 2012 · 1 comment
Closed

Merge pull request from @shuge #1

aclark4life opened this issue Jul 24, 2012 · 1 comment

Comments

@aclark4life
Copy link
Member

When merging @shuge's pull request by hand, I get:


aclark@Alexs-MacBook-Pro-2:/var/folders/vl/vj43x56d67g__xkjy71tfr680000gn/T/tmpKHyS90/Pillow/ > git pull git://github.com/shuge/Pillow.git master
remote: Counting objects: 69, done.
remote: Compressing objects: 100% (34/34), done.
remote: Total 68 (delta 25), reused 57 (delta 14)
Unpacking objects: 100% (68/68), done.
From git://github.com/shuge/Pillow
 * branch            master     -> FETCH_HEAD
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Automatic merge failed; fix conflicts and then commit the result.

@shuge can you please fix and resubmit? Note Pillow has moved from the collective to python-imaging organization.
@aclark4life
Copy link
Member Author

Going once, twice, and closed for @shuge. Please reopen if you get inspired it would be nice to have those demos.

@aclark4life aclark4life mentioned this issue Oct 7, 2013
Merged
@wiredfool wiredfool mentioned this issue Dec 13, 2013
Closed
wiredfool pushed a commit that referenced this issue May 20, 2014
@hugovk
Merge pull request #1 from wiredfool/p_rgba_transparency
f8c5812 
Tweak for #664
wiredfool referenced this issue in wiredfool/Pillow Jun 3, 2014
Merge pull request #1 from hugovk/aeroaks
4dc3dc1 
Remove duplication and add partial test
hugovk pushed a commit that referenced this issue Jul 7, 2014
@radarhere
Merge pull request #1 from hugovk/775_tests
516d896 
Test case for #774
wiredfool pushed a commit that referenced this issue Oct 1, 2015
@mrTable
Merge pull request #1 from radarhere/flush
8e7cd92 
Improved consistency of checks for flush
wiredfool pushed a commit that referenced this issue Dec 7, 2015
@baumatron
Merge pull request #1 from radarhere/pillow_fix_eps_gs_command
cd12462 
Added test
@wiredfool wiredfool mentioned this issue Aug 17, 2016
Closed
@3lixy 3lixy mentioned this issue Jan 19, 2017
Closed
@3lixy 3lixy mentioned this issue Apr 12, 2017
Closed
@wiredfool wiredfool mentioned this issue Aug 19, 2017
Closed
wiredfool pushed a commit that referenced this issue Nov 5, 2017
@jd20
Merge pull request #1 from hugovk/monolithlabs-animated_webp-sprintf
8e207d5 
Avoid 'Symbol not found: _sprintf_s' on 'from PIL import _webp'
@depau depau mentioned this issue Nov 12, 2017
Closed
hugovk pushed a commit that referenced this issue Dec 29, 2018
Merge pull request #1 from radarhere/patch-2
0f379a2 
Handle APNG chunks
hugovk pushed a commit that referenced this issue Jun 28, 2019
@abojja9
Merge pull request #1 from python-pillow/master
2f13422 
Update local base
hugovk pushed a commit that referenced this issue Jun 29, 2019
@sircinnamon
Merge pull request #1 from radarhere/gif_test
aa5874d 
Test that background colours read are equal to saved colours
radarhere pushed a commit that referenced this issue Nov 30, 2019
@pwohlhart
Merge pull request #1 from radarhere/fromarray
19a8a39 
Allow for arr KeyError
hugovk pushed a commit that referenced this issue Dec 12, 2019
@daquexian
Merge pull request #1 from radarhere/termux
874ca89 
Updated Termux command
@nmz787 nmz787 mentioned this issue Dec 17, 2019
Closed
@JordanPavlic JordanPavlic mentioned this issue Dec 20, 2019
Closed
radarhere pushed a commit that referenced this issue Dec 31, 2019
@kkopachev
Merge pull request #1 from radarhere/exif-writing-fixes
47513c5 
Corrected short and long range checks
@wiredfool wiredfool mentioned this issue Feb 27, 2020
Closed
hugovk pushed a commit that referenced this issue May 1, 2020
@rodrigob
Merge pull request #1 from radarhere/patch-1
9b6e724 
Changed default offset for Exif
radarhere pushed a commit that referenced this issue Jun 22, 2020
@Cykooz
Merge pull request #1 from radarhere/fix_jpeg_magic_number
cebaba1 
Fix JPEG magic number
hugovk pushed a commit that referenced this issue Jul 5, 2020
@millionhz
Merge pull request #1 from radarhere/autocontrast
407d592 
Updated documentation; Simplified code
hugovk pushed a commit that referenced this issue Aug 31, 2020
@PeterPetrik
Merge pull request #1 from radarhere/fix_build_macos
00dede5 
Renamed zip header file
hugovk pushed a commit that referenced this issue Oct 11, 2020
@xtsm
Merge pull request #1 from radarhere/ellipse
a414818 
Adjusted symmetry test
hugovk pushed a commit that referenced this issue Oct 14, 2020
@ax3l
Merge pull request #1 from radarhere/fix-imagingHinclude
c131a69 
Prefix other header includes
mergify bot pushed a commit that referenced this issue Jul 30, 2022
@bigcat88
Merge pull request #1 from radarhere/xmp-tags-orientation
cce09b7 
Simplified code
hugovk pushed a commit that referenced this issue Sep 21, 2022
@bibinhashley
Merge pull request #1 from radarhere/ImageOps.contain-function-issue-…
cf4017b 
…in-finding-new-size

Round position in pad()
radarhere pushed a commit that referenced this issue Sep 26, 2022
@PososikTeam
Merge pull request #1 from radarhere/fix-padding
597dff7 
Improved palette handling in ImageOps
radarhere pushed a commit that referenced this issue Oct 10, 2022
@JayWiz
Merge pull request #1 from radarhere/1-support-for-16-bit-integer-tiffs
49aca04 
Changed mode to I;16
mergify bot pushed a commit that referenced this issue Nov 21, 2022
@ashafaei
Merge pull request #1 from radarhere/webp-params
c01ecac 
Simplified code
radarhere pushed a commit that referenced this issue Dec 7, 2022
@smason
Merge pull request #1 from radarhere/write-jpeg-com
e71f7c1 
Support saving JPEG comments
radarhere pushed a commit that referenced this issue Jan 7, 2023
@javidcf
Merge pull request #1 from radarhere/patch-1
cc448f2 
Use break instead of goto
hugovk pushed a commit that referenced this issue Feb 12, 2023
@greatvovan
Merge pull request #1 from radarhere/patch-1
d20e250 
Added Exif code examples
radarhere pushed a commit that referenced this issue Mar 5, 2023
@fcarron
Merge pull request #1 from radarhere/fix_libtiff_file_pointer
bf27074 
Added test
hugovk pushed a commit that referenced this issue May 16, 2023
@n3011
Merge pull request #1 from radarhere/jpg_repr
55be23b 
Only assert image is similar
hugovk pushed a commit that referenced this issue May 24, 2023
@rrcgat
Merge pull request #1 from radarhere/init
5a0c431 
Call init() if mimetype is not found with preinit()
radarhere pushed a commit that referenced this issue Jul 31, 2023
@mtreinish
Merge pull request #1 from radarhere/handle-repr-exceptions
2a55b14 
Simplified code
radarhere pushed a commit that referenced this issue Aug 11, 2023
@k128
Merge pull request #1 from radarhere/webp
9c6b8c4 
_decoder.get_next() may return None
radarhere pushed a commit that referenced this issue Sep 28, 2023
@hugovk
Merge pull request #1 from radarhere/pin-wheel
0a4aef4 
Added custom before_install to temporarily pin wheel to 0.31.1
radarhere pushed a commit that referenced this issue Oct 1, 2023
@nopperl
Merge pull request #1 from radarhere/parse-eps-trailer
b21ea55 
Last trailer comment has priority
radarhere pushed a commit that referenced this issue Nov 24, 2023
@RaphaelVRossi
Merge pull request #1 from radarhere/check-image-has-fp-when-close
8186c63 
Do not assign new fp attribute to image when closing
radarhere pushed a commit that referenced this issue Dec 5, 2023
@sambvfx
Merge pull request #1 from radarhere/bc4-dds
8a88e43 
Added test images
radarhere pushed a commit that referenced this issue Dec 24, 2023
@ZachNagengast
Merge pull request #1 from nulano/fix-alpha-for-overlapping-glyphs
38992f6 
Add tests for glyph alpha blending
radarhere pushed a commit that referenced this issue Feb 5, 2024
@nik012003
Merge pull request #1 from radarhere/grabclipboard
1522b3f 
Rearranged code
radarhere pushed a commit that referenced this issue Mar 1, 2024
@lajiyuan
Merge pull request #1 from radarhere/truncated
6c55dff 
Test error is raised without LOAD_TRUNCATED_IMAGES
GerHobbelt pushed a commit to GerHobbelt/Pillow that referenced this issue Mar 18, 2024
@ucodery
Merge pull request python-pillow#1 from zoofood/patch-1
18200ae 
Added branding info/intent of fork.
hugovk pushed a commit that referenced this issue Apr 17, 2024
@adamjstewart
Merge pull request #1 from radarhere/types/fromarray
92dfb02 
Added SupportsArrayInterface
hugovk pushed a commit that referenced this issue May 28, 2024
@void4
Merge pull request #1 from radarhere/imagedraw_circle
3a34f44 
Added test
radarhere pushed a commit that referenced this issue Jun 22, 2024
@mamg22
Merge pull request #1 from radarhere/improved-xdg-dirs-support
d50c9cc 
Rearranged code
hugovk pushed a commit that referenced this issue Jul 2, 2024
@neutrinoceros
Merge pull request #1 from radarhere/bug/compat/numpy1.20
ce6fb12 
Do not import numpy.typing unless TYPE_CHECKING
hugovk pushed a commit that referenced this issue Jul 17, 2024
@radarhere
Skip other jobs on schedule (#1)
d83c7b3 
Co-authored-by: Andrew Murray <radarhere@users.noreply.github.com>
hugovk pushed a commit that referenced this issue Sep 18, 2024
@yngvem
Merge pull request #1 from radarhere/improve-error-messages
3bb180a 
Renamed variable for first part of splitext to root
@Knio Knio mentioned this issue Nov 17, 2024
Closed
hugovk pushed a commit that referenced this issue Nov 18, 2024
@freakboy3742
Merge pull request #1 from radarhere/homebrew-isolation
0e3eb70 
Disable platform guessing instead of adding dependencies-prefix
radarhere pushed a commit that referenced this issue Nov 29, 2024
@Knio
Merge pull request #1 from radarhere/tom/bufferedio
9fd4450 
Moved test
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@aclark4life