head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.2 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.3.0.16 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.14 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.12 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.10 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.8 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.6 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.4 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.2 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q1:1.1.0.4 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.2 pkgsrc-2009Q4-base:1.1; locks; strict; comment @# @; 1.6 date 2013.03.01.14.38.51; author gdt; state dead; branches; next 1.5; 1.5 date 2013.03.01.14.33.51; author gdt; state Exp; branches; next 1.4; 1.4 date 2013.02.16.11.22.16; author wiz; state Exp; branches; next 1.3; 1.3 date 2011.01.20.16.48.11; author wiz; state Exp; branches; next 1.2; 1.2 date 2010.05.02.11.39.31; author wiz; state dead; branches; next 1.1; 1.1 date 2009.11.24.11.19.03; author drochner; state Exp; branches; next ; desc @@ 1.6 log @Drop vestigial patch-ac. Most of this had been applied upstream (or was taken from upstream). The only thing left was adding an include of string.h, but it builds w/o warnings without it, so that appears no longer necessary. @ text @$NetBSD: patch-ac,v 1.5 2013/03/01 14:33:51 gdt Exp $ Leftover hunk from "Fix build with png-1.6." (Most were applied upstream.) --- libs/auxfun/image.cpp.orig 2012-05-22 05:55:37.000000000 -0400 +++ libs/auxfun/image.cpp 2013-03-01 09:14:37.000000000 -0500 @@@@ -7,6 +7,7 @@@@ #include #include #include +#include #ifdef _MSC_VER #define _USE_MATH_DEFINES 1 #include @ 1.5 log @Update to 0.2.6. pkgsrc notes: * I know 0.2.7 is out; it has issues on ubuntu so I'm doing this first. * patch-ac should perhaps be dropped. Upstream NEWS content (from web page): * more than 40 new database entries of lenses and compact cameras * new CMake based build system for better cross platform compatibility and compilation fixes for MSVC * better integration into hugin for loading and storing lens parameters via the lensfun library * several bug fixes and stability improvements @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.4 2013/02/16 11:22:16 wiz Exp $ @ 1.4 log @Recursive bump for png-1.6. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.3 2011/01/20 16:48:11 wiz Exp $ d3 1 a3 1 Fix build with png-1.6. d5 2 a6 2 --- libs/auxfun/image.cpp.orig 2008-05-02 06:56:04.000000000 +0000 +++ libs/auxfun/image.cpp d12 2 a13 1 #include a14 39 @@@@ -94,7 +95,7 @@@@ bool Image::LoadPNG () png_init_io (png, file); - if (setjmp (png->jmpbuf)) + if (setjmp (png_jmpbuf(png))) // If we get here, we had a problem reading the file goto nomem; @@@@ -157,7 +158,7 @@@@ bool Image::LoadPNG () row_pointers = new png_bytep [Height]; if (!row_pointers - || setjmp (png->jmpbuf)) // Set a new exception handler + || setjmp (png_jmpbuf(png))) // Set a new exception handler { delete [] row_pointers; nomem: @@@@ -214,7 +215,7 @@@@ bool Image::SavePNG (const char *fName) } /* Catch processing errors */ - if (setjmp(png->jmpbuf)) + if (setjmp(png_jmpbuf(png))) /* If we get here, we had a problem writing the file */ goto error2; @@@@ -273,10 +274,6 @@@@ bool Image::SavePNG (const char *fName) /* It is REQUIRED to call this to finish writing the rest of the file */ png_write_end (png, info); - /* if you malloced the palette, free it here */ - if (info->palette) - free (info->palette); - /* clean up after the write, and free any memory allocated */ png_destroy_write_struct (&png, &info); @ 1.3 log @Fix build with png-1.5. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 Fix build with png-1.5. d7 9 a15 1 @@@@ -94,7 +94,7 @@@@ bool Image::LoadPNG () d24 1 a24 1 @@@@ -157,7 +157,7 @@@@ bool Image::LoadPNG () d33 1 a33 1 @@@@ -214,7 +214,7 @@@@ bool Image::SavePNG (const char *fName) d42 1 a42 1 @@@@ -273,10 +273,6 @@@@ bool Image::SavePNG (const char *fName) @ 1.2 log @Update to 0.2.5: This release not only publishes all database additions that were contributed in the last half of year, but also introduces several new improvements in the library itself. * As always, many new lenses/camera were added to the database * Support for cross-platform compilation using cross-mingw32 (build instructions in README). * Some bugs were fixed in the library, related to memory allocation. Now lensfun should be valgrind-clean. * Fixed a nasty bug in lfDatabase::FindLenses() that would always use fuzzy search (even if you would ask for a 100% match). Your applications may chease to "find" lenses if they relied on this bug. Just add the LF_SEARCH_LOOSE flag as the last parameter to return the old behaviour. * Fixed another bug in search logic that sometimes would mark unappropiate results with very high scores (esp. when little search keywords are given). Now search should work much better. * New TCA correction algorithm: LF_TCA_MODEL_POLY3 ("poly3" in database). This is almost the algorithm used by Hugin except the highest-order power (r^4). This should allow users to use tca_correct to compute TCA parameters. * Fixed the LF_TCA_MODEL_LINEAR - it used 1/k where it was expected to use k. This is the 'v' parameter of Hugin TCA model, and previously users had to invert v to get k; now they can just use v. * New lens calibration tutorial, using Hugin. * Some SSE & SSE2 support from Klaus Post with runtime CPU features detection. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.1 2009/11/24 11:19:03 drochner Exp $ d3 41 a43 13 --- build/mak/compiler/doxygen.mak.orig 2009-10-14 23:26:16.000000000 +0200 +++ build/mak/compiler/doxygen.mak @@@@ -14,9 +14,9 @@@@ XFNAME.DOXYGEN = $(addprefix $(OUT)docs/ # $2 - output directory define BUILD.DOXYGEN $(call MKDIR,$2) - sed $1 \ + sed \ -e 's,@@CONF_VERSION@@,$(CONF_VERSION),' \ - -e 's,@@OUT@@,$2,' | doxygen - + -e 's,@@OUT@@,$2,' $1 | doxygen - $(if $(DOXYGEN.$3),$(call DOXYGEN.$3,$3,$2)) endef @ 1.1 log @update to 0.2.4 changes: -Database updates -Fixed a crasher bug with gcc 4.4 @ text @d1 1 a1 1 $NetBSD$ @