-
-
Notifications
You must be signed in to change notification settings - Fork 7.8k
Fixing osx makefile #4
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.
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
Conversation
…asn't up to date.
Although a hard-coded PYVERSION=2.6 is safe for snow leopard, it might make more sense to leave it blank, defaulting to the 'python' command that takes precedence in the PATH. On the other hand, suggesting in the documentation that it can be included to the command line might prompt users to choose the right version without editing the makefile.
Please modify the request to pull these into v1.0.x instead of master. |
My bad, I was following the comments on the other pull requests and realized that this was how you guys were proceeding. I'll take care of this later tonight. Why exactly is it better to pull to tags instead of to the master? I guess I still have some baggage from SVN that is confusing me a bit. |
Pull to tags? I don't understand. If you apply your changes relative to the v1.0.x branch, and request those changes be pulled into the v1.0.x branch, from there we can simply merge the v1.0.x branch into master so both branches benefit from the changes. We can't merge from master into v1.0.x. |
Oops, sorry. I thought v1.0.x was a tag instead of a branch. I'll get this done soon. Thanks. |
* See mailing list discussion at http://sourceforge.net/mailarchive/message.php?msg_id=26618642
* Make sure that autofmt_xdate does the right thing when the figure contains a single Axes object that is not be derived from matplotlib.axes.SubplotBase.
This change doesn't yet include documentation updates
MNT: use IPython's signature if needed + available
Hacking around trying to get Curio monitor working in currie
This fixes some possible heap buffer overflows, such as the following triggered by our cmmi10.ttf: ``` ERROR: AddressSanitizer: heap-buffer-overflow on address 0x617000235709 at pc 0x7f95efd3c48a bp 0x7ffe41b6ecc0 sp 0x7ffe41b6ecb0 READ of size 1 at 0x617000235709 thread T0 #0 0x7f95efd3c489 in utf16be_to_ascii extern/ttconv/pprdrv_tt.cpp:178 #1 0x7f95efd3c489 in Read_name(TTFONT*) extern/ttconv/pprdrv_tt.cpp:339 #2 0x7f95efd499ef in read_font(...) extern/ttconv/pprdrv_tt.cpp:1325 #3 0x7f95efd4c602 in get_pdf_charprocs(...) extern/ttconv/pprdrv_tt.cpp:1420 #4 0x7f95efd35c22 in py_get_pdf_charprocs src/_ttconv.cpp:217 0x617000235709 is located 1 bytes to the right of 648-byte region [0x617000235480,0x617000235708) allocated by thread T0 here: #0 0x7f9612262a38 in __interceptor_calloc (/usr/lib64/libasan.so.4+0xdea38) #1 0x7f95efd3b261 in GetTable(TTFONT*, char const*) extern/ttconv/pprdrv_tt.cpp:140 ```
This fixes some possible heap buffer overflows, such as the following triggered by our cmmi10.ttf: ``` ERROR: AddressSanitizer: heap-buffer-overflow on address 0x617000235709 at pc 0x7f95efd3c48a bp 0x7ffe41b6ecc0 sp 0x7ffe41b6ecb0 READ of size 1 at 0x617000235709 thread T0 #0 0x7f95efd3c489 in utf16be_to_ascii extern/ttconv/pprdrv_tt.cpp:178 #1 0x7f95efd3c489 in Read_name(TTFONT*) extern/ttconv/pprdrv_tt.cpp:339 #2 0x7f95efd499ef in read_font(...) extern/ttconv/pprdrv_tt.cpp:1325 #3 0x7f95efd4c602 in get_pdf_charprocs(...) extern/ttconv/pprdrv_tt.cpp:1420 #4 0x7f95efd35c22 in py_get_pdf_charprocs src/_ttconv.cpp:217 0x617000235709 is located 1 bytes to the right of 648-byte region [0x617000235480,0x617000235708) allocated by thread T0 here: #0 0x7f9612262a38 in __interceptor_calloc (/usr/lib64/libasan.so.4+0xdea38) #1 0x7f95efd3b261 in GetTable(TTFONT*, char const*) extern/ttconv/pprdrv_tt.cpp:140 ```
# This is the 1st commit message: bug fix inserted # This is the commit message matplotlib#2: issue test runs but fails comparison # This is the commit message matplotlib#3: updated styling in test image # This is the commit message matplotlib#4: bug fix inserted
uses the assert_almost_equal function instead of assert_array_equal
uses the assert_almost_equal function instead of assert_array_equal
I updated a couple of links for fetch and added some stray files to clean. I'm also making a couple of suggestions regarding requiring PYVERSION in the command line and dropping the PREFIX from mpl_install. For this last one, I'm assuming that the dependencies are compile-time and matplotlib will work correctly from the relevant site-packages (I haven't seen any problems yet, although I've kept the dependencies in the PREFIX), but I welcome any comments or corrections.