Permalink
Browse files

teem 1.11.0

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
  • Loading branch information...
1 parent c3b5047 commit 5066b55616624bb4cc3f2e078e6817f6d3c6312a @asparagui asparagui committed with klausmeyer Jan 3, 2013
Showing with 2 additions and 50 deletions.
  1. +2 −50 Library/Formula/teem.rb
View
@@ -2,8 +2,8 @@
class Teem < Formula
homepage 'http://teem.sourceforge.net/'
- url 'https://sourceforge.net/projects/teem/files/teem/1.10.0/teem-1.10.0-src.tar.gz'
- sha1 'f63ff41111ca5aa6ff6fc7653ec0e089da61bac6'
+ url 'http://sourceforge.net/projects/teem/files/teem/1.11.0/teem-1.11.0-src.tar.gz'
+ sha1 'faafa0362abad37591bc1d01441730af462212f9'
head 'https://teem.svn.sourceforge.net/svnroot/teem/teem/trunk'
@@ -12,12 +12,6 @@ class Teem < Formula
option 'experimental-apps', "Build experimental apps"
option 'experimental-libs', "Build experimental libs"
- # fixes issues with linking to more recent libpng bundled with OS X
- # (fixed in head)
- def patches
- DATA
- end unless build.head?
-
def install
cmake_args = std_cmake_args
cmake_args << "-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -39,45 +33,3 @@ def test
system "#{bin}/nrrdSanity"
end
end
-
-__END__
-diff --git a/src/nrrd/formatPNG.c b/src/nrrd/formatPNG.c
-index 75eaa10..564f3af 100644
---- a/src/nrrd/formatPNG.c
-+++ b/src/nrrd/formatPNG.c
-@@ -120,7 +120,7 @@ _nrrdErrorHandlerPNG (png_structp png, png_const_charp message)
- sprintf(err, "%s: PNG error: %s", me, message);
- biffAdd(NRRD, err);
- /* longjmp back to the setjmp, return 1 */
-- longjmp(png->jmpbuf, 1);
-+ longjmp(png_jmpbuf(png), 1);
- }
-
- void
-@@ -200,7 +200,7 @@ _nrrdFormatPNG_read(FILE *file, Nrrd *nrrd, NrrdIoState *nio) {
- biffAdd(NRRD, err); return 1;
- }
- /* set up png style error handling */
-- if (setjmp(png->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png))) {
- /* the error is reported inside the handler,
- but we still need to clean up and return */
- png_destroy_read_struct(&png, &info, NULL);
-@@ -224,7 +224,7 @@ _nrrdFormatPNG_read(FILE *file, Nrrd *nrrd, NrrdIoState *nio) {
- png_set_palette_to_rgb(png);
- /* expand grayscale images to 8 bits from 1, 2, or 4 bits */
- if (type == PNG_COLOR_TYPE_GRAY && depth < 8)
-- png_set_gray_1_2_4_to_8(png);
-+ png_set_expand_gray_1_2_4_to_8(png);
- /* expand paletted or rgb images with transparency to full alpha
- channels so the data will be available as rgba quartets */
- if (png_get_valid(png, info, PNG_INFO_tRNS))
-@@ -420,7 +420,7 @@ _nrrdFormatPNG_write(FILE *file, const Nrrd *nrrd, NrrdIoState *nio) {
- biffAdd(NRRD, err); return 1;
- }
- /* set up error png style error handling */
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- {
- /* the error is reported inside the error handler,
- but we still need to clean up an return with an error */

0 comments on commit 5066b55

Please sign in to comment.