diff options
author | markd <markd> | 2011-02-17 10:33:37 +0000 |
---|---|---|
committer | markd <markd> | 2011-02-17 10:33:37 +0000 |
commit | 4ff6fd57dfde459700067781c15458019dd6eb6b (patch) | |
tree | 0320900f003fab1a782fcabbf312c64e7aa112a1 /graphics | |
parent | 60481a8e406fa1204a1d322050c0be3a7e04d5d5 (diff) | |
download | pkgsrc-4ff6fd57dfde459700067781c15458019dd6eb6b.tar.gz |
Update to py-matplotlib 1.0.1
Various bugfixes.
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/py-matplotlib-gtk2/Makefile | 21 | ||||
-rw-r--r-- | graphics/py-matplotlib-gtk2/distinfo | 12 | ||||
-rw-r--r-- | graphics/py-matplotlib-gtk2/patches/patch-aa | 47 | ||||
-rw-r--r-- | graphics/py-matplotlib-gtk2/patches/patch-ab | 12 | ||||
-rw-r--r-- | graphics/py-matplotlib-tk/Makefile | 20 | ||||
-rw-r--r-- | graphics/py-matplotlib-tk/distinfo | 12 | ||||
-rw-r--r-- | graphics/py-matplotlib-tk/patches/patch-aa | 47 | ||||
-rw-r--r-- | graphics/py-matplotlib-tk/patches/patch-ab | 12 | ||||
-rw-r--r-- | graphics/py-matplotlib/Makefile | 15 | ||||
-rw-r--r-- | graphics/py-matplotlib/PLIST | 380 | ||||
-rw-r--r-- | graphics/py-matplotlib/distinfo | 12 | ||||
-rw-r--r-- | graphics/py-matplotlib/patches/patch-aa | 27 | ||||
-rw-r--r-- | graphics/py-matplotlib/patches/patch-ab | 126 |
13 files changed, 540 insertions, 203 deletions
diff --git a/graphics/py-matplotlib-gtk2/Makefile b/graphics/py-matplotlib-gtk2/Makefile index b241b4ae25c..b1255d0f775 100644 --- a/graphics/py-matplotlib-gtk2/Makefile +++ b/graphics/py-matplotlib-gtk2/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.20 2011/01/13 13:38:17 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2011/02/17 10:33:38 markd Exp $ # -DISTNAME= matplotlib-0.99.1.2 -PKGNAME= ${PYPKGPREFIX}-matplotlib-gtk-0.99.1.2 -PKGREVISION= 4 +DISTNAME= matplotlib-1.0.1 +PKGNAME= ${PYPKGPREFIX}-matplotlib-gtk-1.0.1 CATEGORIES= graphics python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=matplotlib/} @@ -13,7 +12,6 @@ COMMENT= GTK frontend for matplotlib PKG_DESTDIR_SUPPORT= user-destdir -WRKSRC= ${WRKDIR}/matplotlib-0.99.1.1 USE_TOOLS+= pkg-config PY_PATCHPLIST= yes PYDISTUTILSPKG= yes @@ -21,6 +19,19 @@ USE_LANGUAGES= c c++ PYTHON_VERSIONS_ACCEPTED= 26 25 +post-patch: + ( echo "[directories]"; \ + echo "basedirlist=/usr"; \ + echo "[provide_packages]"; \ + echo "pytz = False"; \ + echo "dateutil = False"; \ + echo "[gui_support]"; \ + echo "gtk = True"; \ + echo "gtkagg = True"; \ + echo "tkagg = False"; \ + echo "wxagg = False"; \ + echo "macosx = False" ) > ${WRKSRC}/setup.cfg + .include "../../lang/python/extension.mk" .include "../../graphics/py-matplotlib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/graphics/py-matplotlib-gtk2/distinfo b/graphics/py-matplotlib-gtk2/distinfo index 7810c8d5da6..302014a1bdf 100644 --- a/graphics/py-matplotlib-gtk2/distinfo +++ b/graphics/py-matplotlib-gtk2/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2010/07/20 09:00:17 markd Exp $ +$NetBSD: distinfo,v 1.6 2011/02/17 10:33:38 markd Exp $ -SHA1 (matplotlib-0.99.1.2.tar.gz) = c3f9053a8522e2541d93ee55e8b447165708ac15 -RMD160 (matplotlib-0.99.1.2.tar.gz) = 11daee415102dff944d9c45de22c48c83e76dde7 -Size (matplotlib-0.99.1.2.tar.gz) = 11940390 bytes -SHA1 (patch-aa) = dcfd3cdba8c8c2ebbd68e14c8e1d026dd70968d6 -SHA1 (patch-ab) = ee836eef8a183e79fc25cd0a5a2538d6f54cbef3 +SHA1 (matplotlib-1.0.1.tar.gz) = c7a832f28a66817626e7a8af21e14ea0e15f4008 +RMD160 (matplotlib-1.0.1.tar.gz) = e3e326f7f31ef995253da483444cb593b8e6753b +Size (matplotlib-1.0.1.tar.gz) = 13285166 bytes +SHA1 (patch-aa) = 611a55383e4d343f220f6bdb814629b22e70848d +SHA1 (patch-ab) = 4bc5d9fa3d8f6236794c2e76f63f1bc45e3948ec diff --git a/graphics/py-matplotlib-gtk2/patches/patch-aa b/graphics/py-matplotlib-gtk2/patches/patch-aa index 36519fa4808..7069feb1667 100644 --- a/graphics/py-matplotlib-gtk2/patches/patch-aa +++ b/graphics/py-matplotlib-gtk2/patches/patch-aa @@ -1,45 +1,36 @@ -$NetBSD: patch-aa,v 1.5 2010/07/20 09:00:17 markd Exp $ +$NetBSD: patch-aa,v 1.6 2011/02/17 10:33:38 markd Exp $ ---- setupext.py.orig 2009-08-23 05:27:32.000000000 +0000 +--- setupext.py.orig 2010-07-07 01:41:55.000000000 +0000 +++ setupext.py -@@ -103,16 +103,16 @@ numpy_inc_dirs = [] - # matplotlib build options, which can be altered using setup.cfg - options = {'display_status': True, +@@ -115,14 +115,14 @@ options = {'display_status': True, 'verbose': False, -- 'provide_pytz': 'auto', -- 'provide_dateutil': 'auto', + 'provide_pytz': 'auto', + 'provide_dateutil': 'auto', - 'build_agg': True, -- 'build_gtk': 'auto', -- 'build_gtkagg': 'auto', -- 'build_tkagg': 'auto', -- 'build_wxagg': 'auto', -- 'build_macosx': 'auto', ++ 'build_agg': False, + 'build_gtk': 'auto', + 'build_gtkagg': 'auto', + 'build_tkagg': 'auto', + 'build_wxagg': 'auto', + 'build_macosx': 'auto', - 'build_image': True, - 'build_windowing': True, -+ 'provide_pytz': False, -+ 'provide_dateutil': False, -+ 'build_agg': False, -+ 'build_gtk': True, -+ 'build_gtkagg': True, -+ 'build_tkagg': False, -+ 'build_wxagg': False, -+ 'build_macosx': False, + 'build_image': False, + 'build_windowing': False, - 'backend': None} + 'backend': None, + 'basedirlist': None} - # Based on the contents of setup.cfg, determine the build options -@@ -320,11 +320,8 @@ def check_for_libpng(): +@@ -344,11 +344,8 @@ def check_for_libpng(): return True def add_base_flags(module): - incdirs = filter(os.path.exists, -- [os.path.join(p, 'include') for p in basedir[sys.platform] ]) +- [os.path.join(p, 'include') for p in basedirlist ]) - libdirs = filter(os.path.exists, -- [os.path.join(p, 'lib') for p in basedir[sys.platform] ]+ -- [os.path.join(p, 'lib64') for p in basedir[sys.platform] ] ) -+ incdirs = os.path.join(os.environ['LOCALBASE'], 'include') -+ libdirs = os.path.join(os.environ['LOCALBASE'], 'lib') +- [os.path.join(p, 'lib') for p in basedirlist ]+ +- [os.path.join(p, 'lib64') for p in basedirlist ] ) ++ incdirs = [os.path.join(os.environ['LOCALBASE'], 'include')] ++ libdirs = [os.path.join(os.environ['LOCALBASE'], 'lib')] module.include_dirs.extend(incdirs) module.include_dirs.append('.') diff --git a/graphics/py-matplotlib-gtk2/patches/patch-ab b/graphics/py-matplotlib-gtk2/patches/patch-ab index 089a8620c7d..b6129d2f87a 100644 --- a/graphics/py-matplotlib-gtk2/patches/patch-ab +++ b/graphics/py-matplotlib-gtk2/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.4 2010/05/17 16:22:59 drochner Exp $ +$NetBSD: patch-ab,v 1.5 2011/02/17 10:33:38 markd Exp $ ---- setup.py.orig 2008-12-10 14:53:21.000000000 +1300 +--- setup.py.orig 2010-07-07 01:41:55.000000000 +0000 +++ setup.py -@@ -101,12 +101,12 @@ if not check_for_numpy(): +@@ -128,13 +128,13 @@ if not check_for_numpy(): if not check_for_freetype(): sys.exit(1) @@ -12,16 +12,18 @@ $NetBSD: patch-ab,v 1.4 2010/05/17 16:22:59 drochner Exp $ -build_delaunay(ext_modules, packages) -build_nxutils(ext_modules, packages) -build_path(ext_modules, packages) +-build_tri(ext_modules, packages) +#build_ft2font(ext_modules, packages) +#build_ttconv(ext_modules, packages) +#build_contour(ext_modules, packages) +#build_delaunay(ext_modules, packages) +#build_nxutils(ext_modules, packages) +#build_path(ext_modules, packages) ++#build_tri(ext_modules, packages) print_raw("") print_raw("OPTIONAL BACKEND DEPENDENCIES") -@@ -147,13 +147,13 @@ if options['build_wxagg']: +@@ -175,13 +175,13 @@ if options['build_wxagg']: print_message("WxAgg extension not required for wxPython >= 2.8") rc['backend'] = 'WXAgg' @@ -37,7 +39,7 @@ $NetBSD: patch-ab,v 1.4 2010/05/17 16:22:59 drochner Exp $ build_gtkagg(ext_modules, packages) rc['backend'] = 'GTKAgg' -@@ -257,11 +257,11 @@ distrib = setup(name="matplotlib", +@@ -282,11 +282,11 @@ distrib = setup(name="matplotlib", interfaces and hardcopy output formats. There is a 'pylab' mode which emulates matlab graphics """, diff --git a/graphics/py-matplotlib-tk/Makefile b/graphics/py-matplotlib-tk/Makefile index e900b95bbd7..9462612c1ee 100644 --- a/graphics/py-matplotlib-tk/Makefile +++ b/graphics/py-matplotlib-tk/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2011/01/13 13:38:17 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2011/02/17 10:33:38 markd Exp $ # -DISTNAME= matplotlib-0.99.1.2 -PKGNAME= ${PYPKGPREFIX}-matplotlib-tk-0.99.1.2 -PKGREVISION= 2 +DISTNAME= matplotlib-1.0.1 +PKGNAME= ${PYPKGPREFIX}-matplotlib-tk-1.0.1 CATEGORIES= graphics python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=matplotlib/} @@ -13,12 +12,23 @@ COMMENT= Tk frontend for matplotlib PKG_DESTDIR_SUPPORT= user-destdir -WRKSRC= ${WRKDIR}/matplotlib-0.99.1.1 USE_TOOLS+= pkg-config PY_PATCHPLIST= yes PYDISTUTILSPKG= yes USE_LANGUAGES= c c++ +post-patch: + ( echo "[directories]"; \ + echo "basedirlist=/usr"; \ + echo "[provide_packages]"; \ + echo "pytz = False"; \ + echo "dateutil = False"; \ + echo "[gui_support]"; \ + echo "gtk = False"; \ + echo "gtkagg = False"; \ + echo "tkagg = True"; \ + echo "wxagg = False"; \ + echo "macosx = False" ) > ${WRKSRC}/setup.cfg .include "../../lang/python/extension.mk" .include "../../graphics/py-matplotlib/buildlink3.mk" diff --git a/graphics/py-matplotlib-tk/distinfo b/graphics/py-matplotlib-tk/distinfo index fcd0804da03..68f06ef2825 100644 --- a/graphics/py-matplotlib-tk/distinfo +++ b/graphics/py-matplotlib-tk/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.4 2010/05/17 16:22:59 drochner Exp $ +$NetBSD: distinfo,v 1.5 2011/02/17 10:33:38 markd Exp $ -SHA1 (matplotlib-0.99.1.2.tar.gz) = c3f9053a8522e2541d93ee55e8b447165708ac15 -RMD160 (matplotlib-0.99.1.2.tar.gz) = 11daee415102dff944d9c45de22c48c83e76dde7 -Size (matplotlib-0.99.1.2.tar.gz) = 11940390 bytes -SHA1 (patch-aa) = 193497e854113548345f10fc21b0d258f6376267 -SHA1 (patch-ab) = 0a89e0d6fd96e3f998ab92130596c248061c36e3 +SHA1 (matplotlib-1.0.1.tar.gz) = c7a832f28a66817626e7a8af21e14ea0e15f4008 +RMD160 (matplotlib-1.0.1.tar.gz) = e3e326f7f31ef995253da483444cb593b8e6753b +Size (matplotlib-1.0.1.tar.gz) = 13285166 bytes +SHA1 (patch-aa) = 611a55383e4d343f220f6bdb814629b22e70848d +SHA1 (patch-ab) = 4bc5d9fa3d8f6236794c2e76f63f1bc45e3948ec diff --git a/graphics/py-matplotlib-tk/patches/patch-aa b/graphics/py-matplotlib-tk/patches/patch-aa index 6d8764bb35d..055a301d993 100644 --- a/graphics/py-matplotlib-tk/patches/patch-aa +++ b/graphics/py-matplotlib-tk/patches/patch-aa @@ -1,45 +1,36 @@ -$NetBSD: patch-aa,v 1.3 2010/05/17 16:22:59 drochner Exp $ +$NetBSD: patch-aa,v 1.4 2011/02/17 10:33:39 markd Exp $ ---- setupext.py.orig 2009-08-23 05:27:32.000000000 +0000 +--- setupext.py.orig 2010-07-07 01:41:55.000000000 +0000 +++ setupext.py -@@ -103,16 +103,16 @@ numpy_inc_dirs = [] - # matplotlib build options, which can be altered using setup.cfg - options = {'display_status': True, +@@ -115,14 +115,14 @@ options = {'display_status': True, 'verbose': False, -- 'provide_pytz': 'auto', -- 'provide_dateutil': 'auto', + 'provide_pytz': 'auto', + 'provide_dateutil': 'auto', - 'build_agg': True, -- 'build_gtk': 'auto', -- 'build_gtkagg': 'auto', -- 'build_tkagg': 'auto', -- 'build_wxagg': 'auto', -- 'build_macosx': 'auto', ++ 'build_agg': False, + 'build_gtk': 'auto', + 'build_gtkagg': 'auto', + 'build_tkagg': 'auto', + 'build_wxagg': 'auto', + 'build_macosx': 'auto', - 'build_image': True, - 'build_windowing': True, -+ 'provide_pytz': False, -+ 'provide_dateutil': False, -+ 'build_agg': False, -+ 'build_gtk': False, -+ 'build_gtkagg': False, -+ 'build_tkagg': True, -+ 'build_wxagg': False, -+ 'build_macosx': False, + 'build_image': False, + 'build_windowing': False, - 'backend': None} + 'backend': None, + 'basedirlist': None} - # Based on the contents of setup.cfg, determine the build options -@@ -320,11 +320,8 @@ def check_for_libpng(): +@@ -344,11 +344,8 @@ def check_for_libpng(): return True def add_base_flags(module): - incdirs = filter(os.path.exists, -- [os.path.join(p, 'include') for p in basedir[sys.platform] ]) +- [os.path.join(p, 'include') for p in basedirlist ]) - libdirs = filter(os.path.exists, -- [os.path.join(p, 'lib') for p in basedir[sys.platform] ]+ -- [os.path.join(p, 'lib64') for p in basedir[sys.platform] ] ) -+ incdirs = os.path.join(os.environ['LOCALBASE'], 'include') -+ libdirs = os.path.join(os.environ['LOCALBASE'], 'lib') +- [os.path.join(p, 'lib') for p in basedirlist ]+ +- [os.path.join(p, 'lib64') for p in basedirlist ] ) ++ incdirs = [os.path.join(os.environ['LOCALBASE'], 'include')] ++ libdirs = [os.path.join(os.environ['LOCALBASE'], 'lib')] module.include_dirs.extend(incdirs) module.include_dirs.append('.') diff --git a/graphics/py-matplotlib-tk/patches/patch-ab b/graphics/py-matplotlib-tk/patches/patch-ab index bbf661a4519..652a824ab05 100644 --- a/graphics/py-matplotlib-tk/patches/patch-ab +++ b/graphics/py-matplotlib-tk/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.3 2010/05/17 16:22:59 drochner Exp $ +$NetBSD: patch-ab,v 1.4 2011/02/17 10:33:39 markd Exp $ ---- setup.py.orig 2009-08-01 19:15:24.000000000 +0000 +--- setup.py.orig 2010-07-07 01:41:55.000000000 +0000 +++ setup.py -@@ -105,12 +105,12 @@ if not check_for_numpy(): +@@ -128,13 +128,13 @@ if not check_for_numpy(): if not check_for_freetype(): sys.exit(1) @@ -12,16 +12,18 @@ $NetBSD: patch-ab,v 1.3 2010/05/17 16:22:59 drochner Exp $ -build_delaunay(ext_modules, packages) -build_nxutils(ext_modules, packages) -build_path(ext_modules, packages) +-build_tri(ext_modules, packages) +#build_ft2font(ext_modules, packages) +#build_ttconv(ext_modules, packages) +#build_contour(ext_modules, packages) +#build_delaunay(ext_modules, packages) +#build_nxutils(ext_modules, packages) +#build_path(ext_modules, packages) ++#build_tri(ext_modules, packages) print_raw("") print_raw("OPTIONAL BACKEND DEPENDENCIES") -@@ -151,13 +151,13 @@ if options['build_wxagg']: +@@ -175,13 +175,13 @@ if options['build_wxagg']: print_message("WxAgg extension not required for wxPython >= 2.8") rc['backend'] = 'WXAgg' @@ -37,7 +39,7 @@ $NetBSD: patch-ab,v 1.3 2010/05/17 16:22:59 drochner Exp $ build_gtkagg(ext_modules, packages) rc['backend'] = 'GTKAgg' -@@ -258,11 +258,11 @@ distrib = setup(name="matplotlib", +@@ -282,11 +282,11 @@ distrib = setup(name="matplotlib", interfaces and hardcopy output formats. There is a 'pylab' mode which emulates matlab graphics """, diff --git a/graphics/py-matplotlib/Makefile b/graphics/py-matplotlib/Makefile index 72fb78f2ea1..39b931e47f2 100644 --- a/graphics/py-matplotlib/Makefile +++ b/graphics/py-matplotlib/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.27 2011/01/13 13:38:17 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2011/02/17 10:33:37 markd Exp $ # -DISTNAME= matplotlib-0.99.1.2 +DISTNAME= matplotlib-1.0.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -PKGREVISION= 2 CATEGORIES= graphics python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=matplotlib/} @@ -16,12 +15,20 @@ DEPENDS+= ${PYPKGPREFIX}-dateutil>=1.2:../../time/py-dateutil PKG_DESTDIR_SUPPORT= user-destdir -WRKSRC= ${WRKDIR}/matplotlib-0.99.1.1 USE_LANGUAGES= c c++ USE_TOOLS+= pkg-config PY_PATCHPLIST= yes PYDISTUTILSPKG= yes +post-patch: + ( echo "[directories]"; \ + echo "basedirlist=/usr"; \ + echo "[gui_support]"; \ + echo "gtk = False"; \ + echo "gtkagg = False"; \ + echo "tkagg = False"; \ + echo "wxagg = False" ) > ${WRKSRC}/setup.cfg + .include "../../lang/python/extension.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/graphics/py-matplotlib/PLIST b/graphics/py-matplotlib/PLIST index 91a55a6b74f..161f254d6bc 100644 --- a/graphics/py-matplotlib/PLIST +++ b/graphics/py-matplotlib/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2010/05/17 16:22:59 drochner Exp $ +@comment $NetBSD: PLIST,v 1.13 2011/02/17 10:33:37 markd Exp $ ${PYSITELIB}/matplotlib/__init__.py ${PYSITELIB}/matplotlib/__init__.pyc ${PYSITELIB}/matplotlib/__init__.pyo @@ -16,6 +16,7 @@ ${PYSITELIB}/matplotlib/_png.so ${PYSITELIB}/matplotlib/_pylab_helpers.py ${PYSITELIB}/matplotlib/_pylab_helpers.pyc ${PYSITELIB}/matplotlib/_pylab_helpers.pyo +${PYSITELIB}/matplotlib/_tri.so ${PYSITELIB}/matplotlib/afm.py ${PYSITELIB}/matplotlib/afm.pyc ${PYSITELIB}/matplotlib/afm.pyo @@ -104,9 +105,21 @@ ${PYSITELIB}/matplotlib/backends/backend_wx.pyo ${PYSITELIB}/matplotlib/backends/backend_wxagg.py ${PYSITELIB}/matplotlib/backends/backend_wxagg.pyc ${PYSITELIB}/matplotlib/backends/backend_wxagg.pyo +${PYSITELIB}/matplotlib/backends/qt4_editor/__init__.py +${PYSITELIB}/matplotlib/backends/qt4_editor/__init__.pyc +${PYSITELIB}/matplotlib/backends/qt4_editor/__init__.pyo +${PYSITELIB}/matplotlib/backends/qt4_editor/figureoptions.py +${PYSITELIB}/matplotlib/backends/qt4_editor/figureoptions.pyc +${PYSITELIB}/matplotlib/backends/qt4_editor/figureoptions.pyo +${PYSITELIB}/matplotlib/backends/qt4_editor/formlayout.py +${PYSITELIB}/matplotlib/backends/qt4_editor/formlayout.pyc +${PYSITELIB}/matplotlib/backends/qt4_editor/formlayout.pyo ${PYSITELIB}/matplotlib/backends/tkagg.py ${PYSITELIB}/matplotlib/backends/tkagg.pyc ${PYSITELIB}/matplotlib/backends/tkagg.pyo +${PYSITELIB}/matplotlib/backends/windowing.py +${PYSITELIB}/matplotlib/backends/windowing.pyc +${PYSITELIB}/matplotlib/backends/windowing.pyo ${PYSITELIB}/matplotlib/bezier.py ${PYSITELIB}/matplotlib/bezier.pyc ${PYSITELIB}/matplotlib/bezier.pyo @@ -146,6 +159,9 @@ ${PYSITELIB}/matplotlib/delaunay/testfuncs.pyo ${PYSITELIB}/matplotlib/delaunay/triangulate.py ${PYSITELIB}/matplotlib/delaunay/triangulate.pyc ${PYSITELIB}/matplotlib/delaunay/triangulate.pyo +${PYSITELIB}/matplotlib/docstring.py +${PYSITELIB}/matplotlib/docstring.pyc +${PYSITELIB}/matplotlib/docstring.pyo ${PYSITELIB}/matplotlib/dviread.py ${PYSITELIB}/matplotlib/dviread.pyc ${PYSITELIB}/matplotlib/dviread.pyo @@ -162,6 +178,9 @@ ${PYSITELIB}/matplotlib/fontconfig_pattern.py ${PYSITELIB}/matplotlib/fontconfig_pattern.pyc ${PYSITELIB}/matplotlib/fontconfig_pattern.pyo ${PYSITELIB}/matplotlib/ft2font.so +${PYSITELIB}/matplotlib/gridspec.py +${PYSITELIB}/matplotlib/gridspec.pyc +${PYSITELIB}/matplotlib/gridspec.pyo ${PYSITELIB}/matplotlib/hatch.py ${PYSITELIB}/matplotlib/hatch.pyc ${PYSITELIB}/matplotlib/hatch.pyo @@ -180,9 +199,6 @@ ${PYSITELIB}/matplotlib/mathtext.pyo ${PYSITELIB}/matplotlib/mlab.py ${PYSITELIB}/matplotlib/mlab.pyc ${PYSITELIB}/matplotlib/mlab.pyo -${PYSITELIB}/matplotlib/mpl-data/example/aapl.npy -${PYSITELIB}/matplotlib/mpl-data/example/goog.npy -${PYSITELIB}/matplotlib/mpl-data/example/msft_nasdaq.npy ${PYSITELIB}/matplotlib/mpl-data/fonts/afm/cmex10.afm ${PYSITELIB}/matplotlib/mpl-data/fonts/afm/cmmi10.afm ${PYSITELIB}/matplotlib/mpl-data/fonts/afm/cmr10.afm @@ -244,6 +260,10 @@ ${PYSITELIB}/matplotlib/mpl-data/fonts/pdfcorefonts/Times-Italic.afm ${PYSITELIB}/matplotlib/mpl-data/fonts/pdfcorefonts/Times-Roman.afm ${PYSITELIB}/matplotlib/mpl-data/fonts/pdfcorefonts/ZapfDingbats.afm ${PYSITELIB}/matplotlib/mpl-data/fonts/pdfcorefonts/readme.txt +${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/COPYRIGHT.TXT +${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/LICENSE_STIX +${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/README.TXT +${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/RELEASENOTES.TXT ${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXGeneral.ttf ${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXGeneralBol.ttf ${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXGeneralBolIta.ttf @@ -252,15 +272,15 @@ ${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXNonUni.ttf ${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXNonUniBol.ttf ${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXNonUniBolIta.ttf ${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXNonUniIta.ttf -${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXSiz1Sym.ttf -${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXSiz1SymBol.ttf -${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXSiz2Sym.ttf -${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXSiz2SymBol.ttf -${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXSiz3Sym.ttf -${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXSiz3SymBol.ttf -${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXSiz4Sym.ttf -${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXSiz4SymBol.ttf -${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXSiz5Sym.ttf +${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXSizFiveSymReg.ttf +${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXSizFourSymBol.ttf +${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXSizFourSymReg.ttf +${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXSizOneSymBol.ttf +${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXSizOneSymReg.ttf +${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXSizThreeSymBol.ttf +${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXSizThreeSymReg.ttf +${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXSizTwoSymBol.ttf +${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXSizTwoSymReg.ttf ${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/Vera.ttf ${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/VeraBI.ttf ${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/VeraBd.ttf @@ -304,6 +324,8 @@ ${PYSITELIB}/matplotlib/mpl-data/images/move.png ${PYSITELIB}/matplotlib/mpl-data/images/move.ppm ${PYSITELIB}/matplotlib/mpl-data/images/move.svg ${PYSITELIB}/matplotlib/mpl-data/images/move.xpm +${PYSITELIB}/matplotlib/mpl-data/images/qt4_editor_options.png +${PYSITELIB}/matplotlib/mpl-data/images/qt4_editor_options.svg ${PYSITELIB}/matplotlib/mpl-data/images/stock_close.ppm ${PYSITELIB}/matplotlib/mpl-data/images/stock_close.xpm ${PYSITELIB}/matplotlib/mpl-data/images/stock_down.ppm @@ -366,6 +388,9 @@ ${PYSITELIB}/matplotlib/patches.pyo ${PYSITELIB}/matplotlib/path.py ${PYSITELIB}/matplotlib/path.pyc ${PYSITELIB}/matplotlib/path.pyo +${PYSITELIB}/matplotlib/patheffects.py +${PYSITELIB}/matplotlib/patheffects.pyc +${PYSITELIB}/matplotlib/patheffects.pyo ${PYSITELIB}/matplotlib/projections/__init__.py ${PYSITELIB}/matplotlib/projections/__init__.pyc ${PYSITELIB}/matplotlib/projections/__init__.pyo @@ -396,6 +421,12 @@ ${PYSITELIB}/matplotlib/scale.pyo ${PYSITELIB}/matplotlib/sphinxext/__init__.py ${PYSITELIB}/matplotlib/sphinxext/__init__.pyc ${PYSITELIB}/matplotlib/sphinxext/__init__.pyo +${PYSITELIB}/matplotlib/sphinxext/ipython_console_highlighting.py +${PYSITELIB}/matplotlib/sphinxext/ipython_console_highlighting.pyc +${PYSITELIB}/matplotlib/sphinxext/ipython_console_highlighting.pyo +${PYSITELIB}/matplotlib/sphinxext/ipython_directive.py +${PYSITELIB}/matplotlib/sphinxext/ipython_directive.pyc +${PYSITELIB}/matplotlib/sphinxext/ipython_directive.pyo ${PYSITELIB}/matplotlib/sphinxext/mathmpl.py ${PYSITELIB}/matplotlib/sphinxext/mathmpl.pyc ${PYSITELIB}/matplotlib/sphinxext/mathmpl.pyo @@ -411,12 +442,248 @@ ${PYSITELIB}/matplotlib/spines.pyo ${PYSITELIB}/matplotlib/table.py ${PYSITELIB}/matplotlib/table.pyc ${PYSITELIB}/matplotlib/table.pyo +${PYSITELIB}/matplotlib/testing/__init__.py +${PYSITELIB}/matplotlib/testing/__init__.pyc +${PYSITELIB}/matplotlib/testing/__init__.pyo +${PYSITELIB}/matplotlib/testing/compare.py +${PYSITELIB}/matplotlib/testing/compare.pyc +${PYSITELIB}/matplotlib/testing/compare.pyo +${PYSITELIB}/matplotlib/testing/decorators.py +${PYSITELIB}/matplotlib/testing/decorators.pyc +${PYSITELIB}/matplotlib/testing/decorators.pyo +${PYSITELIB}/matplotlib/testing/jpl_units/Duration.py +${PYSITELIB}/matplotlib/testing/jpl_units/Duration.pyc +${PYSITELIB}/matplotlib/testing/jpl_units/Duration.pyo +${PYSITELIB}/matplotlib/testing/jpl_units/Epoch.py +${PYSITELIB}/matplotlib/testing/jpl_units/Epoch.pyc +${PYSITELIB}/matplotlib/testing/jpl_units/Epoch.pyo +${PYSITELIB}/matplotlib/testing/jpl_units/EpochConverter.py +${PYSITELIB}/matplotlib/testing/jpl_units/EpochConverter.pyc +${PYSITELIB}/matplotlib/testing/jpl_units/EpochConverter.pyo +${PYSITELIB}/matplotlib/testing/jpl_units/StrConverter.py +${PYSITELIB}/matplotlib/testing/jpl_units/StrConverter.pyc +${PYSITELIB}/matplotlib/testing/jpl_units/StrConverter.pyo +${PYSITELIB}/matplotlib/testing/jpl_units/UnitDbl.py +${PYSITELIB}/matplotlib/testing/jpl_units/UnitDbl.pyc +${PYSITELIB}/matplotlib/testing/jpl_units/UnitDbl.pyo +${PYSITELIB}/matplotlib/testing/jpl_units/UnitDblConverter.py +${PYSITELIB}/matplotlib/testing/jpl_units/UnitDblConverter.pyc +${PYSITELIB}/matplotlib/testing/jpl_units/UnitDblConverter.pyo +${PYSITELIB}/matplotlib/testing/jpl_units/UnitDblFormatter.py +${PYSITELIB}/matplotlib/testing/jpl_units/UnitDblFormatter.pyc +${PYSITELIB}/matplotlib/testing/jpl_units/UnitDblFormatter.pyo +${PYSITELIB}/matplotlib/testing/jpl_units/__init__.py +${PYSITELIB}/matplotlib/testing/jpl_units/__init__.pyc +${PYSITELIB}/matplotlib/testing/jpl_units/__init__.pyo +${PYSITELIB}/matplotlib/testing/noseclasses.py +${PYSITELIB}/matplotlib/testing/noseclasses.pyc +${PYSITELIB}/matplotlib/testing/noseclasses.pyo +${PYSITELIB}/matplotlib/tests/__init__.py +${PYSITELIB}/matplotlib/tests/__init__.pyc +${PYSITELIB}/matplotlib/tests/__init__.pyo +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/axhspan_epoch.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/axhspan_epoch.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/axhspan_epoch.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/axvspan_epoch.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/axvspan_epoch.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/axvspan_epoch.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/const_xy.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/const_xy.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/const_xy.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/fill_units.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/fill_units.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/fill_units.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/formatter_ticker_001.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/formatter_ticker_001.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/formatter_ticker_001.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/formatter_ticker_002.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/formatter_ticker_002.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/formatter_ticker_002.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/formatter_ticker_003.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/formatter_ticker_003.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/formatter_ticker_003.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/formatter_ticker_004.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/formatter_ticker_004.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/formatter_ticker_004.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/formatter_ticker_005.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/formatter_ticker_005.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/formatter_ticker_005.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/hexbin_extent.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/hexbin_extent.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/hexbin_extent.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/imshow.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/imshow.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/imshow.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/imshow_clip.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/imshow_clip.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/imshow_clip.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/nonfinite_limits.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/nonfinite_limits.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/nonfinite_limits.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/offset_points.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/offset_points.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/offset_points.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/pcolormesh.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/pcolormesh.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/pcolormesh.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/polar_axes.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/polar_axes.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/polar_axes.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/polar_coords.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/polar_coords.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/polar_coords.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/polar_rmin.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/polar_rmin.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/polar_rmin.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/polar_units.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/polar_units.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/polar_units.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/polar_wrap_180.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/polar_wrap_180.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/polar_wrap_180.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/polar_wrap_360.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/polar_wrap_360.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/polar_wrap_360.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/polycollection_joinstyle.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/polycollection_joinstyle.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/polycollection_joinstyle.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/shaped_data.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/shaped_data.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/shaped_data.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/single_date.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/single_date.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/single_date.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/single_point.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/single_point.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/single_point.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/symlog.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/symlog.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/symlog.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_dates/DateFormatter_fractionalSeconds.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_dates/DateFormatter_fractionalSeconds.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_dates/DateFormatter_fractionalSeconds.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_dates/RRuleLocator_bounds.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_dates/RRuleLocator_bounds.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_dates/RRuleLocator_bounds.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_dates/date_axhline.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_dates/date_axhline.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_dates/date_axhline.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_dates/date_axhspan.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_dates/date_axhspan.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_dates/date_axhspan.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_dates/date_axvline.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_dates/date_axvline.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_dates/date_axvline.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_dates/date_axvspan.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_dates/date_axvspan.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_dates/date_axvspan.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_dates/date_empty.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_dates/date_empty.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_dates/date_empty.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_image/figimage-0.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_image/figimage-1.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_image/image_clip.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_image/image_clip.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_image/image_clip.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_image/image_interps.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_image/image_interps.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_image/image_interps.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_image/imshow.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_image/imshow.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_image/imshow.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_simplification/clipper_edge.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_simplification/clipper_edge.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_simplification/clipper_edge.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_simplification/clipping.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_simplification/clipping.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_simplification/clipping.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_simplification/clipping_diamond.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_simplification/clipping_diamond.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_simplification/clipping_diamond.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_simplification/fft_peaks.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_simplification/fft_peaks.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_simplification/fft_peaks.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_simplification/hatch_simplify.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_simplification/hatch_simplify.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_simplification/hatch_simplify.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_simplification/overflow.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_simplification/overflow.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_simplification/overflow.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_simplification/para_equal_perp.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_simplification/para_equal_perp.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_simplification/para_equal_perp.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_simplification/simplify_curve.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_simplification/simplify_curve.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_simplification/simplify_curve.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_text/font_styles.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_text/font_styles.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_text/font_styles.svg +${PYSITELIB}/matplotlib/tests/baseline_images/test_text/multiline.pdf +${PYSITELIB}/matplotlib/tests/baseline_images/test_text/multiline.png +${PYSITELIB}/matplotlib/tests/baseline_images/test_text/multiline.svg +${PYSITELIB}/matplotlib/tests/test_agg.py +${PYSITELIB}/matplotlib/tests/test_agg.pyc +${PYSITELIB}/matplotlib/tests/test_agg.pyo +${PYSITELIB}/matplotlib/tests/test_axes.py +${PYSITELIB}/matplotlib/tests/test_axes.pyc +${PYSITELIB}/matplotlib/tests/test_axes.pyo +${PYSITELIB}/matplotlib/tests/test_backend_svg.py +${PYSITELIB}/matplotlib/tests/test_backend_svg.pyc +${PYSITELIB}/matplotlib/tests/test_backend_svg.pyo +${PYSITELIB}/matplotlib/tests/test_basic.py +${PYSITELIB}/matplotlib/tests/test_basic.pyc +${PYSITELIB}/matplotlib/tests/test_basic.pyo +${PYSITELIB}/matplotlib/tests/test_cbook.py +${PYSITELIB}/matplotlib/tests/test_cbook.pyc +${PYSITELIB}/matplotlib/tests/test_cbook.pyo +${PYSITELIB}/matplotlib/tests/test_dates.py +${PYSITELIB}/matplotlib/tests/test_dates.pyc +${PYSITELIB}/matplotlib/tests/test_dates.pyo +${PYSITELIB}/matplotlib/tests/test_image.py +${PYSITELIB}/matplotlib/tests/test_image.pyc +${PYSITELIB}/matplotlib/tests/test_image.pyo +${PYSITELIB}/matplotlib/tests/test_mathtext.py +${PYSITELIB}/matplotlib/tests/test_mathtext.pyc +${PYSITELIB}/matplotlib/tests/test_mathtext.pyo +${PYSITELIB}/matplotlib/tests/test_mlab.py +${PYSITELIB}/matplotlib/tests/test_mlab.pyc +${PYSITELIB}/matplotlib/tests/test_mlab.pyo +${PYSITELIB}/matplotlib/tests/test_simplification.py +${PYSITELIB}/matplotlib/tests/test_simplification.pyc +${PYSITELIB}/matplotlib/tests/test_simplification.pyo +${PYSITELIB}/matplotlib/tests/test_spines.py +${PYSITELIB}/matplotlib/tests/test_spines.pyc +${PYSITELIB}/matplotlib/tests/test_spines.pyo +${PYSITELIB}/matplotlib/tests/test_text.py +${PYSITELIB}/matplotlib/tests/test_text.pyc +${PYSITELIB}/matplotlib/tests/test_text.pyo +${PYSITELIB}/matplotlib/tests/test_transforms.py +${PYSITELIB}/matplotlib/tests/test_transforms.pyc +${PYSITELIB}/matplotlib/tests/test_transforms.pyo ${PYSITELIB}/matplotlib/texmanager.py ${PYSITELIB}/matplotlib/texmanager.pyc ${PYSITELIB}/matplotlib/texmanager.pyo ${PYSITELIB}/matplotlib/text.py ${PYSITELIB}/matplotlib/text.pyc ${PYSITELIB}/matplotlib/text.pyo +${PYSITELIB}/matplotlib/textpath.py +${PYSITELIB}/matplotlib/textpath.pyc +${PYSITELIB}/matplotlib/textpath.pyo ${PYSITELIB}/matplotlib/ticker.py ${PYSITELIB}/matplotlib/ticker.pyc ${PYSITELIB}/matplotlib/ticker.pyo @@ -426,6 +693,21 @@ ${PYSITELIB}/matplotlib/tight_bbox.pyo ${PYSITELIB}/matplotlib/transforms.py ${PYSITELIB}/matplotlib/transforms.pyc ${PYSITELIB}/matplotlib/transforms.pyo +${PYSITELIB}/matplotlib/tri/__init__.py +${PYSITELIB}/matplotlib/tri/__init__.pyc +${PYSITELIB}/matplotlib/tri/__init__.pyo +${PYSITELIB}/matplotlib/tri/triangulation.py +${PYSITELIB}/matplotlib/tri/triangulation.pyc +${PYSITELIB}/matplotlib/tri/triangulation.pyo +${PYSITELIB}/matplotlib/tri/tricontour.py +${PYSITELIB}/matplotlib/tri/tricontour.pyc +${PYSITELIB}/matplotlib/tri/tricontour.pyo +${PYSITELIB}/matplotlib/tri/tripcolor.py +${PYSITELIB}/matplotlib/tri/tripcolor.pyc +${PYSITELIB}/matplotlib/tri/tripcolor.pyo +${PYSITELIB}/matplotlib/tri/triplot.py +${PYSITELIB}/matplotlib/tri/triplot.pyc +${PYSITELIB}/matplotlib/tri/triplot.pyo ${PYSITELIB}/matplotlib/ttconv.so ${PYSITELIB}/matplotlib/type1font.py ${PYSITELIB}/matplotlib/type1font.pyc @@ -436,9 +718,6 @@ ${PYSITELIB}/matplotlib/units.pyo ${PYSITELIB}/matplotlib/widgets.py ${PYSITELIB}/matplotlib/widgets.pyc ${PYSITELIB}/matplotlib/widgets.pyo -${PYSITELIB}/matplotlib/windowing.py -${PYSITELIB}/matplotlib/windowing.pyc -${PYSITELIB}/matplotlib/windowing.pyo ${PYSITELIB}/mpl_toolkits/__init__.py ${PYSITELIB}/mpl_toolkits/__init__.pyc ${PYSITELIB}/mpl_toolkits/__init__.pyo @@ -463,12 +742,24 @@ ${PYSITELIB}/mpl_toolkits/axes_grid/axes_rgb.pyo ${PYSITELIB}/mpl_toolkits/axes_grid/axes_size.py ${PYSITELIB}/mpl_toolkits/axes_grid/axes_size.pyc ${PYSITELIB}/mpl_toolkits/axes_grid/axes_size.pyo +${PYSITELIB}/mpl_toolkits/axes_grid/axis_artist.py +${PYSITELIB}/mpl_toolkits/axes_grid/axis_artist.pyc +${PYSITELIB}/mpl_toolkits/axes_grid/axis_artist.pyo +${PYSITELIB}/mpl_toolkits/axes_grid/axisline_style.py +${PYSITELIB}/mpl_toolkits/axes_grid/axisline_style.pyc +${PYSITELIB}/mpl_toolkits/axes_grid/axisline_style.pyo ${PYSITELIB}/mpl_toolkits/axes_grid/axislines.py ${PYSITELIB}/mpl_toolkits/axes_grid/axislines.pyc ${PYSITELIB}/mpl_toolkits/axes_grid/axislines.pyo ${PYSITELIB}/mpl_toolkits/axes_grid/clip_path.py ${PYSITELIB}/mpl_toolkits/axes_grid/clip_path.pyc ${PYSITELIB}/mpl_toolkits/axes_grid/clip_path.pyo +${PYSITELIB}/mpl_toolkits/axes_grid/colorbar.py +${PYSITELIB}/mpl_toolkits/axes_grid/colorbar.pyc +${PYSITELIB}/mpl_toolkits/axes_grid/colorbar.pyo +${PYSITELIB}/mpl_toolkits/axes_grid/floating_axes.py +${PYSITELIB}/mpl_toolkits/axes_grid/floating_axes.pyc +${PYSITELIB}/mpl_toolkits/axes_grid/floating_axes.pyo ${PYSITELIB}/mpl_toolkits/axes_grid/grid_finder.py ${PYSITELIB}/mpl_toolkits/axes_grid/grid_finder.pyc ${PYSITELIB}/mpl_toolkits/axes_grid/grid_finder.pyo @@ -481,6 +772,63 @@ ${PYSITELIB}/mpl_toolkits/axes_grid/inset_locator.pyo ${PYSITELIB}/mpl_toolkits/axes_grid/parasite_axes.py ${PYSITELIB}/mpl_toolkits/axes_grid/parasite_axes.pyc ${PYSITELIB}/mpl_toolkits/axes_grid/parasite_axes.pyo +${PYSITELIB}/mpl_toolkits/axes_grid1/__init__.py +${PYSITELIB}/mpl_toolkits/axes_grid1/__init__.pyc +${PYSITELIB}/mpl_toolkits/axes_grid1/__init__.pyo +${PYSITELIB}/mpl_toolkits/axes_grid1/anchored_artists.py +${PYSITELIB}/mpl_toolkits/axes_grid1/anchored_artists.pyc +${PYSITELIB}/mpl_toolkits/axes_grid1/anchored_artists.pyo +${PYSITELIB}/mpl_toolkits/axes_grid1/axes_divider.py +${PYSITELIB}/mpl_toolkits/axes_grid1/axes_divider.pyc +${PYSITELIB}/mpl_toolkits/axes_grid1/axes_divider.pyo +${PYSITELIB}/mpl_toolkits/axes_grid1/axes_grid.py +${PYSITELIB}/mpl_toolkits/axes_grid1/axes_grid.pyc +${PYSITELIB}/mpl_toolkits/axes_grid1/axes_grid.pyo +${PYSITELIB}/mpl_toolkits/axes_grid1/axes_rgb.py +${PYSITELIB}/mpl_toolkits/axes_grid1/axes_rgb.pyc +${PYSITELIB}/mpl_toolkits/axes_grid1/axes_rgb.pyo +${PYSITELIB}/mpl_toolkits/axes_grid1/axes_size.py +${PYSITELIB}/mpl_toolkits/axes_grid1/axes_size.pyc +${PYSITELIB}/mpl_toolkits/axes_grid1/axes_size.pyo +${PYSITELIB}/mpl_toolkits/axes_grid1/colorbar.py +${PYSITELIB}/mpl_toolkits/axes_grid1/colorbar.pyc +${PYSITELIB}/mpl_toolkits/axes_grid1/colorbar.pyo +${PYSITELIB}/mpl_toolkits/axes_grid1/inset_locator.py +${PYSITELIB}/mpl_toolkits/axes_grid1/inset_locator.pyc +${PYSITELIB}/mpl_toolkits/axes_grid1/inset_locator.pyo +${PYSITELIB}/mpl_toolkits/axes_grid1/mpl_axes.py +${PYSITELIB}/mpl_toolkits/axes_grid1/mpl_axes.pyc +${PYSITELIB}/mpl_toolkits/axes_grid1/mpl_axes.pyo +${PYSITELIB}/mpl_toolkits/axes_grid1/parasite_axes.py +${PYSITELIB}/mpl_toolkits/axes_grid1/parasite_axes.pyc +${PYSITELIB}/mpl_toolkits/axes_grid1/parasite_axes.pyo +${PYSITELIB}/mpl_toolkits/axisartist/__init__.py +${PYSITELIB}/mpl_toolkits/axisartist/__init__.pyc +${PYSITELIB}/mpl_toolkits/axisartist/__init__.pyo +${PYSITELIB}/mpl_toolkits/axisartist/angle_helper.py +${PYSITELIB}/mpl_toolkits/axisartist/angle_helper.pyc +${PYSITELIB}/mpl_toolkits/axisartist/angle_helper.pyo +${PYSITELIB}/mpl_toolkits/axisartist/axis_artist.py +${PYSITELIB}/mpl_toolkits/axisartist/axis_artist.pyc +${PYSITELIB}/mpl_toolkits/axisartist/axis_artist.pyo +${PYSITELIB}/mpl_toolkits/axisartist/axisline_style.py +${PYSITELIB}/mpl_toolkits/axisartist/axisline_style.pyc +${PYSITELIB}/mpl_toolkits/axisartist/axisline_style.pyo +${PYSITELIB}/mpl_toolkits/axisartist/axislines.py +${PYSITELIB}/mpl_toolkits/axisartist/axislines.pyc +${PYSITELIB}/mpl_toolkits/axisartist/axislines.pyo +${PYSITELIB}/mpl_toolkits/axisartist/clip_path.py +${PYSITELIB}/mpl_toolkits/axisartist/clip_path.pyc +${PYSITELIB}/mpl_toolkits/axisartist/clip_path.pyo +${PYSITELIB}/mpl_toolkits/axisartist/floating_axes.py +${PYSITELIB}/mpl_toolkits/axisartist/floating_axes.pyc +${PYSITELIB}/mpl_toolkits/axisartist/floating_axes.pyo +${PYSITELIB}/mpl_toolkits/axisartist/grid_finder.py +${PYSITELIB}/mpl_toolkits/axisartist/grid_finder.pyc +${PYSITELIB}/mpl_toolkits/axisartist/grid_finder.pyo +${PYSITELIB}/mpl_toolkits/axisartist/grid_helper_curvelinear.py +${PYSITELIB}/mpl_toolkits/axisartist/grid_helper_curvelinear.pyc +${PYSITELIB}/mpl_toolkits/axisartist/grid_helper_curvelinear.pyo ${PYSITELIB}/mpl_toolkits/exceltools.py ${PYSITELIB}/mpl_toolkits/exceltools.pyc ${PYSITELIB}/mpl_toolkits/exceltools.pyo diff --git a/graphics/py-matplotlib/distinfo b/graphics/py-matplotlib/distinfo index 69d67848c44..545520c694a 100644 --- a/graphics/py-matplotlib/distinfo +++ b/graphics/py-matplotlib/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.12 2011/02/06 08:57:07 markd Exp $ +$NetBSD: distinfo,v 1.13 2011/02/17 10:33:37 markd Exp $ -SHA1 (matplotlib-0.99.1.2.tar.gz) = c3f9053a8522e2541d93ee55e8b447165708ac15 -RMD160 (matplotlib-0.99.1.2.tar.gz) = 11daee415102dff944d9c45de22c48c83e76dde7 -Size (matplotlib-0.99.1.2.tar.gz) = 11940390 bytes -SHA1 (patch-aa) = 1f900684fec67a895fc1999f72d5c164376b40a6 -SHA1 (patch-ab) = bc711f6b594813672aead4cfec52eacbaff308fb +SHA1 (matplotlib-1.0.1.tar.gz) = c7a832f28a66817626e7a8af21e14ea0e15f4008 +RMD160 (matplotlib-1.0.1.tar.gz) = e3e326f7f31ef995253da483444cb593b8e6753b +Size (matplotlib-1.0.1.tar.gz) = 13285166 bytes +SHA1 (patch-aa) = 9e43860c70b8632aa96be68a95f34720ce0ee34a +SHA1 (patch-ab) = 2c85ef7b1aa9b9a317dd4fbfc7a69921d2241c2f diff --git a/graphics/py-matplotlib/patches/patch-aa b/graphics/py-matplotlib/patches/patch-aa index 39a5d145681..cd8b8499719 100644 --- a/graphics/py-matplotlib/patches/patch-aa +++ b/graphics/py-matplotlib/patches/patch-aa @@ -1,31 +1,16 @@ -$NetBSD: patch-aa,v 1.7 2010/05/17 16:22:59 drochner Exp $ +$NetBSD: patch-aa,v 1.8 2011/02/17 10:33:37 markd Exp $ ---- setupext.py.orig 2008-12-10 14:53:21.000000000 +1300 +--- setupext.py.orig 2010-07-07 01:41:55.000000000 +0000 +++ setupext.py -@@ -99,10 +99,10 @@ options = {'display_status': True, - 'provide_pytz': 'auto', - 'provide_dateutil': 'auto', - 'build_agg': True, -- 'build_gtk': 'auto', -- 'build_gtkagg': 'auto', -- 'build_tkagg': 'auto', -- 'build_wxagg': 'auto', -+ 'build_gtk': False, -+ 'build_gtkagg': False, -+ 'build_tkagg': False, -+ 'build_wxagg': False, - 'build_macosx': 'auto', - 'build_image': True, - 'build_windowing': True, -@@ -315,11 +315,8 @@ def check_for_libpng(): +@@ -344,11 +344,8 @@ def check_for_libpng(): return True def add_base_flags(module): - incdirs = filter(os.path.exists, -- [os.path.join(p, 'include') for p in basedir[sys.platform] ]) +- [os.path.join(p, 'include') for p in basedirlist ]) - libdirs = filter(os.path.exists, -- [os.path.join(p, 'lib') for p in basedir[sys.platform] ]+ -- [os.path.join(p, 'lib64') for p in basedir[sys.platform] ] ) +- [os.path.join(p, 'lib') for p in basedirlist ]+ +- [os.path.join(p, 'lib64') for p in basedirlist ] ) + incdirs = [os.path.join(os.environ['LOCALBASE'], 'include')] + libdirs = [os.path.join(os.environ['LOCALBASE'], 'lib')] diff --git a/graphics/py-matplotlib/patches/patch-ab b/graphics/py-matplotlib/patches/patch-ab index ceac7d65efe..cc9efa2aa64 100644 --- a/graphics/py-matplotlib/patches/patch-ab +++ b/graphics/py-matplotlib/patches/patch-ab @@ -1,79 +1,69 @@ -$NetBSD: patch-ab,v 1.4 2011/02/06 08:57:07 markd Exp $ +$NetBSD: patch-ab,v 1.5 2011/02/17 10:33:37 markd Exp $ Fix build with png 1.5 +https://sourceforge.net/tracker/?func=detail&aid=3184016&group_id=80706&atid=560722 ---- src/_png.cpp.orig 2009-08-01 19:14:01.000000000 +0000 +--- src/_png.cpp.orig 2010-10-12 16:14:42.000000000 +0000 +++ src/_png.cpp -@@ -122,7 +122,7 @@ Py::Object _png_module::write_png(const - throw Py::RuntimeError("Could not create info struct"); - } - -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - throw Py::RuntimeError("Error building image"); - } - -@@ -210,10 +210,10 @@ _png_module::read_png(const Py::Tuple& a - png_set_sig_bytes(png_ptr, 8); - png_read_info(png_ptr, info_ptr); - -- png_uint_32 width = info_ptr->width; -- png_uint_32 height = info_ptr->height; -+ png_uint_32 width = png_get_image_width(png_ptr, info_ptr); -+ png_uint_32 height = png_get_image_height(png_ptr, info_ptr); - -- int bit_depth = info_ptr->bit_depth; -+ int bit_depth = png_get_bit_depth(png_ptr, info_ptr); - - // Unpack 1, 2, and 4-bit images - if (bit_depth < 8) -@@ -221,7 +221,7 @@ _png_module::read_png(const Py::Tuple& a +@@ -350,10 +350,10 @@ _png_module::read_png(const Py::Tuple& a + png_set_sig_bytes(png_ptr, 8); + png_read_info(png_ptr, info_ptr); - // If sig bits are set, shift data - png_color_8p sig_bit; -- if ((info_ptr->color_type != PNG_COLOR_TYPE_PALETTE) && png_get_sBIT(png_ptr, info_ptr, &sig_bit)) -+ if ((png_get_color_type(png_ptr, info_ptr) != PNG_COLOR_TYPE_PALETTE) && png_get_sBIT(png_ptr, info_ptr, &sig_bit)) - png_set_shift(png_ptr, sig_bit); +- png_uint_32 width = info_ptr->width; +- png_uint_32 height = info_ptr->height; ++ png_uint_32 width = png_get_image_width(png_ptr, info_ptr); ++ png_uint_32 height = png_get_image_height(png_ptr, info_ptr); - // Convert big endian to little -@@ -229,11 +229,11 @@ _png_module::read_png(const Py::Tuple& a - png_set_swap(png_ptr); +- int bit_depth = info_ptr->bit_depth; ++ int bit_depth = png_get_bit_depth(png_ptr, info_ptr); - // Convert palletes to full RGB -- if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE) - png_set_palette_to_rgb(png_ptr); + // Unpack 1, 2, and 4-bit images + if (bit_depth < 8) +@@ -361,7 +361,7 @@ _png_module::read_png(const Py::Tuple& a - // If there's an alpha channel convert gray to RGB -- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) -+ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA) - png_set_gray_to_rgb(png_ptr); + // If sig bits are set, shift data + png_color_8p sig_bit; +- if ((info_ptr->color_type != PNG_COLOR_TYPE_PALETTE) && ++ if ((png_get_color_type(png_ptr, info_ptr) != PNG_COLOR_TYPE_PALETTE) && + png_get_sBIT(png_ptr, info_ptr, &sig_bit)) + { + png_set_shift(png_ptr, sig_bit); +@@ -374,13 +374,13 @@ _png_module::read_png(const Py::Tuple& a + } - png_set_interlace_handling(png_ptr); -@@ -254,14 +254,14 @@ _png_module::read_png(const Py::Tuple& a - npy_intp dimensions[3]; - dimensions[0] = height; //numrows - dimensions[1] = width; //numcols -- if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA) -+ if (png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_ALPHA) - dimensions[2] = 4; //RGBA images -- else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR) -+ else if (png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_COLOR) - dimensions[2] = 3; //RGB images - else - dimensions[2] = 1; //Greyscale images - //For gray, return an x by y array, not an x by y by 1 -- int num_dims = (info_ptr->color_type & PNG_COLOR_MASK_COLOR) ? 3 : 2; -+ int num_dims = (png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_COLOR) ? 3 : 2; + // Convert palletes to full RGB +- if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_palette_to_rgb(png_ptr); + } - double max_value = (1 << ((bit_depth < 8) ? 8 : bit_depth)) - 1; - PyArrayObject *A = (PyArrayObject *) PyArray_SimpleNew(num_dims, dimensions, PyArray_FLOAT); -@@ -290,7 +290,7 @@ _png_module::read_png(const Py::Tuple& a + // If there's an alpha channel convert gray to RGB +- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) ++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA) + { + png_set_gray_to_rgb(png_ptr); + } +@@ -408,11 +408,11 @@ _png_module::read_png(const Py::Tuple& a + npy_intp dimensions[3]; + dimensions[0] = height; //numrows + dimensions[1] = width; //numcols +- if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA) ++ if (png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_ALPHA) + { + dimensions[2] = 4; //RGBA images + } +- else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR) ++ else if (png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_COLOR) + { + dimensions[2] = 3; //RGB images + } +@@ -421,7 +421,7 @@ _png_module::read_png(const Py::Tuple& a + dimensions[2] = 1; //Greyscale images + } + //For gray, return an x by y array, not an x by y by 1 +- int num_dims = (info_ptr->color_type & PNG_COLOR_MASK_COLOR) ? 3 : 2; ++ int num_dims = (png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_COLOR) ? 3 : 2; - //free the png memory - png_read_end(png_ptr, info_ptr); -- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); -+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - fclose(fp); - for (row = 0; row < height; row++) - delete [] row_pointers[row]; + double max_value = (1 << ((bit_depth < 8) ? 8 : bit_depth)) - 1; + PyArrayObject *A = (PyArrayObject *) PyArray_SimpleNew( |