0.8.0rc3.

This commit is contained in:
sthen 2009-06-08 20:06:02 +00:00
parent df8a19a135
commit 9f278d72d8
4 changed files with 16 additions and 34 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.6 2009/06/04 21:12:07 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.7 2009/06/08 20:06:02 sthen Exp $
COMMENT = panorama image stitcher
DISTNAME = hugin-0.8.0_rc2
PKGNAME = ${DISTNAME:S/_//}p0
DISTNAME = hugin-0.8.0_rc3
PKGNAME = ${DISTNAME:S/_//}
WRKDIST = ${WRKDIR}/${DISTNAME:C/_.*//}
SHARED_LIBS = celeste 0.0 \

View File

@ -1,5 +1,5 @@
MD5 (hugin-0.8.0_rc2.tar.gz) = qLspjZE8uWV+bflpZuFjWg==
RMD160 (hugin-0.8.0_rc2.tar.gz) = SDqKOOD4X47FHNswH8R88OiZyq4=
SHA1 (hugin-0.8.0_rc2.tar.gz) = WlNXIth4dh3cdcmruhmRfYd+CsY=
SHA256 (hugin-0.8.0_rc2.tar.gz) = B+tFMMwdy8b/LSQXH1Amwof0kUZCpNI9+t9Xd15KNHg=
SIZE (hugin-0.8.0_rc2.tar.gz) = 12079695
MD5 (hugin-0.8.0_rc3.tar.gz) = LjmuUvkUWkyKMxuBp68QWg==
RMD160 (hugin-0.8.0_rc3.tar.gz) = jVIJGHQAvLctBrzrWfqOnsIEHhA=
SHA1 (hugin-0.8.0_rc3.tar.gz) = fC9Eqx9XEePkGC6kQgEPR1DZjRs=
SHA256 (hugin-0.8.0_rc3.tar.gz) = R6fGY5AHMsn4z2QN24n3N48h6XnBvaymR6CsaJhXLi8=
SIZE (hugin-0.8.0_rc3.tar.gz) = 12080000

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_hugin1_hugin_TextureManager_cpp,v 1.1 2009/06/03 13:45:14 sthen Exp $
r3904 from svn; fix for slowdown of GL preview after changes made to images.
--- src/hugin1/hugin/TextureManager.cpp.orig Mon Jun 1 21:56:11 2009
+++ src/hugin1/hugin/TextureManager.cpp Wed Jun 3 02:25:33 2009
@@ -370,6 +370,14 @@ void TextureManager::CheckUpdate()
// Either: 1. We haven't seen this image before
// or: 2. Our texture for this is image is the wrong size
// ...therefore we make a new one the right size:
+ //
+ // remove duplicate key if exists
+ TextureKey checkKey (img_p, &photometric_correct);
+ if (textures.find(checkKey) != textures.end()) {
+ // Already exists in map, remove it first before adding a new one
+ textures.erase(checkKey);
+ }
+
std::pair<std::map<TextureKey, TextureInfo>::iterator, bool> ins;
ins = textures.insert(std::pair<TextureKey, TextureInfo>
(TextureKey(img_p, &photometric_correct),

View File

@ -1,12 +1,15 @@
$OpenBSD: patch-src_hugin_base_algorithms_panorama_makefile_PanoramaMakefileExport_cpp,v 1.1.1.1 2009/04/19 11:18:40 sthen Exp $
--- src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp.orig Sat Apr 18 05:10:04 2009
+++ src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp Sat Apr 18 05:10:08 2009
@@ -763,7 +763,7 @@ void PanoramaMakefileExport::createMakefile(const Pano
$OpenBSD: patch-src_hugin_base_algorithms_panorama_makefile_PanoramaMakefileExport_cpp,v 1.2 2009/06/08 20:06:02 sthen Exp $
--- src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp.orig Fri Jun 5 23:07:30 2009
+++ src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp Mon Jun 8 17:58:21 2009
@@ -763,11 +763,7 @@ void PanoramaMakefileExport::createMakefile(const Pano
<< "\t@-$(EXIFTOOL) -ver > " << NULL_DEVICE << " 2>&1 && echo '[OK]' || echo '[FAIL]'" << endl;
// test rm
o << "\t@echo -n 'Checking rm...'" << endl
-#ifdef MAC_OS_X
<< "\t@-which $(RM) > " << NULL_DEVICE << " 2>&1 && echo '[OK]' || echo '[FAIL]'" << endl;
-#else
- << "\t@-$(RM) --version > " << NULL_DEVICE << " 2>&1 && echo '[OK]' || echo '[FAIL]'" << endl;
+ << "\t@-type $(RM) > /dev/null 2>&1 && echo '[OK]' || echo '[FAIL]'" << endl;
-#endif
o << endl;
// ==============================